juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream

Browse Source 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
This commit is contained in:
Ed
2024-10-15 15:25:44 +03:00
parent d259191d3d 519a6b2474
commit dc47bb2283
146 changed files with 11990 additions and 20002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Resources/Changelog/Admin.yml
View File

@@ -552,5 +552,12 @@ Entries:
id: 68
time: '2024-09-23T07:28:42.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32395
- author: SlamBamActionman
changes:
- message: Added admin logging for generated codewords.
type: Add
id: 69
time: '2024-10-09T11:55:49.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32531
Name: Admin
Order: 1

259
Resources/Changelog/Changelog.yml
View File

@@ -1,126 +1,4 @@
Entries:
- author: Moomoobeef
changes:
- message: Some radio channel colors have been tweaked in order to be more easily
distinguishable.
type: Tweak
id: 6984
time: '2024-07-26T06:47:20.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30133
- author: Errant
changes:
- message: Replay ghosts now actually spawn on the proper station, take two.
type: Fix
id: 6985
time: '2024-07-26T12:59:43.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30273
- author: themias
changes:
- message: Arcade machines are functional again
type: Fix
id: 6986
time: '2024-07-26T17:30:50.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30376
- author: themias
changes:
- message: Zombies now get uncuffed upon transformation
type: Fix
id: 6987
time: '2024-07-26T18:48:03.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30321
- author: metalgearsloth
changes:
- message: Fix grid labels getting spammed from VGRoid.
type: Fix
id: 6988
time: '2024-07-27T01:54:38.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/29946
- author: GoldenCan
changes:
- message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe.
type: Add
id: 6989
time: '2024-07-27T04:09:24.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30249
- author: Plykiya
changes:
- message: Thief game rule now properly selects more than one thief.
type: Fix
id: 6990
time: '2024-07-27T07:27:21.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30393
- author: BombasterDS
changes:
- message: Added new plant mutations for apple, sugarcane and galaxythistle
type: Add
id: 6991
time: '2024-07-27T15:08:49.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/28993
- author: Spessmann
changes:
- message: Thief objectives for figurines and stamps now require less items
type: Tweak
id: 6992
time: '2024-07-27T23:11:27.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30390
- author: metalgearsloth
changes:
- message: Moved VGRoid from 1,000m away to ~500m.
type: Tweak
id: 6993
time: '2024-07-28T03:14:18.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/29943
- author: lzk228
changes:
- message: Fixed pancakes stacks. Before it, splitting not default pancakes stacks
would give you default pancakes.
type: Fix
id: 6994
time: '2024-07-28T03:49:06.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30270
- author: Plykiya
changes:
- message: Fixed the client mispredicting people slipping with their magboots turned
on
type: Fix
id: 6995
time: '2024-07-28T06:17:06.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30425
- author: Katzenminer
changes:
- message: Pun and similar pets are no longer firemune
type: Fix
id: 6996
time: '2024-07-28T08:32:27.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30424
- author: lzk228
changes:
- message: Fixed permanent absence of the approver string in cargo invoice.
type: Fix
id: 6997
time: '2024-07-29T06:19:43.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/29690
- author: JIPDawg
changes:
- message: F9 is correctly bound to the Round End Summary window by default now.
type: Fix
id: 6998
time: '2024-07-29T06:49:28.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30438
- author: githubuser508
changes:
- message: Candles crate and the ability for Cargo to order it.
type: Add
id: 6999
time: '2024-07-29T08:29:27.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/29736
- author: Blackern5000
changes:
- message: Emergency oxygen and fire lockers now generally contain more supplies
type: Tweak
id: 7000
time: '2024-07-29T09:57:04.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/29230
- author: Moomoobeef
changes:
- message: Added the ability to wear lizard plushies on your head!
@@ -3937,3 +3815,140 @@
id: 7483
time: '2024-10-03T14:01:01.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32552
- author: Southbridge
changes:
- message: Box station's recycler has been properly connected.
type: Fix
- message: Box station's singlo substation has been rewired to the station-wide
HV network.
type: Tweak
- message: Box station now has AI law boards in the upload room.
type: Add
id: 7484
time: '2024-10-04T01:12:59.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32608
- author: Plykiya
changes:
- message: You can no longer FTL the station.
type: Fix
id: 7485
time: '2024-10-04T02:55:36.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32558
- author: SoulFN
changes:
- message: Dragon can now pull things using tail.
type: Add
id: 7486
time: '2024-10-04T05:39:50.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32568
- author: SaphireLattice
changes:
- message: Explosives throw a container they are in
type: Tweak
id: 7487
time: '2024-10-04T08:43:45.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32428
- author: SaphireLattice
changes:
- message: Syndicate C4 now starts a countdown on signal, rather than exploding
instantly.
type: Tweak
id: 7488
time: '2024-10-04T09:34:49.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32423
- author: slarticodefast
changes:
- message: Light bulbs now fit into the trash bag again.
type: Fix
id: 7489
time: '2024-10-05T18:44:47.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32452
- author: Just_Art
changes:
- message: Added a flower wreath and hairflower to loadout!
type: Add
id: 7490
time: '2024-10-06T12:48:49.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32097
- author: Golinth
changes:
- message: Removed clown waddling until implemented properly
type: Remove
id: 7491
time: '2024-10-06T13:33:02.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32652
- author: SaphireLattice
changes:
- message: Minibomb is now explosion resistant and will start counting down if damaged
by a C4
type: Tweak
id: 7492
time: '2024-10-07T22:42:43.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32429
- author: shampunj
changes:
- message: When curtains are destroyed, only 1 cloth drops out
type: Tweak
id: 7493
time: '2024-10-08T09:51:23.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32685
- author: Plykiya
changes:
- message: Librarians now start with a D20.
type: Tweak
id: 7494
time: '2024-10-08T09:53:50.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32648
- author: K-Dynamic
changes:
- message: CHIMP and APE particles should be almost as fast as before
type: Tweak
id: 7495
time: '2024-10-08T18:29:37.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32690
- author: ss14nekow
changes:
- message: Added pumpkin pie! Can be made in the microwave with 1 pie tin, 1 pie
dough, and 1 pumpkin.
type: Add
id: 7496
time: '2024-10-08T23:29:41.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32623
- author: Beck Thompson
changes:
- message: The radio jammers price has been decreased from 4 -> 3 TC.
type: Tweak
id: 7497
time: '2024-10-09T12:44:38.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32472
- author: beck-thompson, Moomoobeef
changes:
- message: Plushies now can have small items stuffed inside of them! To open, click
on the plush with a sharp item. You can then insert a small item into the plush.
To close, just click on it again with any sharp item!
type: Add
- message: When pAIs are inserted into plushies, their names will be updated to
the plushies name. E.g when inside a lizard plushie the pAI's name will appear
as "lizard plushie" when speaking.
type: Add
id: 7498
time: '2024-10-09T18:01:32.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30805
- author: Errant
changes:
- message: Nukies now have role briefing on their character screen.
type: Tweak
- message: Animals who are made Thief no longer get told in their briefing about
the thief gear that they don't actually have and couldn't possibly use.
type: Fix
id: 7499
time: '2024-10-10T08:48:57.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31318
- author: nikthechampiongr
changes:
- message: It is no longer impossible to do bounties other than the first one if
the server has been up for a long period of time.
type: Fix
id: 7500
time: '2024-10-10T14:35:36.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32700

