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.

Sign up for GitHub

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

Giving-the-PGF-some-more-love (PGF Cold Protections and Crying Sun Changes) #3210

Merged
merged 14 commits into from
Aug 25, 2024
Merged

Giving-the-PGF-some-more-love (PGF Cold Protections and Crying Sun Changes) #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4746044
Crying sun improvement tweaks + PGF equipment cold protections
DIB-DOG Jul 14, 2024
7035cb8
Fixes the incorrect engine types
DIB-DOG Jul 14, 2024
a143e4a
Merge branch 'master' into Giving-the-PGF-some-more-love
DIB-DOG Jul 16, 2024
b76a4b6
Merge branch 'master' into Giving-the-PGF-some-more-love
DIB-DOG Jul 16, 2024
22bb3d3
Fixes the missing cargo console
DIB-DOG Jul 16, 2024
35c99c8
Adds a dresser to the Crew Quarters and adds a missing bed
DIB-DOG Jul 17, 2024
6f00953
Role and clothing name changes
DIB-DOG Jul 29, 2024
6176858
Tuuret mode changes, ship area adjustments, object renaming, and brid…
DIB-DOG Jul 29, 2024
49f4f5f
I forgot to change one tile to dark instead of bridge. Woops.
DIB-DOG Jul 29, 2024
891e790
Merge branch 'master' into Giving-the-PGF-some-more-love
DIB-DOG Jul 29, 2024
e3011d6
Missing floor tile, done for real this time
DIB-DOG Jul 29, 2024
4cdb4e6
Merge branch 'Giving-the-PGF-some-more-love' of https://github.com/DI…
DIB-DOG Jul 29, 2024
d2280fc
Reorganizing the bridge table and re-adding a missing table in engine…
DIB-DOG Jul 31, 2024
4acfaf6
the checkpoint opens once more! Rejoice!
DIB-DOG Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/configs/pgf_crying_sun.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"officer": true,
"slots": 1
},
"Bridge Crew": {
"Helmsman": {
"outfit": "/datum/outfit/job/gezena/assistant/bridge",
"slots": 1
},
Expand All @@ -37,7 +37,7 @@
"outfit": "/datum/outfit/job/gezena/assistant",
"slots": 2
},
"Marine Sergeant": {
"Marine Lieutenant": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this guy an officer maybe? Or was that discussed already?
He probably should be one, cause command.

Copy link
Contributor Author

@DIB-DOG DIB-DOG Aug 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely something I'll run past Latency. I just left it as it was originally, so I'd say it depends if it was a part of the original intent or just something that got overlooked. It would certainly make sense to have however.

"outfit": "/datum/outfit/job/gezena/hos",
"slots": 1
},
Expand Down
Loading
Loading