Skip to content

Commit

Permalink
Merge branch 'master' into whats-this
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint committed Oct 11, 2023
2 parents 8f93fda + 4a76d05 commit d583e7f
Show file tree
Hide file tree
Showing 11 changed files with 8,222 additions and 6,985 deletions.
15,106 changes: 8,166 additions & 6,940 deletions _maps/map_files/generic/CentCom.dmm

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-363.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-418.yml

This file was deleted.

22 changes: 22 additions & 0 deletions html/changelogs/AutoChangeLog-pr-423.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
author: "Dexee"
delete-after: True
changes:
- rscadd: "AdminLand, the land of Admin Offices"
- rscadd: "Dressing Room, version 1 (various vendors, selection of lockers, subject to change based on feedback, now with magic mirror!)"
- qol: "CentCom Auxiliary Announcement closet moved to AdminLand (Anti-Tide), also now has a light."
- qol: "old CentCom Administrative Office retained, moved to sit with AdminLand as The Council Chambers"
- qol: "Expanded the bar/kitchen by Thunderdome, complete with extra table space, vendors and trash bins as appropriate"
- rscdel: "removed all CE belts from the map"
- rscdel: "removed the CE room by arrivals"
- qol: "moved Poly Prime. Can't let the bird die"
- qol: "fixed the improper cloning bay arrangement in CC Medical"
- rscdel: "removed the CC Medical Mechbay and Odysseus (the damn thing had nothing on it anyway)"
- qol: "increased the strength of various doors and windows to help provide a passive enforcement mechanism to CC Ghost Interns of where they are allowed to be."
- qol: "moved minigame start markers for Mafia and Basketball to open up space next to CentCom (does not require code changes, tested locally)"
- qol: "moved CC Cargo to a tenative better position, mostly to allow for room for AdminLand, but also provides Anti-Tide."
- qol: "gave a big window to Peppino's so viewers can enjoy our nice space backgrounds"
- qol: "Tiny Fans added under the arrivals blast doors by the shuttle to help mitigate depressurization events during EORG... not that it'll make a huge difference, but worth the change."
- qol: "toned down how many cooking pots and ladles there are at the CC Kitchen."
- qol: "kicked one microwave out of the way to add a dedicated rack with chef clothing items at CC Kitchen."
- rscdel: "removed barkeep powergaming shotgun at CC Bar."
- rscdel: "removed Detroit."
6 changes: 0 additions & 6 deletions html/changelogs/AutoChangeLog-pr-426.yml

This file was deleted.

10 changes: 0 additions & 10 deletions html/changelogs/AutoChangeLog-pr-428.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-430.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-432.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-435.yml

This file was deleted.

8 changes: 0 additions & 8 deletions html/changelogs/AutoChangeLog-pr-437.yml

This file was deleted.

34 changes: 34 additions & 0 deletions html/changelogs/archive/2023-10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,37 @@
NicoDeLuna:
- rscadd: 'New Hat: Small But Knowing Clown hat'
- rscadd: 'New suit: Small But Knowing Clown suit'
2023-10-10:
Dexee:
- qol: Evidence lockers on Tramstation now numbered correctly
- qol: Two evidence lockers swapped on Tramstation for their secure counterparts
to match other stations.
- qol: Scrubber and Vent pipes by arrivals on lower Z now properly connect on Tramstation
- qol: Added a missing multi-Z cable hub to the bridge on Tramstation. The vault
has power again!
- rscdel: Removed an errant directional plasmaglass window by the SM cooling loop
on Deltastation.
DrDiasyl aka DrTuxedo:
- balance: Holsters can now be clipped to any suit, and house Captain antique gun
and HoS gun. You now can buy holsters from the SecTech premium section.
Glyphee:
- rscadd: placeholder screams
KoboldCommando:
- bugfix: dwarf beards and eyes should work properly now
- bugfix: giants use the new height system and look a bit less distorted
- sound: tweaked the new surgery sound
Salted-Zen:
- rscadd: Added medical eyepatch and mask to monkey store
lmenvs:
- bugfix: various oshan fixes
- rscadd: new conveyor/auto/inside_corners for the missing directional sprites.
- rscadd: new wrestling railing.
wraith-54321:
- bugfix: eminence linked abscond and purge reagents can now actually be used again
- bugfix: vitality matrix servant revival
- balance: default max servants is now 10 again
- balance: replica fabricators now build slower on reebe until the cult has stabilized
their first anchoring crystal
- balance: clockwork bows deal double damage to non clockwork machines and structures
- balance: kindle will now only have less effect on reebe if the ark is active
- balance: the crew now has 30 extra seconds to prepare before the portals open

0 comments on commit d583e7f

Please sign in to comment.