3
Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
View File

@@ -2,5 +2,6 @@
### Announcement
earlyleave-cryo-job-unknown = Unknown
earlyleave-cryo-announcement = {$character} ({$job}) { CONJUGATE-HAVE($entity) } entered cryogenic storage!
# {$entity} available for GENDER function purposes
earlyleave-cryo-announcement = {$character} ({$job}) has entered cryogenic storage!
earlyleave-cryo-sender = Station

1
Resources/Locale/en-US/game-ticking/game-presets/preset-nukeops.ftl
View File

@@ -4,6 +4,7 @@ nukeops-description = Nuclear operatives have targeted the station. Try to keep
nukeops-welcome =
You are a nuclear operative. Your goal is to blow up {$station}, and ensure that it is nothing but a pile of rubble. Your bosses, the Syndicate, have provided you with the tools you'll need for the task.
Operation {$name} is a go ! Death to Nanotrasen!
nukeops-briefing = Your objectives are simple. Deliver the payload and make sure it detonates. Begin mission.
nukeops-opsmajor = [color=crimson]Syndicate major victory![/color]
nukeops-opsminor = [color=crimson]Syndicate minor victory![/color]

5
Resources/Locale/en-US/job/job-names.ftl
View File

@@ -62,6 +62,11 @@ job-name-unknown = Unknown
job-name-virologist = Virologist
job-name-zombie = Zombie
# Job titles
job-title-visitor = Visitor
job-title-cluwne = Cluwne
job-title-universal = Universal
# Role timers - Make these alphabetical or I cut you
JobAtmosphericTechnician = Atmospheric Technician
JobBartender = Bartender

24
Resources/Locale/en-US/job/job-supervisors.ftl
View File

@@ -1,15 +1,15 @@
job-supervisors-centcom = Central Command
job-supervisors-captain = the captain
job-supervisors-hop = the head of personnel
job-supervisors-hos = the head of security
job-supervisors-ce = the chief engineer
job-supervisors-cmo = the chief medical officer
job-supervisors-rd = the research director
job-supervisors-qm = the quartermaster
job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
job-supervisors-security = security officers, the warden, and the head of security
job-supervisors-science = scientists, and the research director
job-supervisors-captain = the Captain
job-supervisors-hop = the Head of Personnel
job-supervisors-hos = the Head of Security
job-supervisors-ce = the Chief Engineer
job-supervisors-cmo = the Chief Medical Officer
job-supervisors-rd = the Research Director
job-supervisors-qm = the Quartermaster
job-supervisors-service = Chefs, Botanists, the Bartender, and the Head of Personnel
job-supervisors-engineering = Station Engineers, Atmospheric Technicians, and the Chief Engineer
job-supervisors-medicine = Medical Doctors, Paramedics, Chemists, and the Chief Medical Officer
job-supervisors-security = Security Officers, the Warden, and the Head of Security
job-supervisors-science = Scientists and the Research Director
job-supervisors-hire = whoever hires you
job-supervisors-everyone = absolutely everyone

3
Resources/Locale/en-US/machine-linking/receiver_ports.ftl
View File

@@ -28,6 +28,9 @@ signal-port-description-doorbolt = Bolts door when HIGH.
signal-port-name-trigger = Trigger
signal-port-description-trigger = Triggers some mechanism on the device.
signal-port-name-timer = Timer
signal-port-description-timer = Starts the timer countdown of the device.
signal-port-name-order-sender = Order sender
signal-port-description-order-sender = Cargo console order sender

1
Resources/Locale/en-US/shuttles/console.ftl
View File

@@ -4,6 +4,7 @@ shuttle-pilot-end = Stopped piloting
shuttle-console-in-ftl = Currently in FTL
shuttle-console-mass = Too large to FTL
shuttle-console-prevent = You are unable to pilot this ship
shuttle-console-static = Grid is static
# NAV

1
Resources/Locale/en-US/storage/components/secret-stash-component.ftl
View File

@@ -22,3 +22,4 @@ comp-secret-stash-verb-open = Open
### Stash names
secret-stash-plant = plant
secret-stash-toilet = toilet cistern
secret-stash-plushie = plushie

232
Resources/Maps/box.yml
View File

