Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CogStation Update and Fixes #1219

Merged
merged 9 commits into from
Dec 12, 2024
Merged

Conversation

JWosak
Copy link

@JWosak JWosak commented Nov 3, 2024

About The Pull Request

CogStation customer support continues

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑

add: Aux Engine
add: Junk collector shuttle (non movable)
-Collets junk and bodies (dead or alive) from disposals and chapel and puts them in incinerator and burns them (if it is fueled and turned on)

tweak: Genpop closets now uses secure closet sprite due to lack of prisoner one
tweak: Genpop no longer creates new copy of prisoner uniform

fix: Floor tiles are now fixed (not sprites codewise just location and orientations of tiles on map file)

/:cl:

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Deployed

Details
Server Instance

SPLURT

Revision

Origin: 0d8acbb
Pull Request: 655e6b8
Server: 0f6016f40748f016c1d803b3218781548c7cd694

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: c85b64d
Pull Request: 655e6b8
Server: 4ea3ab4a81e6aa2f96f788952f345423f77f7f2e

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: c85b64d
Pull Request: 655e6b8
Server: 73789e452f177799481280d4bdfbfee3db0293b8

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2279258
Pull Request: 655e6b8
Server: 4bdfc37cf3eebe54f5247188c9a3d5b6e920799a

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2279258
Pull Request: cd8845c
Server: fd83b6fc15d563491fe59690fa52953bec1d7dcb

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: a440460
Pull Request: cd8845c
Server: 2c95687e261fdc4cc97f96257461dd82131adc55

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 100316e
Pull Request: cd8845c
Server: 873718f0094f1864950359555caa35b8f55abbe6

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 707d311
Pull Request: cd8845c
Server: d3085cd2592f585ce188a4f4bfb33ae402e26ebf

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 707d311
Pull Request: cd8845c
Server: bf444f04bc7bc21d7a8521324cecfb78abbeb8c6

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 3c63bdc
Pull Request: cd8845c
Server: 4c56db0a32a08402ed36b6a11f3a70ff35a50b8b

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 3c63bdc
Pull Request: cd8845c
Server: 808364f87072277406e155493cce90143ac824c7

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 836b41f
Pull Request: cd8845c
Server: cd19c799b7acff02be54b39684af31bf19c33479

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 4544f91
Pull Request: cd8845c
Server: f82dcb0a81d2823d04b6ea755ddf298e99b4d8d5

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 4544f91
Pull Request: cd8845c
Server: 7e2d89deed2f694b13f1b14deed038d83df8953b

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 4544f91
Pull Request: cd8845c
Server: 7110d46a347798d1d398c0689ce208a1ae2439e8

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 4544f91
Pull Request: cd8845c
Server: 8711a9d3205aeca396bee46967af599227af92c8

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 4544f91
Pull Request: cd8845c
Server: 3722518e34f553a0ced4b65c0ddb08704dd2a5a9

Comment

@MosleyTheMalO MosleyTheMalO merged commit 2f9def7 into SPLURT-Station:master Dec 12, 2024
6 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 12, 2024
@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 2de8791
Pull Request: cd8845c
Server: 553221170c040f9400d7a0cc873f706046cc9032

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Removed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants