Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 1d57a430d68023b7e49d97ead8c7ac072878e611
Merge: 2f592ac8c1 6e9f07094d
Author: no_mad <[email protected]>
Date:   Fri Jan 17 21:01:25 2025 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 6e9f07094d73824dc84b1a8193815ba4089017cf
Author: Trest <[email protected]>
Date:   Fri Jan 17 11:44:11 2025 +0300

    Update main.toml (#1006)

    Co-authored-by: Zack Backmen <[email protected]>

commit d917709c3668b2075f97e46b75bab3dc24446755
Author: bkm CL <[email protected]>
Date:   Fri Jan 17 11:21:51 2025 +0300

    Automatic changelog update

commit ad74faf25e148ea1c1933dbdbeac55f68638fafb
Merge: 405070e48a 52c9b06e19
Author: Rxup <[email protected]>
Date:   Fri Jan 17 11:11:36 2025 +0300

    Merge pull request #1007 from Rxup/upstream-sync

    Upstream sync

commit 52c9b06e19fa628d37f6578dac7b788f95230746
Author: Zack Backmen <[email protected]>
Date:   Fri Jan 17 01:55:20 2025 +0300

    upstream update

    fix

    fix

    fix

    Update PostMapInitTest.cs

    fix

commit a70a58ce80f9f0354b2baf07cb47d8c681e83e55
Merge: c4efbe474d 5d9311dff9
Author: Zack Backmen <[email protected]>
Date:   Fri Jan 17 01:16:51 2025 +0300

    Merge remote-tracking branch 'wizard/master' into upstream-sync

commit c4efbe474d41fc11953357a198cac7cc03fa1371
Merge: 405070e48a c8a83af5a7
Author: Zack Backmen <[email protected]>
Date:   Fri Jan 17 01:05:53 2025 +0300

    Merge remote-tracking branch 'upstream/master' into upstream-sync

commit 5d9311dff92a910816948468aeba87228e53385d
Author: PJBot <[email protected]>
Date:   Thu Jan 16 20:50:54 2025 +0000

    Automatic changelog update

commit 06a1615605c902ac8ff6c0fa0a3f9460abf34616
Author: Southbridge <[email protected]>
Date:   Thu Jan 16 15:49:47 2025 -0500

    Additional Ionstorm Law Updates (#34197)

    * Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment"

    * Fixed another awkward grammar situation

    * Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas

    * Reverted pylons, and added more entries to help fill out the lists more

    * reverted all deletions

    * implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there

    * realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error

    * Removed Portugal again, added more Musts since that list was the new shortest one.

commit c8a83af5a79bb8f1472ff819c5f1599c2c204ddf
Author: Meguneri <[email protected]>
Date:   Thu Jan 16 18:55:46 2025 +0300

    [Maps] Maus update (#2939)

commit cec5816acf354479a1df0220bd0aaf0f41745a8c
Author: ScarKy0 <[email protected]>
Date:   Thu Jan 16 15:08:08 2025 +0100

    BorgChassis transfer their mind to a dropped BorgBrain fix (#34464)

    Fix

commit 722e1296cc7836049f8b535018b3a5be9730b3c4
Author: kvak-8 <[email protected]>
Date:   Thu Jan 16 20:25:24 2025 +0700

    [MAPS] Outpost update  (#2937)

commit 4e7c21fba3fd68af5df23af9abb0fa0a9bf06053
Author: PJBot <[email protected]>
Date:   Thu Jan 16 12:26:14 2025 +0000

    Automatic changelog update

commit 3b39439945e7efadc58ab0710806254abea17969
Author: Gansu <[email protected]>
Date:   Thu Jan 16 12:25:07 2025 +0000

    fix for climbable pianos (#33690)

    fix for climable pianos

    Co-authored-by: aa5g21 <[email protected]>

commit 1e35cfb11e953405407d0c3e70332f573c54e22d
Author: ApolloVector <[email protected]>
Date:   Thu Jan 16 04:04:22 2025 -0800

    Fix the HoS mantle metashield break (#33831)

    Changes 'nukies' to 'syndicate agents' in the HoS mantle's description.

commit b32c07c5d82e995d07d9035e8caa9aa880a22187
Author: PJBot <[email protected]>
Date:   Thu Jan 16 11:41:28 2025 +0000

    Automatic changelog update

commit de8a2775ecad5af0bc7b3fabc3f701d0b2c6feb4
Author: Patrik Caes-Sayrs <[email protected]>
Date:   Thu Jan 16 04:40:21 2025 -0700

    FIX: Uranium, Cak, and BreadDog are not garbage! (#34192)

    * FIX: Uranium, Cak, and BreadDog are not garbage!

    * Fixed bread typo for spacegarbage change.

    * Style: moved ediblebase

    * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml

    * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

    ---------

    Co-authored-by: slarticodefast <[email protected]>

commit feaa11e3bed8f7f66b248d825bd87619f8cebbfc
Merge: 77c1d2762c 671c52dea0
Author: Morb <[email protected]>
Date:   Thu Jan 16 14:34:37 2025 +0300

    Merge pull request #2936 from space-syndicate/upstream-sync

    Upstream sync

commit 671c52dea00f367810ffbe0f12b32d2b5e1b21fa
Author: Morb0 <[email protected]>
Date:   Thu Jan 16 14:17:03 2025 +0300

    Disable lawyer on Plasma map

commit d29ea9b03bc5a7786930c27ebe78e62b274dc6c7
Author: Morb0 <[email protected]>
Date:   Thu Jan 16 14:16:50 2025 +0300

    Update locale

commit 1dffb09357ef3f0422caf814a6a4b674a1f5dd1a
Author: Morb0 <[email protected]>
Date:   Thu Jan 16 13:47:11 2025 +0300

    Update locale

commit 996b761d8089239ba43e76a5ad027fab5d766c12
Merge: 77c1d2762c 85b9f919af
Author: Morb0 <[email protected]>
Date:   Thu Jan 16 13:37:26 2025 +0300

    Merge remote-tracking branch 'wizards/master' into upstream-sync

    # Conflicts:
    #	Content.Packaging/ClientPackaging.cs
    #	Content.Server/Administration/Systems/AdminSystem.cs
    #	Content.Server/GameTicking/GameTicker.StatusShell.cs
    #	Content.Shared/Preferences/HumanoidCharacterProfile.cs
    #	Resources/Prototypes/Entities/Stations/base.yml
    #	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
    #	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
    #	Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
    #	Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
    #	Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
    #	Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
    #	Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
    #	Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json

commit 820517eb38145b26485597161e1380a0feaf0cc1
Author: eoineoineoin <[email protected]>
Date:   Thu Jan 16 10:34:11 2025 +0000

    Fix inconsistent borg flashlight state (#33027)

    * Fix borg light being stuck on if no cell is inserted

    * Fix HandheldLightComponent.Activted becoming out of sync with SharedPointLightComponent.Enabled

    * Fix for entities which don't have a handheld light component

commit 85b9f919af957d800eb47f317c6d229fe50a9562
Author: PJBot <[email protected]>
Date:   Thu Jan 16 08:52:23 2025 +0000

    Automatic changelog update

commit 83eb5dc34b62ccc6695f2dbdb91218981c5cb0e5
Author: compilatron <[email protected]>
Date:   Thu Jan 16 19:51:17 2025 +1100

    Plasma station population tweak (#34462)

    * Plasma Station initial commit

    * Map fixes 1

    Expanded science's SMES array
    Added advanced SMES
    Redone stamped documents with custom stamps
    Expanded atmospherics with more storage tanks
    Added status displays
    Add missing beacons to solars
    Replaced the passive gates in science with valves
    Removed protolathe in engineering
    Added guitar to CE office
    Replaced throngler plushie with weh cloak
    Add a lattice tile outside the atmos burn chamber and storange tanks
    Added atmos network monitor in bridge

    * Add cargo and emergency shuttle

    * Updated maps

    * Add plasma to map testing list

    * Map fixes 2

    Reworked pipenets to not go under walls
    Redid salvage and disposals
    Reworked the bar to include a new bar extension facing the pool
    Replaced arrivals cryo with an arcade
    Replaced the toilets in the service plaza with cryo
    Removed the cryo in dorms
    Added more details to hallways
    Redid tools room to include a front desk for the janitor closet
    Reconnected sci to power roundstart
    Removed some unideal spawns
    Expanded the TEG airlock to be 2x3 instead of 1x3
    Reduced the size of the SMES bank from 10 to 6
    Disabled the plasma miners (downstreams or admins can re-enable them)
    Replaced illegal maint items

    * Fixes a 6 pack destroying the universe

    Ok maybe cracking a cold one with the boys wasn't a great idea.

    * Map fixes 3

    * Quick research assistant fix

    * Map fixes 4

    * Map fixes 5

    * webedit go brrrt

    * Map fixes 6

    * Map fixes 7

    * Map fixes 8

    * Fixes non-existent object

    It's amazing this game runs at all

    * Map fixes 9

    * update pools

    * Map fixes 10

    * forgot to clear my multitool

    I love mapping I love mapping I love mapping I love mapping I love mapping

    * Tweaked player counts

    ---------

    Co-authored-by: Emisse <[email protected]>

commit 37bde336918d9cd7575d76f6b4ce7b21dfae0330
Author: PJBot <[email protected]>
Date:   Thu Jan 16 07:03:21 2025 +0000

    Automatic changelog update

commit d0b2e46c7c3eb688e8c751636ad39888b9c63ab3
Author: compilatron <[email protected]>
Date:   Thu Jan 16 18:02:14 2025 +1100

    Plasma Station (#33991)

    * Plasma Station initial commit

    * Map fixes 1

    Expanded science's SMES array
    Added advanced SMES
    Redone stamped documents with custom stamps
    Expanded atmospherics with more storage tanks
    Added status displays
    Add missing beacons to solars
    Replaced the passive gates in science with valves
    Removed protolathe in engineering
    Added guitar to CE office
    Replaced throngler plushie with weh cloak
    Add a lattice tile outside the atmos burn chamber and storange tanks
    Added atmos network monitor in bridge

    * Add cargo and emergency shuttle

    * Updated maps

    * Add plasma to map testing list

    * Map fixes 2

    Reworked pipenets to not go under walls
    Redid salvage and disposals
    Reworked the bar to include a new bar extension facing the pool
    Replaced arrivals cryo with an arcade
    Replaced the toilets in the service plaza with cryo
    Removed the cryo in dorms
    Added more details to hallways
    Redid tools room to include a front desk for the janitor closet
    Reconnected sci to power roundstart
    Removed some unideal spawns
    Expanded the TEG airlock to be 2x3 instead of 1x3
    Reduced the size of the SMES bank from 10 to 6
    Disabled the plasma miners (downstreams or admins can re-enable them)
    Replaced illegal maint items

    * Fixes a 6 pack destroying the universe

    Ok maybe cracking a cold one with the boys wasn't a great idea.

    * Map fixes 3

    * Quick research assistant fix

    * Map fixes 4

    * Map fixes 5

    * webedit go brrrt

    * Map fixes 6

    * Map fixes 7

    * Map fixes 8

    * Fixes non-existent object

    It's amazing this game runs at all

    * Map fixes 9

    * update pools

    * Map fixes 10

    * forgot to clear my multitool

    I love mapping I love mapping I love mapping I love mapping I love mapping

    ---------

    Co-authored-by: Emisse <[email protected]>

commit 0c1608d2f02783c9e1713a88f3e884c902265990
Author: SlimSlam <[email protected]>
Date:   Thu Jan 16 01:14:40 2025 -0500

    Space Ruins Variant (#34445)

    * Space Ruins Variant

    * Updated File

    * Added Goliaths/Removed some mobs

commit d0a2d7b23208feff3c06d2746e5ae2857ce99fa1
Author: Deerstop <[email protected]>
Date:   Thu Jan 16 15:48:54 2025 +1100

    Elkridge Depot Fixes Again (#34461)

    fixes evac shuttle, fix north solars, fix vents and scrubbers

commit 87ff3a24215368901945682fd1c3922ae1cf1544
Author: Southbridge <[email protected]>
Date:   Wed Jan 15 19:56:12 2025 -0500

    New and Modified Map Spawners (#34424)

    * Added spanwers and modified others

    * adjusted values to be more in line with what I want

    * this comment may have caused that test fail

    * oh my god another typo

    * Modified door crate to be engineering flavored

    * reduced the pride vendor odds

    Webedit lmao

commit e094b79ee4636cbd91e760091420017e81222ebe
Author: PJBot <[email protected]>
Date:   Wed Jan 15 22:50:59 2025 +0000

    Automatic changelog update

commit 6d218f2ad50ac246fc10204151040f6d5e93ebdb
Author: themias <[email protected]>
Date:   Wed Jan 15 17:49:51 2025 -0500

    Fix DNA scrambler updating station record (#34091)

    * Fix DNA scrambler updating station record

    * Update Content.Server/Implants/SubdermalImplantSystem.cs

    ---------

    Co-authored-by: slarticodefast <[email protected]>

commit 59a14b5329cac4ab8a8f69ce44471b089350045f
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 23:14:27 2025 +0100

    WizDen config update for IPIntel (#34457)

commit f01db3f2766fa649bd5f134b4b818d35933d3be1
Author: PJBot <[email protected]>
Date:   Wed Jan 15 21:22:27 2025 +0000

    Automatic changelog update

commit c92c52fded008aec0d34a4cc4285c629074caa7a
Author: Zachary Higgs <[email protected]>
Date:   Wed Jan 15 17:21:20 2025 -0400

    Fix Mixed puddles not updating slips when evap (#34303)

    * Fix Mixed puddles not updating slips when evap

    * Remove Comment that isn't needed

    Co-authored-by: Centronias <[email protected]>

    * CR - use SolutionContainerSystem.UpdateChemicals

    * CR - cleanup unused imports

    ---------

    Co-authored-by: Centronias <[email protected]>

commit a7d5c8ff439f2d633efef58f4fbb6c10787ebaa5
Author: PJBot <[email protected]>
Date:   Wed Jan 15 21:12:01 2025 +0000

    Automatic changelog update

commit 40fc4992e5e2fb6805d53ba0a665f05aa040949b
Author: Myra <[email protected]>
Date:   Wed Jan 15 22:10:54 2025 +0100

    Add a CCVar to allow from hiding admins in the reported player count. (#34406)

    Good for:
    - Keeping admins hidden
    - Not confuse players seeing 84/80 players

    Nicely pairs up with the ``admin.admins_count_for_max_players`` ccvar

commit 6041c828deded501216ac7cdf7b3730e3416500d
Author: Myra <[email protected]>
Date:   Wed Jan 15 22:08:15 2025 +0100

    Remove baby jail (#34443)

    * Remove baby jail

    Closes #33893

    * Test fail fix.

commit c6dbdc921a325bfccdd94765ce4eda681c41d10a
Author: PJBot <[email protected]>
Date:   Wed Jan 15 20:23:38 2025 +0000

    Automatic changelog update

commit 484af256cd4b32914179fbc175f83edb268a0d71
Author: Ed <[email protected]>
Date:   Wed Jan 15 23:22:31 2025 +0300

    Remove christmas anomaly spawn (#34053)

    Update anomaly.yml

commit fdb2f16701eeb5989004f3e3344df29fb142a394
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 20:51:36 2025 +0100

    Update RT to v239.0.1 (#34454)

commit 9ede1f3278b0476ed24c3ce7fd1138cef8ccb841
Author: PJBot <[email protected]>
Date:   Wed Jan 15 19:37:05 2025 +0000

    Automatic changelog update

commit 3dd9307cb7d5ab1f86136a3f3a224f2c33da0af2
Author: kosticia <[email protected]>
Date:   Wed Jan 15 22:35:58 2025 +0300

    Printable bedsheets (#34034)

    * Bedsheets

    * that one fixes yellow bedsheet and delete american bedsheet

commit 26910719f16c0ec38a7395db1e062e663eacf630
Author: PJBot <[email protected]>
Date:   Wed Jan 15 18:21:07 2025 +0000

    Automatic changelog update

commit 3cac75f117bf389a792f795f20963c6cad2b36ef
Author: Alpaccalypse <[email protected]>
Date:   Wed Jan 15 18:20:01 2025 +0000

    Smite vending machine (#34420)

    * Added smite machine to YAML

    * Added smite ads and inventory

    * Added smite vendor sprites

    * Changed the description of the machine to not repeat and ad line.

    * Added newline to end of inventory .yml

    * Corrected erroneous edit.

    * Tweaked all sprites

    * Added tesla toy to contraband. Reduced number of drinks available

    * Reduced soda varieties but increased can numbers.

    * Removed tesla toy from contraband inventory

    * Removed speech component from vending machines that already inherit it

    * Moved Sprite component to top of list

    * Added Smite vendors to random spanwers

    * Alphabetised spawn prototypes, commented where name is unclear

commit c4c00cdc7c60513fa322baf61aa3afaf3d66cf40
Author: PJBot <[email protected]>
Date:   Wed Jan 15 18:04:57 2025 +0000

    Automatic changelog update

commit d6e55edb4a5dbf0ca25c07fabe9d5f181e642022
Author: ArtisticRoomba <[email protected]>
Date:   Wed Jan 15 10:03:49 2025 -0800

    Make Mime PDA interactions silent (#34426)

    * make insert and eject datafields in ItemSlotsComponent.cs nullable, make mime PDA silent

    * make it so that you can't fit wirecutters into the slots, among other various things

commit 33c421bd6b1c2686f714cc31fdaf95c7b85e4b3c
Merge: 4d1581d377 d86bf0652a
Author: ScarKy0 <[email protected]>
Date:   Wed Jan 15 18:43:57 2025 +0100

    Merge Meta hotfix (#34306) into master (#34451)

commit d86bf0652a42da4d8e0d62926b99e6abdf012890
Author: Nox <[email protected]>
Date:   Wed Jan 15 09:24:34 2025 -0800

    Meta hotfix (#34306)

    * Fixed major issues with power, cargo shuttle docking, etc.

    * remove serialized invalids

    * Finished fixing the critical issues, ready for merge?

    * Empty commit

    * Added new break room to sci (they deserve it)

    * Fixed up other minor issues

    * if this map isnt PERFECT Emisse has permission to gib me and turn me into a cyborg

    * added Roomba's changes

    ---------

    Co-authored-by: ArtisticRoomba <[email protected]>

commit 4d1581d3776364ba1ca75151fac790107eb0a1fb
Author: PJBot <[email protected]>
Date:   Wed Jan 15 16:27:26 2025 +0000

    Automatic changelog update

commit 922251ad669f61bd5118991ad3ef5f2276761fa9
Author: ArtisticRoomba <[email protected]>
Date:   Wed Jan 15 08:26:19 2025 -0800

    Remove the ability to print the station anchor circuit board (#34358)

    remove the ability to print the station anchor circuit board

commit e752561d20887062e91b3797cf4ff4fade12f555
Author: Hyper B <[email protected]>
Date:   Wed Jan 15 20:59:04 2025 +0500

    Fix nonsensical RegEx for name restriction (#34375)

    * Fixed nonsense RegEx

    "-" character is a range, caused an error.
    No need for "," to repeat so much, it's not a separator.
    "\\" - just why?

    * Further optimized RegEx structure

    Added:
    "@" delimiter for consistency
    "/" to escape "-" for good and to avoid further problems

commit d83b5acb22cc56d352687370ea81aa9e74818731
Author: Alpha-Two <[email protected]>
Date:   Wed Jan 15 15:49:55 2025 +0000

    Replace ERT Medic's Advanced Medkits with 2 Combat Medkits (#34380)

    Replaced Adv kits with 2 combat kits

commit e4468893159cda3ed6566ad3cdfe4072199309a2
Author: Alpaccalypse <[email protected]>
Date:   Wed Jan 15 15:15:56 2025 +0000

    Added missing details from worn capes to head of department beadsheets (#34396)

    * Added key and missing details from worn cape to HOP bedsheet

    * Corrected canvas size for sprite

    * Subtle tweak to shading to reduce color blurring at pillow edge

    * Matched Hue and tone to cape

    * Tweak chekered pattern marks for gold trim

    * Removed accidental palette inclusion

    * Clearer wording and corrected attribution name.

    * Tweaked shading on key image to fit in better with bed aesthetics

    * Added CE cape icon to bedsheet

    * Added cape image to HOP bedsheet. Made gold trim better match cape visuals

    * RD cape icon added. Colour tweaked to better match cape.

    * Updates json

    * Tweaks to gold trim shading to match bed aesthetics

    * Added better shading for HOP sheet side. Halved file size.

    * Optimised HOS RD and CE sheet sprites

    * Corrected sprite title in attribution

commit 77c1d2762cb112be86179c86e1847a80f0f43513
Author: Ko4ergaPunk <[email protected]>
Date:   Wed Jan 15 17:55:47 2025 +0300

    [Maps] Rename maps (#2935)

commit 6e205ad129480ebf10b36e7439832a43f60ffca2
Author: RinidOps <[email protected]>
Date:   Wed Jan 15 15:42:41 2025 +0400

    Pearl Fix-Update (#2933)

commit 332fc18aa5d655897aec4bd159f225b818611d32
Author: Alpha-Two <[email protected]>
Date:   Wed Jan 15 06:51:08 2025 +0000

    Fixed Thief starting gear failing on specific bag inventories. (#34430)

    Fixed it yayyy

commit 9d5ef57df8401eddaee060016c981fe5dc3ee39f
Author: PJBot <[email protected]>
Date:   Wed Jan 15 00:33:30 2025 +0000

    Automatic changelog update

commit 87779250ee6d8973822a20e66211fcae52588464
Author: Palladinium <[email protected]>
Date:   Wed Jan 15 11:32:24 2025 +1100

    Add Discord webhook on watchlist connection (#33483)

commit bb1a3c42edece62ce3313703fc62cb0a3a78e10b
Author: PJBot <[email protected]>
Date:   Wed Jan 15 00:11:46 2025 +0000

    Automatic changelog update

commit 771278df5495b717b6ad9ce60100bd64b68b3937
Author: themias <[email protected]>
Date:   Tue Jan 14 19:10:39 2025 -0500

    Fix muzzle accent (#34419)

commit e885a8f1cec3ac13325c4da0c74161fc10000684
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 01:08:06 2025 +0100

    Minor client packaging changes (#33787)

commit 2dead48280126753876ce9a6809f78f6acbdc8cd
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 01:07:24 2025 +0100

    STAThread client content start (#34212)

commit 99580e0118a4f097373ca23687b4768e2b52c208
Author: PJBot <[email protected]>
Date:   Tue Jan 14 23:47:51 2025 +0000

    Automatic changelog update

commit c2e050ced02b41785ddafc1057ce08a2d353ba90
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 00:46:45 2025 +0100

    Persist deadmin to database, add admin suspension system (#34048)

commit 47042cc8ddb76a1decf3d0a7ac4a29b52c83097f
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 00:43:48 2025 +0100

    Disable meta-atlas for big rare RSIs (#33643)

commit ca96aeb0ec020a6fb8634fdf2c313c638974dd8b
Author: Pieter-Jan Briers <[email protected]>
Date:   Wed Jan 15 00:31:50 2025 +0100

    Fix bad Rider analysis error in AccessOverriderWindow.xaml.cs (#34213)

commit a967fc748613fd34a9f6144ef6f702e30fb4f1a8
Author: Julian Giebel <[email protected]>
Date:   Tue Jan 14 23:41:04 2025 +0100

    Adds omnisexual pin (#34439)

    * Make important change (#7)

    This is to help julian test his bot

    * Omnibus

    * Remove random test file from testing a gh bot

    * Add pin to vendor, spawners and loadout

    ---------

    Co-authored-by: nikthechampiongr <[email protected]>

commit 198dd820f1064a9dfa38e31e7f1d3bb1a9155a24
Author: PJBot <[email protected]>
Date:   Tue Jan 14 22:35:12 2025 +0000

    Automatic changelog update

commit 786d4d555783b271d26f637244145e72261107f5
Author: Killerqu00 <[email protected]>
Date:   Tue Jan 14 23:34:04 2025 +0100

    craftable pet carrier (#34431)

    * craftable pet carrier

    * epic integration test fail

    * Update Resources/Prototypes/Recipes/Crafting/improvised.yml

    Co-authored-by: slarticodefast <[email protected]>

    * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

    Co-authored-by: slarticodefast <[email protected]>

    * Update Resources/Prototypes/Recipes/Crafting/Graphs/storage/pet_carrier.yml

    Co-authored-by: slarticodefast <[email protected]>

    * Update Resources/Prototypes/Entities/Objects/Misc/pet_carrier.yml

    Co-authored-by: slarticodefast <[email protected]>

    * extra tab begone

    * epic linter fail

    * how did linter not see this???

    ---------

    Co-authored-by: slarticodefast <[email protected]>

commit 13edd308bf19a8d432b7edd19a99398c54297a0b
Author: Myra <[email protected]>
Date:   Tue Jan 14 21:38:26 2025 +0100

    Fix IPIntel causing frequent errors with the cleanup job. (#34428)

    Co-authored-by: Pieter-Jan Briers <[email protected]>

commit 2e6c149341315095bc5e68d97064ac7c58e7ad85
Author: lzk <[email protected]>
Date:   Tue Jan 14 20:54:19 2025 +0100

    add server lobby names (#2932)

commit 8ad91b8c2125458bf3a8c22706e2abf7c391cba3
Author: Morb <[email protected]>
Date:   Tue Jan 14 22:33:48 2025 +0300

    Update locale (#2928)

commit 8e7f4402432f18f1ed1322249d4b0a5ffda1977c
Author: ArtisticRoomba <[email protected]>
Date:   Mon Jan 13 23:59:15 2025 -0800

    Oasis Power Rebalance + Misc fixes (#34425)

    * balance oasis power as a stopgap

    * change waste color to proper waste color

commit 2bebaa753a217992b319b0ae5260eb483eead0c3
Author: PJBot <[email protected]>
Date:   Mon Jan 13 18:50:09 2025 +0000

    Automatic changelog update

commit 2ab9114d3830643a61cce222b18b52c3a767e37b
Author: NotSoDamn <[email protected]>
Date:   Mon Jan 13 20:49:38 2025 +0200

    [Maps] Glacier update (#2929)

commit 6c41d967e5ca4f08573c73f03f8975580fd9f7eb
Author: Southbridge <[email protected]>
Date:   Mon Jan 13 13:49:02 2025 -0500

    Porting Pride-O-Mat to Upstream (#34412)

    * Pride-O-Mat (#1322)

    * Added Pride-O-Mat

    * Yep

    * Updated license to the correct one

    * Added more lines, reconfigured settings a bit, also added cloaks to inventory, set coder socks to emag inventory

    * Removed bunny ears, fixed typo

    * Made requested changes

    Webedit lmao

    ---------

    Co-authored-by: Dorragon <[email protected]>

commit df3c7b0850f1f80b2eb5e50c34d93a8b558af300
Author: Zna1kin <[email protected]>
Date:   Mon Jan 13 22:55:28 2025 +0700

    [Maps] Gelta update (#2923)

commit b308589428cc65fa8a2ba637cd08617c63247eb0
Author: PJBot <[email protected]>
Date:   Mon Jan 13 10:08:40 2025 +0000

    Automatic changelog update

commit de78bedc5f1d1362c89be80fb586163ccc511c37
Author: Coolsurf6 <[email protected]>
Date:   Mon Jan 13 20:07:33 2025 +1000

    Fixed Jazz Instrument for Electric Guitars (#33363)

    * fixed jazz midi program byte

    * swapped around jazz and clean in instrumentList

commit 25a01b00b6a58e84de528025207ed4c6f11646e8
Author: zHonys <[email protected]>
Date:   Mon Jan 13 07:07:18 2025 -0300

    Fixed doors being blocked with mousetraps, and other Collidable items (#34045)

    * Changed SharedDoorSystem.GetColliding() to allow non-LowImpassible mask entities to stay in the door while it closes

    * Update Content.Shared/Doors/Systems/SharedDoorSystem.cs

    Clarifies comment of how the mask is used

    Co-authored-by: Centronias <[email protected]>

    ---------

    Co-authored-by: Centronias <[email protected]>

commit 423e48a9f2eeb1ce3e84d22e734b647026334def
Author: JustinWinningham <[email protected]>
Date:   Mon Jan 13 02:06:57 2025 -0800

    Anomaly dragging exploit fix and QOL changes (#34280)

    * Wood wall is now built from barricade congraph and on top of a barricade instead of using rods

    * APE dragging exploit fix

commit 182f0c0bcee5c5116a7499f11d20471b87a77ea2
Author: hyperDelegate <[email protected]>
Date:   Mon Jan 13 01:06:30 2025 -0900

    Raise syndicate kobold reinforcement HP crit threshold from 75 to 100 to match monkey. (#34409)

    kobold ops have 100 health

commit 9cf4cba346e26393c06daf96100885e4f99c2b9a
Author: TytosB <[email protected]>
Date:   Mon Jan 13 01:17:08 2025 -0600

    loop station door access fixes and air sink (#34414)

    small fixes

commit f2cd615512bebdf8471d392c55f893e08af0f869
Author: PJBot <[email protected]>
Date:   Mon Jan 13 07:08:37 2025 +0000

    Automatic changelog update

commit ac0a8d1f6056ca7dba28979bd0c57bf78a3a6e12
Author: Deerstop <[email protected]>
Date:   Mon Jan 13 18:07:29 2025 +1100

    Manual Valves Resprite (#34378)

    * resprited manual valves to be colourblind friendly

    * Update Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json

    Co-authored-by: Errant <[email protected]>

    ---------

    Co-authored-by: Errant <[email protected]>

commit b00bf40e6407da085e4f4a5bbcb9eb73dac3990c
Author: Southbridge <[email protected]>
Date:   Sun Jan 12 23:28:20 2025 -0500

    Insuls Spawner (#34407)

    * Added insuls spawner, time to test

    * adjusted whitespace since that was causing issues

    * Update Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

    Co-authored-by: slarticodefast <[email protected]>

    ---------

    Co-authored-by: slarticodefast <[email protected]>

commit 5fff6bb1d2ae770e395c0d21ae3c1de409388826
Author: Southbridge <[email protected]>
Date:   Sun Jan 12 19:49:44 2025 -0500

    Amber Station - Moved Vents Around (#34410)

    * Moved all vents around, made some small changes

    * Finished work

    * Removed insuls spawner since they're not merged yet

commit 91bc1f8cac8b9361ee0f9ae6c0465342ac9796e8
Author: frobnic8 <[email protected]>
Date:   Sun Jan 12 19:24:58 2025 -0500

    Darkened Service job interface icons for better contrast (#34270)

    * Darkened Service job interface icons for better contrast

    * Fixed Botanist job interface icon dark handle hole

    * Change to new, darker, service color in all resource yml files

    * Revert Map file service color changes

    * Use new darker service color on id cards

    * Revert Service color change in mapping_actions.yml

    * Revert salvage difficulties service color

    * Redo service ID and job colors to match advanced palette

    * Revert all service color yml file changes

    * Switch icons to use existing service pallete colors from advanced pallete

    * Update meta.json for darkened service icons

    ---------

    Co-authored-by: Erskin Cherry <[email protected]>

commit 846f4c7d30802dbb62647687a1a9edfcb757c14e
Author: Ko4ergaPunk <[email protected]>
Date:   Mon Jan 13 03:19:05 2025 +0300

    [Maps] Pilgrim Hotfix #3 (#2926)

commit 606e45243381230cb71800aaad7bc482df8f7eb1
Author: Booblesnoot42 <[email protected]>
Date:   Sun Jan 12 18:40:22 2025 -0500

    Add a high-capacity water tank to the janitor's closet of Oasis (#34366)

    added high capacity water tank

commit 8bc4c35aae39dbdee981542132e40ec035e4a385
Author: PJBot <[email protected]>
Date:   Sun Jan 12 23:33:58 2025 +0000

    Automatic changelog update

commit 72ddc50142a7a1812d21cc6783e4b593ffd72c50
Author: SlimSlam <[email protected]>
Date:   Sun Jan 12 18:32:50 2025 -0500

    Fland Reporters Room (#34408)

    changed the command checkpoint to a reporters room.

commit 8f72906db1945327f2879be66f574973057d8036
Merge: 1effc058c3 0b72d7dca8
Author: Morb <[email protected]>
Date:   Sun Jan 12 23:51:55 2025 +0300

    Merge pull request #2924 from space-syndicate/upstream-sync

    Upstream sync

commit 0b72d7dca869603661dbd0ddc16ebbe86434c658
Author: Morb0 <[email protected]>
Date:   Sun Jan 12 23:32:10 2025 +0300

    Replace ELKridge lawyer with IAA

commit f8f0dcb59eeb14c222e17b28cf815d986ec898e4
Merge: e5effcda72 9cc76d93bf
Author: Morb0 <[email protected]>
Date:   Sun Jan 12 23:13:13 2025 +0300

    Merge remote-tracking branch 'wizards/master' into upstream-sync

    # Conflicts:
    #	Content.Server/Connection/ConnectionManager.cs

commit 9cc76d93bf2f609244ef791eb2a354cf464a58a6
Author: PJBot <[email protected]>
Date:   Sun Jan 12 19:42:35 2025 +0000

    Automatic changelog update

commit 96d913b147f13fb7f7226a65d24c7da6dedf469a
Author: Myra <[email protected]>
Date:   Sun Jan 12 20:41:26 2025 +0100

    Add IPIntel API support. (#33339)

    Co-authored-by: PJB3005 <[email protected]>

commit 1effc058c358d2f56742980868a6df2cf65832df
Author: OneYaHoy <[email protected]>
Date:   Mon Jan 13 00:34:51 2025 +0500

    [Maps] Cute Installation update #1 (#2922)

commit e5effcda728b191adeefaf26a11a0cb14df9a80f
Author: Morb0 <[email protected]>
Date:   Sun Jan 12 22:34:03 2025 +0300

    Fix upstream

commit 3c00278db88357e0643773245fd2ea73c3004c89
Author: Morb0 <[email protected]>
Date:   Sun Jan 12 21:54:13 2025 +0300

    Update interfaces to dotnet 9

commit 57442fc3362759c47e0f81a7953adcb6a4c311e7
Merge: e830ccebe5 f85f80e093
Author: Myra <[email protected]>
Date:   Sun Jan 12 19:53:10 2025 +0100

    (Stable -> Master) Reduce Panic Bunker Minimum Playtime to 2 hours (#34401) (#34402)

commit f85f80e0938ecac63a6393014664e945815cc7ec
Author: crazybrain23 <[email protected]>
Date:   Sun Jan 12 18:51:25 2025 +0000

    Reduce Panic Bunker Minimum Playtime to 2 hours (#34401)

commit e830ccebe5a58623315e497e5f449b74333304d3
Merge: 7b8d51ceb4 ccff52a72f
Author: slarticodefast <[email protected]>
Date:   Sun Jan 12 18:49:02 2025 +0100

    merge stable into master (#34398)

commit ccff52a72f06b369f8c4545dd54e343fd47af23b
Author: deltanedas <[email protected]>
Date:   Sun Jan 12 17:19:58 2025 +0000

    [HOTFIX] fix holopads with multiple ai cores dying (#34289)

    change return to continue

    Co-authored-by: deltanedas <@deltanedas:kde.org>

commit 6c09b978a306f649d7bfbedf0cd9eccb45c33b33
Merge: 9ad69fcad0 7b8d51ceb4
Author: Morb0 <[email protected]>
Date:   Sun Jan 12 19:59:31 2025 +0300

    Merge remote-tracking branch 'wizards/master' into upstream-sync

    # Conflicts:
    #	Content.IntegrationTests/Tests/PostMapInitTest.cs
    #	Content.Server/Telephone/TelephoneSystem.cs
    #	LICENSE.TXT
    #	Resources/Prototypes/Datasets/ion_storm.yml
    #	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
    #	Resources/Prototypes/Guidebook/rules.yml
    #	Resources/Prototypes/Maps/meta.yml
    #	Resources/Prototypes/SoundCollections/NukeMusic.yml
    #	Resources/ServerInfo/Guidebook/Chemicals.xml
    #	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
    #	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json

commit 7b8d51ceb48adbd2d6d9ad5dcfa84486e8cb492c
Author: PJBot <[email protected]>
Date:   Sun Jan 12 16:39:49 2025 +0000

    Automatic changelog update

commit 83ce982f04835e7889386cd9dac87175ea9b1599
Author: Floxington <[email protected]>
Date:   Sun Jan 12 17:38:41 2025 +0100

    #33571 Bomb defusal lockers always should have tools (#34394)

commit 8f4c49a41a4c4519b3dc8ad00faf5f918a6c4471
Author: Errant <[email protected]>
Date:   Sun Jan 12 16:46:36 2025 +0100

    HOTFIX Tweaked air alarm default settings for nitrogen breathing crew (#34198)

    air alarm default settings modified for anaerobic crew

commit 9ad69fcad0dd80e06460090cf9205e372b43830e
Author: Ko4ergaPunk <[email protected]>
Date:   Sun Jan 12 12:58:36 2025 +0300

    [Maps] Change Corvax maps directory (#2921)

commit 9af9fbf771c7432d7dee5014811d1e1f7c017981
Author: TiFeRi <[email protected]>
Date:   Sun Jan 12 09:59:34 2025 +0300

    [MAPS] Paper New Year Good Bye. (#2920)

commit 51eb31910902353a4df65ff4a3e3eb4a50edaafd
Author: OneYaHoy <[email protected]>
Date:   Sat Jan 11 20:49:49 2025 +0500

    [Maps] fix Cute Installation (#2919)

commit e301f52e655c57d6df4a0475e75eb4b24f64e0e4
Author: IanComradeBot <[email protected]>
Date:   Sat Jan 11 02:28:07 2025 +0000

    Automatic changelog update

commit a95b4c1a3d3187f1283edc7dbd8bf7e867a393a7
Author: SonicHDC <[email protected]>
Date:   Sat Jan 11 14:26:05 2025 +1200

    Sprites reverts (#2918)

commit 1ab1580d82b7e2ac159e51d0359b85336d7482da
Author: lzk <[email protected]>
Date:   Fri Jan 10 19:29:12 2025 +0100

    Update locale from 2024-12-20 (#2913)

    Co-authored-by: cfif126 <[email protected]>
    Co-authored-by: lapatison <[email protected]>

commit 7dc245fafe670033e0be9f0c16ddf0568f8c0ee6
Author: OneYaHoy <[email protected]>
Date:   Fri Jan 10 23:09:41 2025 +0500

    [Maps] fix Cute Installation (#2917)

commit 7fa8499a4ef872862e08d4f2f9467bb10935d424
Author: RinidOps <[email protected]>
Date:   Fri Jan 10 18:05:58 2025 +0400

    Pearl Holopad Update (#2916)

commit 243654eadd058acef010e0b996108436873c681e
Author: OneYaHoy <[email protected]>
Date:   Fri Jan 10 13:33:43 2025 +0500

    [Maps] fix Cute Installation (#2915)

commit 193f2244ca7bab42c860a05cd0e929de4983c21b
Author: Ko4ergaVibeman <[email protected]>
Date:   Fri Jan 10 09:45:02 2025 +0300

    [Maps] Pilgrim update #9 (#2914)

commit ccd1fb1a58451016acfc44f6153fc872c32e8d39
Author: Ko4ergaPunk <[email protected]>
Date:   Wed Jan 8 10:41:06 2025 +0300

    [Maps] Return salvage shuttle (#2910)

commit 3301488579fb92df3b1d9974ffd9a39bcbbbaf1a
Author: Ko4ergaPunk <[email protected]>
Date:   Wed Jan 8 09:15:14 2025 +0300

    [Maps] Map pool Glacier (#2909)

commit c0be0089b3fc0ad25fc53e1bf08e11ca7f925eac
Author: IanComradeBot <[email protected]>
Date:   Tue Jan 7 14:21:00 2025 +0000

    Automatic changelog update

commit ba4a94258f7969754ac56111a94957442fb26f3a
Author: OneYaHoy <[email protected]>
Date:   Tue Jan 7 19:17:37 2025 +0500

    [Maps] New map Cute Installation (#2902)

commit bfa80bf86f5c8a97c648e07923406b684b15935f
Author: lastPechkin <[email protected]>
Date:   Tue Jan 7 12:56:13 2025 +0300

    [Maps] Astra remove new year stuff (#2907)

commit cb0752bddc337a69645391629ab076726a8ef91c
Author: Stubaretka24 <[email protected]>
Date:   Tue Jan 7 16:42:20 2025 +0700

    [Maps] Awesome Tweak (#2906)

commit d7536620b2a573ddba8a9feb1df3d77a0f635769
Author: TiFeRi <[email protected]>
Date:   Tue Jan 7 08:53:30 2025 +0300

    [MAPS] Paper Tweak (#2905)

commit 2f592ac8c14b67f060fb39defb55919516199609
Merge: 61860235df a074a70011
Author: no_mad <[email protected]>
Date:   Sat Jan 4 19:33:16 2025 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 17ebe53faffe8f9862fde9c987652ed95fdb19d7
Author: kvak-8 <[email protected]>
Date:   Sat Jan 4 17:29:20 2025 +0700

    [Maps] Outpost update (#2901)

commit 61860235df299e6a5f6a1ef919711a1659d36264
Merge: 3aeccf93f4 cf1fcce9a6
Author: no_mad <[email protected]>
Date:   Fri Jan 3 01:46:29 2025 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 3aeccf93f49fa6b69fa0c5603465c587f9c78b8b
Merge: d62afa3943 f9aa07ed8c
Author: no_mad <[email protected]>
Date:   Wed Dec 25 01:22:44 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit d62afa39436ebda4e8bb9b4bc83265fb88ca3292
Merge: 0d2766e6b6 03cf326d02
Author: no_mad <[email protected]>
Date:   Tue Dec 17 15:44:18 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 0d2766e6b68ecf7731b945e23b110efb1a16503d
Merge: 0e4ec8518e cdbe0e5563
Author: no_mad <[email protected]>
Date:   Sat Dec 14 20:14:50 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 0e4ec8518e57027126b5ccc15cf41843a272a064
Merge: 0d734ea535 d3149ccf9e
Author: no_mad <[email protected]>
Date:   Mon Dec 2 18:40:39 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 0d734ea535115009af26a12f5878ccfde14cbbf5
Merge: c569f5d13c 27b05d842b
Author: no_mad <[email protected]>
Date:   Wed Nov 27 15:05:17 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit c569f5d13c68d97f3b15d0c8022a4175ca76a921
Merge: 8941259e9a aeea8f4b62
Author: no_mad <[email protected]>
Date:   Sun Nov 24 10:40:59 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 8941259e9a30bdd205faea2c7550c65f7e2d130f
Merge: 9fcba454dc 99aa3f25c9
Author: no_mad <[email protected]>
Date:   Thu Nov 21 23:41:18 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 9fcba454dcf6cf9a0b3a12a3e87c43667a2647b3
Merge: a04dfec3f6 2d19dc1c23
Author: no_mad <[email protected]>
Date:   Sat Nov 2 13:06:23 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit a04dfec3f64673cdcb0b626053532940931d9210
Author: no_mad <[email protected]>
Date:   Mon Oct 28 16:20:55 2024 +0900

    Revert "konkurs шняга"

    This reverts commit 938817f473ffad50e041496d7e5db7c731dd1ae5.

commit 938817f473ffad50e041496d7e5db7c731dd1ae5
Author: no_mad <[email protected]>
Date:   Mon Oct 28 16:20:06 2024 +0900

    konkurs шняга

commit e40d43a02283c1eba032488bece66c73998feadc
Merge: fd48b66334 b5e913c9f8
Author: no_mad <[email protected]>
Date:   Mon Oct 28 15:20:06 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit fd48b663346f317955b6698a65547e7fb3706402
Merge: ef6bf97c43 8e16d577dd
Author: no_mad <[email protected]>
Date:   Wed Oct 23 17:11:43 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit ef6bf97c439aa161123e4afaa68e509abe60ac08
Merge: cc095b0968 07866cdaaa
Author: no_mad <[email protected]>
Date:   Sun Oct 20 11:25:11 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit cc095b09680a04e9a91c91d14a7ec707cd968073
Merge: e73604d7a7 3aeebd3266
Author: no_mad <[email protected]>
Date:   Tue Oct 15 15:54:20 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e73604d7a716bdcf98b3fb88e0f56de2ef68a66e
Merge: a7e0c98bc3 5262077b03
Author: no_mad <[email protected]>
Date:   Fri Oct 11 20:59:10 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit a7e0c98bc32dc1adf13c5bba49f9e53d958feea7
Merge: 4462f40a04 fef6a4aa65
Author: no_mad <[email protected]>
Date:   Tue Sep 24 18:11:20 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 4462f40a04c89c26f28537ed0693efe36de5f932
Merge: e1b675deb6 b5c65d82b6
Author: no_mad <[email protected]>
Date:   Wed Sep 18 16:17:23 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e1b675deb688877a581be9252d8737d28961778a
Merge: 72ef7600a1 a478eafafb
Author: no_mad <[email protected]>
Date:   Wed Sep 4 23:36:56 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 72ef7600a1ecf1d3d926bf36b0cf2e21e43ba9ee
Merge: ed64abf7d9 06f2b7af27
Author: no_mad <[email protected]>
Date:   Thu Aug 29 11:57:29 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit ed64abf7d9c80bad6bd4abedcb62ebe12e5f11ba
Merge: 95d0b7caba c16579f798
Author: no_mad <[email protected]>
Date:   Tue Aug 20 22:18:49 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 95d0b7caba6290ba43e7a1fd3e6b6094e9c45494
Merge: 7d5f4c1745 d853365ecb
Author: no_mad <[email protected]>
Date:   Fri Aug 16 03:01:09 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 7d5f4c1745d3e9641f867482021282774b605ae4
Merge: ab094b3d3d 09379a44f4
Author: no_mad <[email protected]>
Date:   Tue Jul 30 19:38:08 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit ab094b3d3d71919bd22adf455e47f4938f42d7db
Merge: e77890d85e 019f8cad73
Author: no_mad <[email protected]>
Date:   Fri Jul 26 19:03:04 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e77890d85ee16692fa7ba162dbe56d04684d4cba
Merge: e4d3586256 4570742f01
Author: no_mad <[email protected]>
Date:   Wed Jul 24 05:28:32 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e4d358625615142a26fb22830e54d5e7d55d5b42
Merge: 44d8429e89 37d98b0c48
Author: no_mad <[email protected]>
Date:   Fri Jul 19 12:58:30 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 44d8429e89836ea1620a0cf7a88aad673679fd70
Merge: bdf9b183ce 26d9830902
Author: no_mad <[email protected]>
Date:   Thu Jul 18 15:51:18 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit bdf9b183cebb1ab998622326dfe348242ed73a61
Merge: 9dc1b91c4a 020c7242b4
Author: no_mad <[email protected]>
Date:   Tue Jul 16 21:17:05 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 9dc1b91c4aeec872ee277baa37a673e15d060b28
Merge: 7c9748c1dd ab4550630f
Author: no_mad <[email protected]>
Date:   Wed Jul 10 14:54:36 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 7c9748c1dda06655047a6f483a2d22c9be7eb93a
Merge: c5d53d5d86 49468f2fc2
Author: no_mad <[email protected]>
Date:   Tue Jul 9 14:02:10 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit c5d53d5d863f976132d246cb713a3dea7f2078c4
Merge: f0da071518 625a279ac2
Author: no_mad <[email protected]>
Date:   Sun Jul 7 14:59:16 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit f0da0715187dd62f089d5d03efd6175dabdcb6a4
Merge: 78448bf807 54ef38c02d
Author: no_mad <[email protected]>
Date:   Sat Jul 6 20:53:20 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 78448bf80782342db060f72286c46db6911fb0cf
Merge: 1d5c0b08c2 fe735408df
Author: no_mad <[email protected]>
Date:   Thu Jul 4 21:59:54 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 1d5c0b08c2c46750c69df8409f933030f63db1d8
Merge: 21c5fa86cb 10579ca248
Author: no_mad <[email protected]>
Date:   Sun Jun 30 13:44:07 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 21c5fa86cbb4900e64fd04846608768a449f34a8
Merge: 142fb3d531 76a8dd947c
Author: no_mad <[email protected]>
Date:   Fri Jun 28 11:36:25 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 142fb3d531f0760570ff7aeee35a85a7c9f0af5c
Merge: 828ef24ab6 5534a85360
Author: no_mad <[email protected]>
Date:   Mon Jun 24 22:45:59 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 828ef24ab629d7f36dfcfd8ad93524dbb966ca6f
Merge: 23868b52e5 22449a6088
Author: no_mad <[email protected]>
Date:   Sat Jun 8 00:31:03 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 23868b52e5de3306feafce910d8b94bcc387e1d5
Merge: e12f96deb6 bab9d18bf8
Author: no_mad <[email protected]>
Date:   Tue Jun 4 14:49:34 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e12f96deb64cb00fadde92b7be95293155e32816
Merge: 1f4241be27 5700fe08af
Author: no_mad <[email protected]>
Date:   Fri May 31 20:59:48 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 1f4241be279d219b2c4479ec169751b8e662a681
Merge: 0683b34b32 fb6bf632b3
Author: no_mad <[email protected]>
Date:   Sun May 26 19:04:39 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 0683b34b32025cf21aef3effa48e056ce421f498
Merge: 62a818bfd6 d959053d8c
Author: no_mad <[email protected]>
Date:   Fri May 24 12:25:14 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 62a818bfd6f2257b4fa49a704a90d45739857160
Merge: 3fc8b9e7a7 386df6213d
Author: no_mad <[email protected]>
Date:   Tue May 21 17:43:25 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 3fc8b9e7a7e67069e0d80b9476244905adbb89fd
Merge: ef43920fae 0d954c3ef5
Author: no_mad <[email protected]>
Date:   Thu May 16 18:40:57 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit ef43920fae293928bad67006130b22a540fcbd6a
Merge: 71d6c07e49 deba47f675
Author: no_mad <[email protected]>
Date:   Sun May 12 09:10:52 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 71d6c07e4919bbd40f79ebc485965fd4d2fc6cec
Merge: e5c5b55a4b 01a5466e99
Author: no_mad <[email protected]>
Date:   Fri May 10 16:49:52 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e5c5b55a4b8cf72484ee80436c80b5b2b155435f
Merge: 531f8c085a 13d24c0c25
Author: no_mad <[email protected]>
Date:   Mon May 6 12:09:26 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 531f8c085a08d610ecf7ac945290f5e74a786004
Merge: dd76a0096f 5b30a3dca8
Author: no_mad <[email protected]>
Date:   Mon May 6 08:34:41 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit dd76a0096f1124893c8263103dd5f4cb866c52e2
Merge: eb52e2760d 96ff06c45d
Author: no_mad <[email protected]>
Date:   Sun May 5 23:23:28 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit eb52e2760d76672d9dba697eea2d6c62720bebbd
Merge: db8034debb 15159d8515
Author: no_mad <[email protected]>
Date:   Mon Apr 29 13:27:18 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit db8034debb205e4ce071749e0cf4edb4da245294
Merge: 36f4f650a0 95195e88be
Author: no_mad <[email protected]>
Date:   Sun Apr 28 11:04:02 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 36f4f650a0b7f36ea454de043136aec83fee2cb5
Merge: 4a6ce751e9 ced7463923
Author: no_mad <[email protected]>
Date:   Tue Apr 23 18:19:46 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 4a6ce751e938193f6bee72ce5a9a4d9f0b835dff
Merge: cc4f51947a 54833872f2
Author: no_mad <[email protected]>
Date:   Sun Apr 21 18:45:38 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit cc4f51947ac4716b04a3870825ffe821f28e1b68
Merge: 42c67e5721 768d438f32
Author: no_mad <[email protected]>
Date:   Mon Apr 15 15:58:05 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 42c67e5721c082160703cdaa7ac7b532118cb197
Merge: 7850054703 d9e44d9e17
Author: no_mad <[email protected]>
Date:   Fri Apr 12 07:25:00 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 7850054703e524dae1ae4d982894fb256cb59b4c
Author: no_mad <[email protected]>
Date:   Sun Apr 7 19:33:53 2024 +0900

    fks ленивая жопа

commit 7241f6df8579d47dad67733be9d589f0cd2c53bf
Merge: aa959c4080 a57092c4b1
Author: no_mad <[email protected]>
Date:   Sun Apr 7 19:23:30 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit aa959c40800802ed6521a3bb03dea297df6d9d1b
Merge: 7447cbda74 6a9b8e3685
Author: no_mad <[email protected]>
Date:   Wed Apr 3 20:09:34 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 7447cbda741e255fda0412fbfeb0127abab89388
Merge: b7c8314a56 7853c88525
Author: no_mad <[email protected]>
Date:   Mon Apr 1 15:25:02 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit b7c8314a56171873c4b551495f76eed05f42a025
Merge: 1be86fffb7 a0f0f4174b
Author: no_mad <[email protected]>
Date:   Sat Mar 30 20:47:16 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 1be86fffb72ecb2ba01ad6ae76e2d1b814ae2bbb
Merge: ab0f0fda6c fdc76b5f46
Author: no_mad <[email protected]>
Date:   Wed Mar 27 20:19:40 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit ab0f0fda6cadecd9ca2da909018b7fcbffcdf3b1
Merge: 5ce39f80b7 29963ad1b8
Author: no_mad <[email protected]>
Date:   Thu Mar 21 20:07:49 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 5ce39f80b79748271dc8054b6fe9d2ff62b58fdd
Merge: 6a1099aafa f81bfbab82
Author: no_mad <[email protected]>
Date:   Fri Mar 15 16:53:55 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 6a1099aafa05d9b56e2d92f4e675700cccd62ed6
Merge: 98315743f0 03c85587ca
Author: no_mad <[email protected]>
Date:   Thu Mar 14 22:05:25 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 98315743f05fa9ac31693633818dff056b340617
Merge: e6554ea395 8b6a0a5d14
Author: no_mad <[email protected]>
Date:   Mon Mar 11 21:16:26 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e6554ea3951952b72d43c884ab46a420a64432f1
Merge: e298cd2a3c 56d6e9eab8
Author: no_mad <[email protected]>
Date:   Wed Mar 6 11:20:55 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit e298cd2a3c47d348e13c1af0074557277edd6e1d
Merge: 1efb09a872 4a141ca68b
Author: no_mad <[email protected]>
Date:   Sat Feb 24 14:38:04 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 1efb09a872473fbc074dee5f19d24dbdfef03654
Merge: 542643f216 6cdc0e4bed
Author: no_mad <[email protected]>
Date:   Sun Feb 18 13:57:43 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 542643f2163e6189960a0f793b85f0b585a1e91c
Merge: d631ed3344 9723e954da
Author: no_mad <[email protected]>
Date:   Thu Feb 15 20:43:28 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit d631ed33446a4f5b03a638dfab17dfde93de7a3f
Merge: 52a29bfc8e 05b9f0dfe1
Author: no_mad <[email protected]>
Date:   Sat Feb 10 21:38:22 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 52a29bfc8e47009bf47744bc0c6ef910d28f1979
Merge: c717c1ea50 89d60fdb1b
Author: no_mad <[email protected]>
Date:   Thu Feb 8 10:54:45 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit c717c1ea500debec643c0257264bfef84e444d79
Merge: a32c7c77b6 4e4471c05e
Author: no_mad <[email protected]>
Date:   Tue Feb 6 19:34:49 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit a32c7c77b60516fcc9407be27c5be4c92ea6cb8d
Merge: bf861fb58f f1f751c838
Author: no_mad <[email protected]>
Date:   Fri Jan 26 20:17:08 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit bf861fb58f2f9c4ceaf59d02d21f3349d7fdaf94
Merge: 62601089a7 8fffdf3d45
Author: no_mad <[email protected]>
Date:   Tue Jan 23 19:54:37 2024 +0900

    Merge branch 'master' of https://github.com/nomad0260/space-station-14-

commit 62601089a7a748e1b5135e589c2297c481e993d1
Author: no_mad <[email protected]>
Date:   Fri Jan 19 18:46:24 2024 +0900

    Summey
  • Loading branch information
@nomad0260
nomad0260 committed Jan 17, 2025
1 parent c94c756 commit 78af74a
Show file tree
Hide file tree
Showing 595 changed files with 337,173 additions and 210,662 deletions.
5 changes: 3 additions & 2 deletions Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUser
button.Disabled = !interfaceEnabled;
if (interfaceEnabled)
{
button.Pressed = state.TargetAccessReaderIdAccessList?.Select(x => x.Id).Contains(accessName) ?? false;
button.Disabled = (!state.AllowedModifyAccessList?.Select(x => x.Id).Contains(accessName)) ?? true;
// Explicit cast because Rider gives a false error otherwise.
button.Pressed = state.TargetAccessReaderIdAccessList?.Contains((ProtoId<AccessLevelPrototype>) accessName) ?? false;
button.Disabled = (!state.AllowedModifyAccessList?.Contains((ProtoId<AccessLevelPrototype>) accessName)) ?? true;
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions Content.Client/Administration/UI/AdminMenuWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs"
xmlns:playerTab="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
xmlns:objectsTab="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab"
xmlns:baby="clr-namespace:Content.Client.Administration.UI.Tabs.BabyJailTab">
xmlns:panic="clr-namespace:Content.Client.Administration.UI.Tabs.PanicBunkerTab">
<TabContainer Name="MasterTabContainer">
<adminTab:AdminTab />
<adminbusTab:AdminbusTab />
<atmosTab:AtmosTab />
<tabs:RoundTab />
<tabs:ServerTab />
<panic:PanicBunkerTab Name="PanicBunkerControl" Access="Public" />
<baby:BabyJailTab Name="BabyJailControl" Access="Public" />
<playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
<objectsTab:ObjectsTab Name="ObjectsTabControl" Access="Public" />
</TabContainer>
Expand Down
5 changes: 0 additions & 5 deletions Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ public AdminMenuWindow()
MasterTabContainer.SetTabTitle((int) TabIndex.Round, Loc.GetString("admin-menu-round-tab"));
MasterTabContainer.SetTabTitle((int) TabIndex.Server, Loc.GetString("admin-menu-server-tab"));
MasterTabContainer.SetTabTitle((int) TabIndex.PanicBunker, Loc.GetString("admin-menu-panic-bunker-tab"));
/*
* TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
*/
MasterTabContainer.SetTabTitle((int) TabIndex.BabyJail, Loc.GetString("admin-menu-baby-jail-tab"));
MasterTabContainer.SetTabTitle((int) TabIndex.Players, Loc.GetString("admin-menu-players-tab"));
MasterTabContainer.SetTabTitle((int) TabIndex.Objects, Loc.GetString("admin-menu-objects-tab"));
MasterTabContainer.OnTabChanged += OnTabChanged;
Expand Down Expand Up @@ -52,7 +48,6 @@ private enum TabIndex
Round,
Server,
PanicBunker,
BabyJail,
Players,
Objects,
}
Expand Down
19 changes: 15 additions & 4 deletions Content.Client/Administration/UI/PermissionsEui.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ private void SaveAdminPressed(EditAdminWindow popup)
}

var title = string.IsNullOrWhiteSpace(popup.TitleEdit.Text) ? null : popup.TitleEdit.Text;
var suspended = popup.SuspendedCheckbox.Pressed;

if (popup.SourceData is { } src)
{
Expand All @@ -139,7 +140,8 @@ private void SaveAdminPressed(EditAdminWindow popup)
Title = title,
PosFlags = pos,
NegFlags = neg,
RankId = rank
RankId = rank,
Suspended = suspended,
});
}
else
Expand All @@ -152,7 +154,8 @@ private void SaveAdminPressed(EditAdminWindow popup)
Title = title,
PosFlags = pos,
NegFlags = neg,
RankId = rank
RankId = rank,
Suspended = suspended,
});
}

Expand All @@ -171,7 +174,7 @@ private void SaveAdminRankPressed(EditAdminRankWindow popup)
{
Id = src,
Flags = flags,
Name = name
Name = name,
});
}
else
Expand Down Expand Up @@ -351,6 +354,7 @@ private sealed class EditAdminWindow : DefaultWindow
public readonly OptionButton RankButton;
public readonly Button SaveButton;
public readonly Button? RemoveButton;
public readonly CheckBox SuspendedCheckbox;

public readonly Dictionary<AdminFlags, (Button inherit, Button sub, Button plus)> FlagButtons
= new();
Expand Down Expand Up @@ -381,6 +385,12 @@ public EditAdminWindow(PermissionsEui ui, PermissionsEuiState.AdminData? data)
RankButton = new OptionButton();
SaveButton = new Button { Text = Loc.GetString("permissions-eui-edit-admin-window-save-button"), HorizontalAlignment = HAlignment.Right };

SuspendedCheckbox = new CheckBox
{
Text = Loc.GetString("permissions-eui-edit-admin-window-suspended"),
Pressed = data?.Suspended ?? false,
};

RankButton.AddItem(Loc.GetString("permissions-eui-edit-admin-window-no-rank-button"), NoRank);
foreach (var (rId, rank) in ui._ranks)
{
Expand Down Expand Up @@ -488,7 +498,8 @@ public EditAdminWindow(PermissionsEui ui, PermissionsEuiState.AdminData? data)
{
nameControl,
TitleEdit,
RankButton
RankButton,
SuspendedCheckbox,
}
},
permGrid
Expand Down
6 changes: 0 additions & 6 deletions Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml
View file

This file was deleted.

21 changes: 0 additions & 21 deletions Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailStatusWindow.xaml.cs
View file

This file was deleted.

26 changes: 0 additions & 26 deletions Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml
View file

This file was deleted.

75 changes: 0 additions & 75 deletions Content.Client/Administration/UI/Tabs/BabyJailTab/BabyJailTab.xaml.cs
View file

This file was deleted.

1 change: 1 addition & 0 deletions Content.Client/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ namespace Content.Client
{
internal static class Program
{
[STAThread]
public static void Main(string[] args)
{
ContentStart.Start(args);
Expand Down
22 changes: 0 additions & 22 deletions Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Content.Client.Administration.UI;
using Content.Client.Administration.UI.Tabs.ObjectsTab;
using Content.Client.Administration.UI.Tabs.PanicBunkerTab;
using Content.Client.Administration.UI.Tabs.BabyJailTab;
using Content.Client.Administration.UI.Tabs.PlayerTab;
using Content.Client.Gameplay;
using Content.Client.Lobby;
Expand Down Expand Up @@ -38,13 +37,11 @@ public sealed class AdminUIController : UIController,
private AdminMenuWindow? _window;
private MenuButton? AdminButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.AdminButton;
private PanicBunkerStatus? _panicBunker;
private BabyJailStatus? _babyJail;

public override void Initialize()
{
base.Initialize();
SubscribeNetworkEvent<PanicBunkerChangedEvent>(OnPanicBunkerUpdated);
SubscribeNetworkEvent<BabyJailChangedEvent>(OnBabyJailUpdated);
}

private void OnPanicBunkerUpdated(PanicBunkerChangedEvent msg, EntitySessionEventArgs args)
Expand All @@ -59,18 +56,6 @@ private void OnPanicBunkerUpdated(PanicBunkerChangedEvent msg, EntitySessionEven
}
}

private void OnBabyJailUpdated(BabyJailChangedEvent msg, EntitySessionEventArgs args)
{
var showDialog = _babyJail == null && msg.Status.Enabled;
_babyJail = msg.Status;
_window?.BabyJailControl.UpdateStatus(msg.Status);

if (showDialog)
{
UIManager.CreateWindow<BabyJailStatusWindow>().OpenCentered();
}
}

public void OnStateEntered(GameplayState state)
{
EnsureWindow();
Expand Down Expand Up @@ -116,13 +101,6 @@ private void EnsureWindow()
if (_panicBunker != null)
_window.PanicBunkerControl.UpdateStatus(_panicBunker);

/*
* TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
*/

if (_babyJail != null)
_window.BabyJailControl.UpdateStatus(_babyJail);

_window.PlayerTabControl.OnEntryKeyBindDown += PlayerTabEntryKeyBindDown;
_window.ObjectsTabControl.OnEntryKeyBindDown += ObjectsTabEntryKeyBindDown;
_window.OnOpen += OnWindowOpen;
Expand Down
4 changes: 2 additions & 2 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,14 @@ public sealed class PostMapInitTest
"CorvaxMaus",
"CorvaxIshimura",
"CorvaxPaper",
"CorvaxCute",
"CorvaxPilgrim",
"CorvaxSplit",
"CorvaxTerra",
"CorvaxFrame",
"CorvaxPearl",
"CorvaxTushkan",
//"CorvaxGlacier",
"CorvaxAwesome",
"Origin",
// Corvax-End
"Dev",
"TestTeg",
Expand Down Expand Up @@ -98,6 +97,7 @@ public sealed class PostMapInitTest
"Gate",
"Amber",
"Loop",
"Plasma",
"Elkridge"


Expand Down
10 changes: 8 additions & 2 deletions Content.Packaging/ClientPackaging.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,13 @@ public static async Task WriteResources(
var graph = new RobustClientAssetGraph();
pass.Dependencies.Add(new AssetPassDependency(graph.Output.Name));

AssetGraph.CalculateGraph(graph.AllPasses.Append(pass).ToArray(), logger);
var dropSvgPass = new AssetPassFilterDrop(f => f.Path.EndsWith(".svg"))
{
Name = "DropSvgPass",
};
dropSvgPass.AddDependency(graph.Input).AddBefore(graph.PresetPasses);

AssetGraph.CalculateGraph([pass, dropSvgPass, ..graph.AllPasses], logger);

var inputPass = graph.Input;

Expand All @@ -97,7 +103,7 @@ await RobustSharedPackaging.WriteContentAssemblies(
assemblies, // Corvax-Secrets
cancel: cancel);

await WriteClientResources(contentDir, pass, cancel); // Corvax-Secrets: Support content resource ignore to ignore server-only prototypes
await WriteClientResources(contentDir, inputPass, cancel); // Corvax-Secrets: Support content resource ignore to ignore server-only prototypes

inputPass.InjectFinished();
}
Expand Down
Loading

0 comments on commit 78af74a

Please sign in to comment.