@@ -11579,7 +11579,7 @@ entities:
pos: 24.5,16.5
parent: 8364
- type: Door
secondsUntilStateChange: -15146.963
secondsUntilStateChange: -16708.217
state: Opening
- type: DeviceLinkSource
lastSignals:
@@ -14682,6 +14682,13 @@ entities:
rot: 1.5707963267948966 rad
pos: 8.5,-46.5
parent: 8364
- proto: ArtistCircuitBoard
entities:
- uid: 27915
components:
- type: Transform
pos: -4.5121183,-14.413322
parent: 8364
- proto: Ash
entities:
- uid: 13307
@@ -14689,6 +14696,13 @@ entities:
- type: Transform
pos: -36.5,20.5
parent: 8364
- proto: AsimovCircuitBoard
entities:
- uid: 27912
components:
- type: Transform
pos: 3.2198467,-12.066172
parent: 8364
- proto: AsteroidRock
entities:
- uid: 2042
@@ -39720,12 +39734,12 @@ entities:
- uid: 3869
components:
- type: Transform
pos: 13.5,-74.5
pos: 15.5,-77.5
parent: 8364
- uid: 4050
components:
- type: Transform
pos: 8.5,-74.5
pos: 10.5,-80.5
parent: 8364
- uid: 4519
components:
@@ -39735,7 +39749,7 @@ entities:
- uid: 4553
components:
- type: Transform
pos: 15.5,-74.5
pos: 11.5,-80.5
parent: 8364
- uid: 4585
components:
@@ -39785,7 +39799,7 @@ entities:
- uid: 4973
components:
- type: Transform
pos: 7.5,-74.5
pos: 9.5,-80.5
parent: 8364
- uid: 4988
components:
@@ -41467,11 +41481,6 @@ entities:
- type: Transform
pos: 23.5,23.5
parent: 8364
- uid: 8185
components:
- type: Transform
pos: 5.5,-74.5
parent: 8364
- uid: 8434
components:
- type: Transform
@@ -42860,7 +42869,7 @@ entities:
- uid: 10762
components:
- type: Transform
pos: 6.5,-74.5
pos: 8.5,-80.5
parent: 8364
- uid: 10783
components:
@@ -44167,6 +44176,16 @@ entities:
- type: Transform
pos: -6.5,-50.5
parent: 8364
- uid: 15804
components:
- type: Transform
pos: 10.5,-81.5
parent: 8364
- uid: 15810
components:
- type: Transform
pos: -0.5,-79.5
parent: 8364
- uid: 15815
components:
- type: Transform
@@ -44965,12 +44984,7 @@ entities:
- uid: 17602
components:
- type: Transform
pos: 14.5,-74.5
parent: 8364
- uid: 17697
components:
- type: Transform
pos: 12.5,-74.5
pos: 15.5,-76.5
parent: 8364
- uid: 17698
components:
@@ -46147,15 +46161,10 @@ entities:
- type: Transform
pos: 25.5,-109.5
parent: 8364
- uid: 23221
components:
- type: Transform
pos: 11.5,-74.5
parent: 8364
- uid: 23223
components:
- type: Transform
pos: 10.5,-74.5
pos: 12.5,-80.5
parent: 8364
- uid: 23238
components:
@@ -46172,6 +46181,11 @@ entities:
- type: Transform
pos: 23.5,-109.5
parent: 8364
- uid: 24687
components:
- type: Transform
pos: 13.5,-80.5
parent: 8364
- uid: 25012
components:
- type: Transform
@@ -46805,17 +46819,17 @@ entities:
- uid: 26589
components:
- type: Transform
pos: 9.5,-81.5
pos: 14.5,-80.5
parent: 8364
- uid: 26591
components:
- type: Transform
pos: 9.5,-80.5
pos: 15.5,-80.5
parent: 8364
- uid: 26608
components:
- type: Transform
pos: 9.5,-79.5
pos: 15.5,-79.5
parent: 8364
- uid: 26627
components:
@@ -47000,7 +47014,7 @@ entities:
- uid: 27230
components:
- type: Transform
pos: 7.5,-81.5
pos: 15.5,-78.5
parent: 8364
- uid: 27461
components:
@@ -47192,6 +47206,31 @@ entities:
- type: Transform
pos: 9.5,-68.5
parent: 8364
- uid: 27905
components:
- type: Transform
pos: 9.5,-71.5
parent: 8364
- uid: 27906
components:
- type: Transform
pos: 9.5,-72.5
parent: 8364
- uid: 27907
components:
- type: Transform
pos: 9.5,-70.5
parent: 8364
- uid: 27908
components:
- type: Transform
pos: 9.5,-69.5
parent: 8364
- uid: 27909
components:
- type: Transform
pos: 9.5,-73.5
parent: 8364
- proto: CableHVStack
entities:
- uid: 1683
@@ -64174,6 +64213,11 @@ entities:
- type: Transform
pos: 1.5,28.5
parent: 8364
- uid: 27919
components:
- type: Transform
pos: 2.7203026,-11.488351
parent: 8364
- proto: ChairOfficeLight
entities:
- uid: 5220
@@ -69939,6 +69983,13 @@ entities:
rot: 3.141592653589793 rad
pos: 22.5,-3.5
parent: 8364
- proto: CommandmentCircuitBoard
entities:
- uid: 27910
components:
- type: Transform
pos: -4.600172,-11.893632
parent: 8364
- proto: CommsComputerCircuitboard
entities:
- uid: 16499
@@ -70504,65 +70555,87 @@ entities:
rot: -1.5707963267948966 rad
pos: -60.5,-15.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6227
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -59.5,-15.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6228
components:
- type: Transform
pos: -57.5,-15.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6229
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -57.5,-16.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6230
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -58.5,-16.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6231
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -59.5,-16.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6232
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -60.5,-16.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6233
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -61.5,-16.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6234
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -61.5,-17.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6235
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -61.5,-18.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 6236
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -61.5,-19.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 7162
components:
- type: Transform
@@ -70647,6 +70720,8 @@ entities:
rot: 3.141592653589793 rad
pos: -61.5,-20.5
parent: 8364
- type: DeviceLinkSink
invokeCounter: 4
- uid: 17202
components:
- type: Transform
@@ -70724,6 +70799,13 @@ entities:
- type: Transform
pos: 90.5,-27.5
parent: 8364
- proto: CorporateCircuitBoard
entities:
- uid: 27914
components:
- type: Transform
pos: -4.441743,-12.321369
parent: 8364
- proto: CowToolboxFilled
entities:
- uid: 13853
@@ -81392,6 +81474,13 @@ entities:
- type: Transform
pos: -33.51487,5.3832693
parent: 8364
- proto: DrinkHotCoffee
entities:
- uid: 27918
components:
- type: Transform
pos: 3.3560345,-11.363264
parent: 8364
- proto: DrinkMugBlack
entities:
- uid: 18382
@@ -81446,6 +81535,13 @@ entities:
- type: Transform
pos: 74.3515,-18.443996
parent: 8364
- proto: DungeonMasterCircuitBoard
entities:
- uid: 27917
components:
- type: Transform
pos: 3.5477152,-12.389968
parent: 8364
- proto: EmergencyLight
entities:
- uid: 21308
@@ -84322,7 +84418,7 @@ entities:
pos: -34.5,-14.5
parent: 8364
- type: Door
secondsUntilStateChange: -9335.5
secondsUntilStateChange: -10896.755
state: Closing
- uid: 15010
components:
@@ -84814,6 +84910,9 @@ entities:
- type: Transform
pos: -4.5,-71.5
parent: 8364
- type: Door
secondsUntilStateChange: -2644.4858
state: Closing
- proto: Fireplace
entities:
- uid: 11559
@@ -119851,6 +119950,12 @@ entities:
- type: Transform
pos: 15.5,-41.5
parent: 8364
- uid: 21746
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-80.5
parent: 8364
- uid: 21751
components:
- type: Transform
@@ -120086,6 +120191,12 @@ entities:
- type: Transform
pos: 17.5,-52.5
parent: 8364
- uid: 23221
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-81.5
parent: 8364
- uid: 23222
components:
- type: Transform
@@ -124581,6 +124692,13 @@ entities:
- type: Transform
pos: 32.5,-6.5
parent: 8364
- proto: NTDefaultCircuitBoard
entities:
- uid: 27913
components:
- type: Transform
pos: -4.5442195,-11.268198
parent: 8364
- proto: NuclearBomb
entities:
- uid: 12086
@@ -124595,6 +124713,13 @@ entities:
- type: Transform
pos: 8.5,-27.5
parent: 8364
- proto: NutimovCircuitBoard
entities:
- uid: 27916
components:
- type: Transform
pos: 3.6621494,-11.814552
parent: 8364
- proto: OperatingTable
entities:
- uid: 2385
@@ -124868,6 +124993,13 @@ entities:
- type: Transform
pos: 58.5,-11.5
parent: 8364
- proto: PaladinCircuitBoard
entities:
- uid: 27911
components:
- type: Transform
pos: -4.443845,-11.67473
parent: 8364
- proto: Paper
entities:
- uid: 1779
@@ -137083,6 +137215,12 @@ entities:
- type: Transform
pos: -3.5,-20.5
parent: 8364
- uid: 8185
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-81.5
parent: 8364
- uid: 8207
components:
- type: Transform
@@ -137907,6 +138045,12 @@ entities:
- type: Transform
pos: 25.5,-75.5
parent: 8364
- uid: 17697
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 10.5,-80.5
parent: 8364
- uid: 17787
components:
- type: Transform
@@ -138440,6 +138584,13 @@ entities:
- type: Transform
pos: 0.2510581,39.68831
parent: 8364
- proto: RobocopCircuitBoard
entities:
- uid: 22443
components:
- type: Transform
pos: 3.4364183,-14.443886
parent: 8364
- proto: RobustHarvestChemistryBottle
entities:
- uid: 13505
@@ -143986,6 +144137,13 @@ entities:
- type: Transform
pos: -20.5,-74.5
parent: 8364
- proto: StationEfficiencyCircuitBoard
entities:
- uid: 27536
components:
- type: Transform
pos: -4.631007,-12.460042
parent: 8364
- proto: StationMap
entities:
- uid: 27690
@@ -151539,8 +151697,12 @@ entities:
- Right: Reverse
- Middle: Off
6120:
- Left: Forward
- Right: Reverse
- Left: Forward
- Middle: Off
16588:
- Right: Reverse
- Left: Forward
- Middle: Off
- uid: 16780
components:
@@ -161682,16 +161844,6 @@ entities:
- type: Transform
pos: 10.5,-79.5
parent: 8364
- uid: 15804
components:
- type: Transform
pos: 10.5,-81.5
parent: 8364
- uid: 15810
components:
- type: Transform
pos: 10.5,-80.5
parent: 8364
- uid: 15813
components:
- type: Transform
@@ -172478,7 +172630,7 @@ entities:
rot: 1.5707963267948966 rad
pos: 8.5,-18.5
parent: 8364
- uid: 21746
- uid: 31746
components:
- type: Transform
rot: 3.141592653589793 rad

18700
Resources/Maps/cog.yml
View File

File diff suppressed because it is too large Load Diff

9882
Resources/Maps/core.yml
View File

File diff suppressed because it is too large Load Diff

65
Resources/Maps/marathon.yml
View File

@@ -28118,11 +28118,6 @@ entities:
- type: Transform
pos: -56.5,-26.5
parent: 30
- uid: 19145
components:
- type: Transform
pos: -69.5,-40.5
parent: 30
- uid: 19146
components:
- type: Transform
@@ -28138,11 +28133,6 @@ entities:
- type: Transform
pos: -68.5,-29.5
parent: 30
- uid: 19150
components:
- type: Transform
pos: -73.5,-41.5
parent: 30
- uid: 19151
components:
- type: Transform
@@ -138472,56 +138462,6 @@ entities:
- type: Transform
pos: -70.5,-62.5
parent: 30
- uid: 17774
components:
- type: Transform
pos: -61.5,-66.5
parent: 30
- uid: 17777
components:
- type: Transform
pos: -71.5,-64.5
parent: 30
- uid: 17778
components:
- type: Transform
pos: -70.5,-64.5
parent: 30
- uid: 17779
components:
- type: Transform
pos: -69.5,-64.5
parent: 30
- uid: 17780
components:
- type: Transform
pos: -68.5,-64.5
parent: 30
- uid: 17781
components:
- type: Transform
pos: -68.5,-65.5
parent: 30
- uid: 17782
components:
- type: Transform
pos: -68.5,-66.5
parent: 30
- uid: 17783
components:
- type: Transform
pos: -67.5,-66.5
parent: 30
- uid: 17784
components:
- type: Transform
pos: -66.5,-66.5
parent: 30
- uid: 17786
components:
- type: Transform
pos: -65.5,-66.5
parent: 30
- uid: 17787
components:
- type: Transform
@@ -138602,11 +138542,6 @@ entities:
- type: Transform
pos: -54.5,-61.5
parent: 30
- uid: 18082
components:
- type: Transform
pos: -61.5,-67.5
parent: 30
- uid: 18087
components:
- type: Transform

273
Resources/Maps/oasis.yml
View File

@@ -14470,7 +14470,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -75908.84
secondsUntilStateChange: -76151.9
state: Opening
- uid: 6934
components:
@@ -14482,7 +14482,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -75911.48
secondsUntilStateChange: -76154.53
state: Opening
- uid: 6935
components:
@@ -14494,7 +14494,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -75910.33
secondsUntilStateChange: -76153.38
state: Opening
- uid: 6936
components:
@@ -14505,7 +14505,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -75909.55
secondsUntilStateChange: -76152.6
state: Opening
- proto: AirlockTheatreLocked
entities:
@@ -15707,12 +15707,6 @@ entities:
rot: 3.141592653589793 rad
pos: -20.5,-5.5
parent: 2
- uid: 2421
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 39.5,-18.5
parent: 2
- uid: 2763
components:
- type: Transform
@@ -15885,6 +15879,30 @@ entities:
rot: 3.141592653589793 rad
pos: 25.5,35.5
parent: 2
- uid: 29578
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 34.5,-13.5
parent: 2
- uid: 29579
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 45.5,-8.5
parent: 2
- uid: 29580
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 31.5,-23.5
parent: 2
- uid: 29581
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 55.5,-17.5
parent: 2
- proto: APCElectronics
entities:
- uid: 5818
@@ -42197,27 +42215,27 @@ entities:
- uid: 4624
components:
- type: Transform
pos: 38.5,-17.5
pos: 54.5,-17.5
parent: 2
- uid: 4625
components:
- type: Transform
pos: 39.5,-17.5
pos: 34.5,-13.5
parent: 2
- uid: 4626
components:
- type: Transform
pos: 40.5,-17.5
pos: 39.5,-11.5
parent: 2
- uid: 4627
components:
- type: Transform
pos: 41.5,-17.5
pos: 55.5,-17.5
parent: 2
- uid: 4628
components:
- type: Transform
pos: 41.5,-18.5
pos: 53.5,-14.5
parent: 2
- uid: 4629
components:
@@ -42292,7 +42310,7 @@ entities:
- uid: 4643
components:
- type: Transform
pos: 38.5,-16.5
pos: 47.5,-14.5
parent: 2
- uid: 4644
components:
@@ -42404,11 +42422,6 @@ entities:
- type: Transform
pos: 31.5,-15.5
parent: 2
- uid: 4666
components:
- type: Transform
pos: 41.5,-17.5
parent: 2
- uid: 4667
components:
- type: Transform
@@ -42652,12 +42665,7 @@ entities:
- uid: 4823
components:
- type: Transform
pos: 50.5,-16.5
parent: 2
- uid: 4824
components:
- type: Transform
pos: 50.5,-15.5
pos: 60.5,18.5
parent: 2
- uid: 4825
components:
@@ -43042,7 +43050,7 @@ entities:
- uid: 5414
components:
- type: Transform
pos: 39.5,-18.5
pos: 46.5,-8.5
parent: 2
- uid: 5463
components:
@@ -50027,7 +50035,7 @@ entities:
- uid: 13051
components:
- type: Transform
pos: 56.5,16.5
pos: 45.5,-8.5
parent: 2
- uid: 13052
components:
@@ -56209,6 +56217,46 @@ entities:
- type: Transform
pos: -59.5,-8.5
parent: 2
- uid: 29575
components:
- type: Transform
pos: 60.5,19.5
parent: 2
- uid: 29576
components:
- type: Transform
pos: 60.5,20.5
parent: 2
- uid: 29577
components:
- type: Transform
pos: 60.5,21.5
parent: 2
- uid: 29582
components:
- type: Transform
pos: 33.5,-23.5
parent: 2
- uid: 29583
components:
- type: Transform
pos: 32.5,-23.5
parent: 2
- uid: 29584
components:
- type: Transform
pos: 31.5,-23.5
parent: 2
- uid: 29585
components:
- type: Transform
pos: 37.5,-20.5
parent: 2
- uid: 29586
components:
- type: Transform
pos: 37.5,-19.5
parent: 2
- proto: CableApcStack1
entities:
- uid: 23589
@@ -63885,7 +63933,7 @@ entities:
- uid: 418
components:
- type: Transform
pos: 39.5,-18.5
pos: 46.5,-8.5
parent: 2
- uid: 867
components:
@@ -63927,6 +63975,11 @@ entities:
- type: Transform
pos: -25.5,0.5
parent: 2
- uid: 2421
components:
- type: Transform
pos: 53.5,-17.5
parent: 2
- uid: 3299
components:
- type: Transform
@@ -64200,12 +64253,17 @@ entities:
- uid: 4564
components:
- type: Transform
pos: 40.5,-17.5
pos: 54.5,-17.5
parent: 2
- uid: 4565
components:
- type: Transform
pos: 39.5,-17.5
pos: 55.5,-17.5
parent: 2
- uid: 4666
components:
- type: Transform
pos: 47.5,-8.5
parent: 2
- uid: 4686
components:
@@ -64657,6 +64715,11 @@ entities:
- type: Transform
pos: 43.5,-37.5
parent: 2
- uid: 4824
components:
- type: Transform
pos: 48.5,-8.5
parent: 2
- uid: 4855
components:
- type: Transform
@@ -69467,6 +69530,146 @@ entities:
- type: Transform
pos: 25.5,35.5
parent: 2
- uid: 29587
components:
- type: Transform
pos: 45.5,-8.5
parent: 2
- uid: 29588
components:
- type: Transform
pos: 40.5,-21.5
parent: 2
- uid: 29589
components:
- type: Transform
pos: 39.5,-21.5
parent: 2
- uid: 29590
components:
- type: Transform
pos: 38.5,-21.5
parent: 2
- uid: 29591
components:
- type: Transform
pos: 36.5,-21.5
parent: 2
- uid: 29592
components:
- type: Transform
pos: 35.5,-21.5
parent: 2
- uid: 29593
components:
- type: Transform
pos: 34.5,-21.5
parent: 2
- uid: 29594
components:
- type: Transform
pos: 37.5,-21.5
parent: 2
- uid: 29595
components:
- type: Transform
pos: 34.5,-22.5
parent: 2
- uid: 29596
components:
- type: Transform
pos: 34.5,-23.5
parent: 2
- uid: 29597
components:
- type: Transform
pos: 33.5,-23.5
parent: 2
- uid: 29598
components:
- type: Transform
pos: 32.5,-23.5
parent: 2
- uid: 29599
components:
- type: Transform
pos: 31.5,-23.5
parent: 2
- uid: 29600
components:
- type: Transform
pos: 40.5,-17.5
parent: 2
- uid: 29601
components:
- type: Transform
pos: 39.5,-17.5
parent: 2
- uid: 29602
components:
- type: Transform
pos: 38.5,-17.5
parent: 2
- uid: 29603
components:
- type: Transform
pos: 38.5,-16.5
parent: 2
- uid: 29604
components:
- type: Transform
pos: 38.5,-14.5
parent: 2
- uid: 29605
components:
- type: Transform
pos: 38.5,-15.5
parent: 2
- uid: 29606
components:
- type: Transform
pos: 38.5,-13.5
parent: 2
- uid: 29607
components:
- type: Transform
pos: 38.5,-12.5
parent: 2
- uid: 29608
components:
- type: Transform
pos: 38.5,-11.5
parent: 2
- uid: 29609
components:
- type: Transform
pos: 37.5,-11.5
parent: 2
- uid: 29610
components:
- type: Transform
pos: 36.5,-11.5
parent: 2
- uid: 29611
components:
- type: Transform
pos: 35.5,-11.5
parent: 2
- uid: 29612
components:
- type: Transform
pos: 34.5,-11.5
parent: 2
- uid: 29613
components:
- type: Transform
pos: 34.5,-12.5
parent: 2
- uid: 29614
components:
- type: Transform
pos: 34.5,-13.5
parent: 2
- proto: CableTerminal
entities:
- uid: 6405
@@ -94055,7 +94258,7 @@ entities:
pos: -13.5,-1.5
parent: 2
- type: Door
secondsUntilStateChange: -67232.83
secondsUntilStateChange: -67475.88
- type: DeviceNetwork
deviceLists:
- 18275
@@ -138604,7 +138807,7 @@ entities:
pos: 36.5,-35.5
parent: 2
- type: Door
secondsUntilStateChange: -104064.67
secondsUntilStateChange: -104307.73
state: Opening
- uid: 5211
components:
@@ -189959,7 +190162,7 @@ entities:
pos: 24.5,2.5
parent: 21002
- type: Door
secondsUntilStateChange: -449269.3
secondsUntilStateChange: -449512.38
state: Opening
- uid: 28863
components:

2
Resources/Prototypes/Catalog/uplink_catalog.yml
View File

@@ -887,7 +887,7 @@
discountDownTo:
Telecrystal: 2
cost:
Telecrystal: 4
Telecrystal: 3
categories:
- UplinkDisruption

5
Resources/Prototypes/DeviceLinking/sink_ports.yml
View File

@@ -48,6 +48,11 @@
name: signal-port-name-trigger
description: signal-port-description-trigger
- type: sinkPort
id: Timer
name: signal-port-name-timer
description: signal-port-description-timer
- type: sinkPort
id: OrderReceiver
name: signal-port-name-order-receiver

12
Resources/Prototypes/DeviceLinking/source_ports.yml
View File

@@ -2,13 +2,13 @@
id: Pressed
name: signal-port-name-pressed
description: signal-port-description-pressed
defaultLinks: [ Toggle, Trigger ]
defaultLinks: [ Toggle, Trigger, Timer ]
- type: sourcePort
id: On
name: signal-port-name-on-transmitter
description: signal-port-description-on-transmitter
defaultLinks: [ On, Open, Forward, Trigger ]
defaultLinks: [ On, Open, Forward, Trigger, Timer ]
- type: sourcePort
id: Off
@@ -25,13 +25,13 @@
id: Left
name: signal-port-name-left
description: signal-port-description-left
defaultLinks: [ On, Open, Forward, Trigger ]
defaultLinks: [ On, Open, Forward, Trigger, Timer ]
- type: sourcePort
id: Right
name: signal-port-name-right
description: signal-port-description-right
defaultLinks: [ On, Open, Reverse, Trigger ]
defaultLinks: [ On, Open, Reverse, Trigger, Timer ]
- type: sourcePort
id: Middle
@@ -76,7 +76,7 @@
id: Timer
name: signal-port-name-timer-trigger
description: signal-port-description-timer-trigger
defaultLinks: [ AutoClose, On, Open, Forward, Trigger ]
defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ]
- type: sourcePort
id: Start
@@ -94,7 +94,7 @@
id: OutputHigh
name: signal-port-name-logic-output-high
description: signal-port-description-logic-output-high
defaultLinks: [ On, Open, Forward, Trigger ]
defaultLinks: [ On, Open, Forward, Trigger, Timer ]
- type: sourcePort
id: OutputLow

11
Resources/Prototypes/Entities/Clothing/Head/misc.yml
View File

@@ -312,3 +312,14 @@
- WhitelistChameleon
- type: StaticPrice
price: 1
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHairflower
name: hairflower
description: A beautiful hairflower that can be inserted between locks of hair.
components:
- type: Sprite
sprite: Clothing/Head/Misc/hairflower.rsi
- type: Clothing
sprite: Clothing/Head/Misc/hairflower.rsi

2
Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
View File

@@ -47,8 +47,6 @@
collection: FootstepDuck
params:
variation: 0.07
- type: WaddleWhenWorn
tumbleIntensity: 10 # smaller than clown shoes
- type: Construction
graph: ClothingShoeSlippersDuck
node: shoes

1
Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
View File

@@ -15,7 +15,6 @@
parent: [ClothingShoesBaseButcherable, ClothingSlotBase]
id: ClothingShoesClownBase
components:
- type: WaddleWhenWorn
- type: ItemSlots
slots:
item:

12
Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
View File

@@ -96,7 +96,7 @@
- type: entity
id: ActionAGhostShowSolar
name: Solar Control Interface
description: View a solar control interface.
description: View a Solar Control Interface.
components:
- type: InstantAction
icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -108,7 +108,7 @@
- type: entity
id: ActionAGhostShowCommunications
name: Communications Interface
description: View a communications interface.
description: View a Communications Interface.
components:
- type: InstantAction
icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console }
@@ -120,7 +120,7 @@
- type: entity
id: ActionAGhostShowRadar
name: Mass Scanner Interface
description: View a mass scanner interface.
description: View a Mass Scanner Interface.
components:
- type: InstantAction
icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
@@ -132,7 +132,7 @@
- type: entity
id: ActionAGhostShowCargo
name: Cargo Ordering Interface
description: View a cargo ordering interface.
description: View a Cargo Ordering Interface.
components:
- type: InstantAction
icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
@@ -144,7 +144,7 @@
- type: entity
id: ActionAGhostShowCrewMonitoring
name: Crew Monitoring Interface
description: View a crew monitoring interface.
description: View a Crew Monitoring Interface.
components:
- type: InstantAction
icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
@@ -156,7 +156,7 @@
- type: entity
id: ActionAGhostShowStationRecords
name: Station Records Interface
description: View a station records Interface.
description: View a Station Records Interface.
components:
- type: InstantAction
icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }

4
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
View File

@@ -150,7 +150,9 @@
tags:
- CannotSuicide
- DoorBumpOpener
- type: Puller
needsHands: false
- type: entity
parent: BaseMobDragon
id: MobDragon

39
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
View File

@@ -23,7 +23,7 @@
- ReagentId: Vitamin
Quantity: 5
- type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie!
trash:
trash:
- FoodPlateTin
- type: SliceableFood
count: 4
@@ -317,6 +317,43 @@
- Slice
# Tastes like pie, meat.
- type: entity
name: pumpkin pie
parent: FoodPieBase
id: FoodPiePumpkin
description: Someone should turn this into a latte!
components:
- type: FlavorProfile
flavors:
- sweet
- pumpkin
- type: Sprite
layers:
- state: tin
- state: pumpkin
- type: SliceableFood
slice: FoodPiePumpkinSlice
- type: Tag
tags:
- Pie
- type: entity
name: slice of pumpkin pie
parent: FoodPieSliceBase
id: FoodPiePumpkinSlice
components:
- type: FlavorProfile
flavors:
- sweet
- pumpkin
- type: Sprite
layers:
- state: pumpkin-slice
- type: Tag
tags:
- Pie
- Slice
- type: entity
name: xeno pie
parent: FoodPieBase

4
Resources/Prototypes/Entities/Objects/Fun/pai.yml
View File

@@ -69,6 +69,10 @@
Searching: { state: pai-searching-overlay }
On: { state: pai-on-overlay }
- type: StationMap
- type: ChangeVoiceInContainer
whitelist:
components:
- SecretStash
- type: entity
parent: [ PersonalAI, BaseSyndicateContraband]

20
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -52,6 +52,24 @@
reagents:
- ReagentId: Fiber
Quantity: 10
- type: ContainerContainer
containers:
stash: !type:ContainerSlot {}
- type: Speech
speechVerb: Default # for pais (In the secret stash)
- type: SecretStash
secretStashName: secret-stash-plushie
blacklist:
components:
- SecretStash # Prevents being able to insert plushies inside each other (infinite plush)!
- NukeDisk # Could confuse the nukies if they don't know that plushies have a stash.
tags:
- QuantumSpinInverter # It will cause issues with the grinder...
- FakeNukeDisk # So you can't tell if the nuke disk is real or fake depending on if it can be inserted or not.
- type: ToolOpenable
openToolQualityNeeded: Slicing
closeToolQualityNeeded: Slicing # Should probably be stitching or something if that gets added
name: secret-stash-plushie
- type: entity
parent: BasePlushie
@@ -323,6 +341,8 @@
equippedPrefix: lizard
slots:
- HEAD
- type: Speech
speechVerb: Reptilian # for pais (In the secret stash)
- type: entity
parent: PlushieLizard

3
Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
View File

@@ -35,3 +35,6 @@
state: icon
- type: StaticPrice
price: 1 # it's worth even less than normal items. Perfection.
- type: Tag
tags:
- FakeNukeDisk

2
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -97,7 +97,7 @@
name: pocket fire extinguisher
parent: FireExtinguisher
id: FireExtinguisherMini
description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother.
description: A light and compact fibreglass-framed model fire extinguisher. It holds less water than its bigger brother.
components:
- type: Sprite
sprite: Objects/Misc/fire_extinguisher_mini.rsi

6
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View File

@@ -443,7 +443,7 @@
- state: default
- state: idvisitor
- type: IdCard
jobTitle: Visitor
jobTitle: job-title-visitor
jobIcon: JobIconVisitor
- type: PresetIdCard
job: Visitor
@@ -741,7 +741,7 @@
- state: default
- state: idcluwne
- type: IdCard
jobTitle: Cluwne
jobTitle: job-title-cluwne
- type: Unremoveable
- type: entity
@@ -801,7 +801,7 @@
- type: Item
heldPrefix: green
- type: IdCard
jobTitle: Universal
jobTitle: job-title-universal
jobIcon: JobIconAdmin
- type: Access
groups:

6
Resources/Prototypes/Entities/Objects/Power/lights.yml
View File

@@ -129,6 +129,7 @@
- type: Tag
tags:
- LightBulb
- Trash
- type: entity
parent: BaseLightbulb
@@ -147,6 +148,7 @@
- type: Tag
tags:
- LightBulb
- Trash
- type: entity
parent: LightBulb
@@ -160,9 +162,6 @@
lightEnergy: 0.3 # old incandescents just arent as bright
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb
- type: entity
suffix: Broken
@@ -190,6 +189,7 @@
- type: Tag
tags:
- LightBulb
- Trash
- type: entity
parent: BaseLightTube

4
Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
View File

@@ -54,10 +54,10 @@
beepSound: /Audio/Machines/Nuke/general_beep.ogg
startOnStick: true
canToggleStartOnStick: true
- type: TriggerOnSignal
- type: TimerStartOnSignal
- type: DeviceLinkSink
ports:
- Trigger
- Timer
- type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
explosionType: DemolitionCharge
totalIntensity: 60

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View File

@@ -647,7 +647,7 @@
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
- type: Gun
projectileSpeed: 4
projectileSpeed: 10
fireRate: 1.5
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg

16
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
View File

@@ -106,6 +106,22 @@
components:
- type: Sprite
sprite: Objects/Weapons/Grenades/syndgrenade.rsi
- type: ExplosionResistance
damageCoefficient: 0.1
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 10
behaviors:
- !type:TimerStartBehavior
- trigger:
!type:DamageTrigger
damage: 45
behaviors:
- !type:TriggerBehavior
- !type:DoActsBehavior
acts: ["Destruction"]
- type: OnUseTimerTrigger
delay: 5
- type: ExplodeOnTrigger

2
Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
View File

@@ -49,7 +49,7 @@
spawn:
MaterialCloth1:
min: 1
max: 2
max: 1
- type: WallMount
arc: 360

2
Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
View File

@@ -25,6 +25,8 @@
offset: "0.0,0.3"
sprite: Structures/Furniture/potted_plants.rsi
noRot: true
- type: Speech
speechVerb: Plant # for pais (In the secret stash)
- type: SecretStash
tryInsertItemSound: /Audio/Effects/plant_rustle.ogg
tryRemoveItemSound: /Audio/Effects/plant_rustle.ogg

2
Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
View File

@@ -184,7 +184,7 @@
guides:
- APE
- type: Gun
projectileSpeed: 4
projectileSpeed: 10
fireRate: 10 #just has to be fast enough to keep up with upgrades
showExamineText: false
selectedMode: SemiAuto

26
Resources/Prototypes/GameRules/events.yml
View File

@@ -176,9 +176,8 @@
min: 1
max: 1
pickPlayer: false
mindComponents:
- type: DragonRole
prototype: Dragon
mindRoles:
- MindRoleDragon
- type: entity
parent: BaseGameRule
@@ -226,9 +225,8 @@
nameSegments:
- names_ninja_title
- names_ninja
mindComponents:
- type: NinjaRole
prototype: SpaceNinja
mindRoles:
- MindRoleNinja
- type: entity
parent: BaseGameRule
@@ -439,9 +437,8 @@
- type: ZombifyOnDeath
- type: IncurableZombie
- type: InitialInfected
mindComponents:
- type: InitialInfectedRole
prototype: InitialInfected
mindRoles:
- MindRoleInitialInfected
- type: entity
parent: BaseNukeopsRule
@@ -466,7 +463,6 @@
startingGear: SyndicateLoneOperativeGearFull
roleLoadout:
- RoleSurvivalNukie
components:
- type: NukeOperative
- type: RandomMetadata
@@ -476,9 +472,8 @@
- type: NpcFactionMember
factions:
- Syndicate
mindComponents:
- type: NukeopsRole
prototype: Nukeops
mindRoles:
- MindRoleNukeops
- type: entity
parent: BaseTraitorRule
@@ -505,9 +500,8 @@
blacklist:
components:
- AntagImmune
mindComponents:
- type: TraitorRole
prototype: TraitorSleeper
mindRoles:
- MindRoleTraitorSleeper
- type: entity
id: MassHallucinations

5
Resources/Prototypes/GameRules/midround.yml
View File

@@ -26,8 +26,7 @@
startingGear: ThiefGear
components:
- type: Pacified
mindComponents:
- type: ThiefRole
prototype: Thief
mindRoles:
- MindRoleThief
briefing:
sound: "/Audio/Misc/thief_greeting.ogg"

30
Resources/Prototypes/GameRules/roundstart.yml
View File

@@ -114,9 +114,8 @@
- type: NpcFactionMember
factions:
- Syndicate
mindComponents:
- type: NukeopsRole
prototype: NukeopsCommander
mindRoles:
- MindRoleNukeopsCommander
- prefRoles: [ NukeopsMedic ]
fallbackRoles: [ Nukeops, NukeopsCommander ]
spawnerPrototype: SpawnPointNukeopsMedic
@@ -132,9 +131,8 @@
- type: NpcFactionMember
factions:
- Syndicate
mindComponents:
- type: NukeopsRole
prototype: NukeopsMedic
mindRoles:
- MindRoleNukeopsMedic
- prefRoles: [ Nukeops ]
fallbackRoles: [ NukeopsCommander, NukeopsMedic ]
spawnerPrototype: SpawnPointNukeopsOperative
@@ -152,9 +150,8 @@
- type: NpcFactionMember
factions:
- Syndicate
mindComponents:
- type: NukeopsRole
prototype: Nukeops
mindRoles:
- MindRoleNukeops
- type: entity
abstract: true
@@ -189,9 +186,8 @@
components:
- AntagImmune
lateJoinAdditional: true
mindComponents:
- type: TraitorRole
prototype: Traitor
mindRoles:
- MindRoleTraitor
- type: entity
id: Revolutionary
@@ -213,9 +209,8 @@
components:
- type: Revolutionary
- type: HeadRevolutionary
mindComponents:
- type: RevolutionaryRole
prototype: HeadRev
mindRoles:
- MindRoleHeadRevolutionary
- type: entity
id: Sandbox
@@ -257,9 +252,8 @@
- type: ZombifyOnDeath
- type: IncurableZombie
- type: InitialInfected
mindComponents:
- type: InitialInfectedRole
prototype: InitialInfected
mindRoles:
- MindRoleInitialInfected
# event schedulers

13
Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
View File

@@ -8,6 +8,19 @@
department: Command
time: 3600 # 1 hour
# Flowers
- type: loadout
id: FlowerWreath
storage:
back:
- ClothingHeadHatFlowerWreath
- type: loadout
id: Hairflower
storage:
back:
- ClothingHeadHatHairflower
# Plushies
- type: loadout
id: PlushieLizard

2
Resources/Prototypes/Loadouts/loadout_groups.yml
View File

@@ -5,6 +5,8 @@
minLimit: 0
maxLimit: 3
loadouts:
- FlowerWreath
- Hairflower
- PlushieLizard
- PlushieSpaceLizard
- Lighter

2
Resources/Prototypes/Objectives/dragon.yml
View File

@@ -9,7 +9,7 @@
issuer: objective-issuer-dragon
- type: RoleRequirement
roles:
components:
mindRoles:
- DragonRole
- type: entity

2
Resources/Prototypes/Objectives/ninja.yml
View File

@@ -9,7 +9,7 @@
issuer: objective-issuer-spiderclan
- type: RoleRequirement
roles:
components:
mindRoles:
- NinjaRole
- type: entity

2
Resources/Prototypes/Objectives/thief.yml
View File

@@ -7,7 +7,7 @@
issuer: objective-issuer-thief
- type: RoleRequirement
roles:
components:
mindRoles:
- ThiefRole
- type: entity

2
Resources/Prototypes/Objectives/traitor.yml
View File

@@ -7,7 +7,7 @@
issuer: objective-issuer-syndicate
- type: RoleRequirement
roles:
components:
mindRoles:
- TraitorRole
- type: entity

12
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
View File

@@ -1062,6 +1062,16 @@
FoodMeat: 3
FoodPlateTin: 1
- type: microwaveMealRecipe
id: RecipePumpkinPie
name: pumpkin pie recipe
result: FoodPiePumpkin
time: 15
solids:
FoodDoughPie: 1
FoodPumpkin: 1
FoodPlateTin: 1
#- type: microwaveMealRecipe
# id: RecipePlumpPie
# name: plump pie recipe
@@ -1978,4 +1988,4 @@
solids:
FoodCroissantRaw: 1
FoodButterSlice: 1
ShardGlass: 1
ShardGlass: 1

2
Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
View File

@@ -17,7 +17,7 @@
shoes: ClothingShoesBootsLaceup
id: LibrarianPDA
ears: ClothingHeadsetService
pocket1: d10Dice
pocket1: d20Dice
pocket2: HandLabeler # for making named bestsellers
storage:
back:

182
Resources/Prototypes/Roles/MindRoles/mind_roles.yml Normal file
View File

@@ -0,0 +1,182 @@
- type: entity
id: BaseMindRole
name: Mind Role
description: Mind Role entity
abstract: true
components:
- type: MindRole
- type: entity
parent: BaseMindRole
id: BaseMindRoleAntag
abstract: true
components:
- type: MindRole
antag: true
#Observer
- type: entity
parent: BaseMindRole
id: MindRoleObserver
name: Observer Role
components:
- type: ObserverRole
#Ghostrole Marker
- type: entity
parent: BaseMindRole
id: MindRoleGhostMarker
name: Ghost Role
components:
- type: GhostRoleMarkerRole
# The Job MindRole holds the mob's Job prototype
- type: entity
parent: BaseMindRole
id: MindRoleJob
name: Job Role
# description:
# MindRoleComponent.JobPrototype is filled by SharedJobSystem
# Subverted Silicon
- type: entity
parent: BaseMindRoleAntag
id: MindRoleSubvertedSilicon
name: Subverted Silicon Role
description:
components:
- type: SubvertedSiliconRole
- type: MindRole
antagPrototype: SubvertedSilicon
# Dragon
- type: entity
parent: BaseMindRoleAntag
id: MindRoleDragon
name: Dragon Role
# description:
components:
- type: MindRole
antagPrototype: Dragon
exclusiveAntag: true
- type: DragonRole
- type: RoleBriefing
briefing: dragon-role-briefing
# Ninja
- type: entity
parent: BaseMindRoleAntag
id: MindRoleNinja
name: Space Ninja Role
# description: mind-role-ninja-description
components:
- type: MindRole
antagPrototype: SpaceNinja
exclusiveAntag: true
- type: NinjaRole
# Nukies
- type: entity
parent: BaseMindRoleAntag
id: MindRoleNukeops
name: Nukeops Operative Role
# description: mind-role-nukeops-description
components:
- type: MindRole
exclusiveAntag: true
antagPrototype: Nukeops
- type: NukeopsRole
- type: entity
parent: MindRoleNukeops
id: MindRoleNukeopsMedic
name: Nukeops Medic Role
# description: mind-role-nukeops-medic-description
components:
- type: MindRole
antagPrototype: NukeopsMedic
- type: entity
parent: MindRoleNukeops
id: MindRoleNukeopsCommander
name: Nukeops Commander Role
# description: mind-role-nukeops-commander-description
components:
- type: MindRole
antagPrototype: NukeopsCommander
# Revolutionaries
- type: entity
parent: BaseMindRoleAntag
id: MindRoleHeadRevolutionary
name: Head Revolutionary Role
# description: mind-role-head-revolutionary-description
components:
- type: MindRole
antagPrototype: HeadRev
exclusiveAntag: true
- type: RevolutionaryRole
- type: entity
parent: MindRoleHeadRevolutionary
id: MindRoleRevolutionary
name: Revolutionary Role
# description: mind-role-revolutionary-description
components:
- type: MindRole
antagPrototype: Rev
# Thief
- type: entity
parent: BaseMindRoleAntag
id: MindRoleThief
name: Thief Role
# description: mind-role-thief-description
components:
- type: MindRole
antagPrototype: Thief
- type: ThiefRole
# Traitors
- type: entity
parent: BaseMindRoleAntag
id: MindRoleTraitor
name: Traitor Role
# description: mind-role-traitor-description
components:
- type: MindRole
antagPrototype: Traitor
exclusiveAntag: true
- type: TraitorRole
- type: entity
parent: MindRoleTraitor
id: MindRoleTraitorSleeper
name: Sleeper Agent Role
# description: mind-role-traitor-sleeper-description
components:
- type: MindRole
antagPrototype: TraitorSleeper
# Zombie Squad
- type: entity
parent: BaseMindRoleAntag
id: MindRoleInitialInfected
name: Initial Infected Role
# description: mind-role-initial-infected-description
components:
- type: MindRole
antagPrototype: InitialInfected
exclusiveAntag: true
- type: InitialInfectedRole
- type: entity
parent: BaseMindRoleAntag
id: MindRoleZombie
name: Zombie Role
# description: mind-role-zombie-description
components:
- type: MindRole
antagPrototype: Zombie
exclusiveAntag: true
- type: ZombieRole

5
Resources/Prototypes/tags.yml
View File

@@ -993,6 +993,9 @@
- type: Tag
id: Nugget # for chicken nuggets
- type: Tag
id: FakeNukeDisk
- type: Tag
id: NukeOpsUplink
@@ -1177,7 +1180,7 @@
- type: Tag
id: SecureWindoor
- type: Tag
- type: Tag
id: SecurityHelmet
- type: Tag

BIN
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

BIN
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

18
Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json Normal file
View File

@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "icon sprited by Just_Art, equipped-HELMET sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}

8
Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, the pumpkin and pumpkin slice are made by ss14nekow (Mute Maid), the mime tart slice and banana cream pie slice are made by rosysyntax.",
"size": {
"x": 32,
"y": 32
@@ -95,6 +95,12 @@
{
"name": "plump"
},
{
"name": "pumpkin"
},
{
"name": "pumpkin-slice"
},
{
"name": "tin"
},

BIN
Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

BIN
Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 600 B

2
Resources/clientCommandPerms.yml
View File

@@ -20,7 +20,6 @@
- net_watchent
- devwindow
- fill
- dumpentities
- ">"
- gcf
- gc
@@ -73,6 +72,7 @@
- detachent
- localdelete
- fullstatereset
- dumpentities
- Flags: MAPPING
Commands:

3
Resources/migration.yml
View File

@@ -546,3 +546,6 @@ HatBase: null
# 2024-09-19
BlueprintFlare: null
# 2024-10-04
BaseAdvancedPen: Pen