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

Merge branch 'master' into ion-storm-refactor

Browse Source
This commit is contained in:
metalgearsloth
2024-11-20 18:22:08 +11:00
committed by GitHub
parent e290588624 4f3ac3ea68
commit a9be561ea7
150 changed files with 5700 additions and 2230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

307
Resources/Changelog/Changelog.yml
View File

@@ -1,167 +1,4 @@
Entries:
- author: to4no_fix
changes:
- message: Added a new electropack that shocks when a trigger is triggered
type: Add
- message: Added a new shock collar that shocks when a trigger is triggered
type: Add
- message: Two shock collars and two remote signallers added to the warden's locker
type: Add
- message: Shock collar added as a new target for the thief
type: Add
- message: A new Special Means technology has been added to the Arsenal research
branch at the 1st research level. Its research opens up the possibility of producing
electropacks at security techfab. The cost of technology research is 5000
type: Add
id: 7114
time: '2024-08-15T14:30:39.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30529
- author: Mervill
changes:
- message: The Gas Analyzer won't spuriously shut down for seemly no reason.
type: Tweak
- message: The Gas Analyzer will always switch to the device tab when a new object
is scanned.
type: Tweak
- message: The Gas Analyzer's interaction range is now equal to the standard interaction
range
type: Fix
- message: Clicking the Gas Analyzer when it's in your hand has proper enable/disable
behavior.
type: Fix
id: 7115
time: '2024-08-15T14:45:13.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30763
- author: Nimfar11
changes:
- message: Adds a gold toilet
type: Add
- message: Adds a target for the Thief to steal the golden toilet
type: Add
- message: Corrected the sprite image for the normal toilet.
type: Fix
id: 7116
time: '2024-08-15T19:23:59.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31049
- author: themias
changes:
- message: Raw meat cutlets can be cooked on a grill
type: Tweak
id: 7117
time: '2024-08-15T19:30:09.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31048
- author: IProduceWidgets
changes:
- message: Meteor dust should more consistently happen instead of meteors.
type: Tweak
id: 7118
time: '2024-08-15T19:33:17.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31018
- author: Emisse
changes:
- message: Atlas, Cluster, Europa, & Saltern removed from the game.
type: Remove
id: 7119
time: '2024-08-15T21:10:07.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31058
- author: Emisse
changes:
- message: Origin removed from the game.
type: Remove
id: 7120
time: '2024-08-15T22:22:02.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31059
- author: Psychpsyo
changes:
- message: You can now be German on ze space station! (added German accent)
type: Add
id: 7121
time: '2024-08-15T23:30:21.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30541
- author: EmoGarbage404
changes:
- message: Reduced the amount of ore on the mining asteroid and expeditions.
type: Tweak
- message: Increased the amount of ore on magnet asteroids.
type: Tweak
- message: Each piece of ore now only has enough material to create 1 sheet.
type: Tweak
- message: The salvage magnet now accurately reports the contents of asteroids.
type: Fix
id: 7122
time: '2024-08-16T01:43:54.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30920
- author: metalgearsloth
changes:
- message: Fix mains light on wires not being lit.
type: Fix
id: 7123
time: '2024-08-16T03:59:46.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31066
- author: IgorAnt028
changes:
- message: The dead and knocked down now stop holding objects
type: Fix
id: 7124
time: '2024-08-16T04:53:34.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31009
- author: SlamBamActionman
changes:
- message: Nar'Sie is satiated; moppable blood will no longer duplicate.
type: Fix
id: 7125
time: '2024-08-16T10:47:53.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30983
- author: Blackern5000
changes:
- message: Disabler SMGs no longer fit in combat boots
type: Fix
id: 7126
time: '2024-08-17T01:00:21.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31110
- author: Mervill
changes:
- message: Fixed suffocation alerts not appearing.
type: Fix
id: 7127
time: '2024-08-17T02:02:51.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31115
- author: TokenStyle
changes:
- message: Plant's scream mutation now have 10+ scream varieties.
type: Add
id: 7128
time: '2024-08-17T02:09:25.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30862
- author: Boaz1111
changes:
- message: Phlogiston now also ignites people who consume it.
type: Add
id: 7129
time: '2024-08-17T02:49:11.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30955
- author: slarticodefast
changes:
- message: Fixed borgs brains being teleported outside their chassis and PAIs outside
a PDA or pocket by the bluespace anomaly.
type: Fix
id: 7130
time: '2024-08-17T04:58:23.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/30744
- author: EmoGarbage404
changes:
- message: You can no longer see wreck names in the salvage magnet UI.
type: Tweak
id: 7131
time: '2024-08-17T05:09:21.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31087
- author: EmoGarbage404
changes:
- message: You can now smelt ores in intervals smaller than 30.
type: Add
id: 7132
time: '2024-08-17T05:12:55.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31074
- author: themias
changes:
- message: Added a recipe for croissants
@@ -3943,3 +3780,147 @@
id: 7613
time: '2024-11-15T23:46:02.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31147
- author: SaphireLattice
changes:
- message: Crayon UI now has categories and queue
type: Add
id: 7614
time: '2024-11-16T03:25:06.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33101
- author: Southbridge
changes:
- message: The BRB sign is now included in the Bureaucracy Crate
type: Add
id: 7615
time: '2024-11-16T03:26:48.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33341
- author: SaphireLattice
changes:
- message: Utensils can finally go into disposals
type: Fix
id: 7616
time: '2024-11-16T03:39:19.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33326
- author: K-Dynamic
changes:
- message: Solar assembly crate now comes with 10 flatpacks and 20 glass to make
expansion and repairs easier, as well as increasing in price from 525 to 1250
spesos.
type: Tweak
id: 7617
time: '2024-11-16T04:30:48.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33019
- author: Aquif
changes:
- message: There is now a button to view your admin remarks in the character editor,
right next to the stats button.
type: Tweak
id: 7618
time: '2024-11-16T05:09:29.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31761
- author: SpaceRox1244
changes:
- message: Closets and lockers now have visuals for being labeled with papers.
type: Add
id: 7619
time: '2024-11-17T03:27:29.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33318
- author: Ubaser
changes:
- message: You can now craft dim light bulbs at an autolathe.
type: Add
id: 7620
time: '2024-11-18T06:32:08.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33383
- author: Ilya246
changes:
- message: Multiple people using one shuttle console will no longer cause the shuttle
to slow down.
type: Fix
id: 7621
time: '2024-11-19T02:59:42.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32381
- author: ScarKy0
changes:
- message: Secret doors no longer tell you if they're welded shut on examine.
type: Tweak
id: 7622
time: '2024-11-19T05:07:02.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33365
- author: ArZarLordOfMango
changes:
- message: Most toggleable clothing must now be equipped to toggle their actions.
type: Fix
id: 7623
time: '2024-11-19T20:31:38.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32826
- author: Plykiya
changes:
- message: The SWAT crate from cargo now requires armory access to open.
type: Fix
id: 7624
time: '2024-11-20T00:57:01.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33415
- author: SlamBamActionman
changes:
- message: It's no longer possible to drag an item out of a container's UI to drop
it.
type: Tweak
id: 7625
time: '2024-11-20T01:00:38.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32706
- author: Plykiya
changes:
- message: The crew monitoring crate now contains a flatpack of the server and computers,
and can be opened with science access instead of engineering access now.
type: Tweak
id: 7626
time: '2024-11-20T01:05:20.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33417
- author: Beck Thompson
changes:
- message: Toggle verbs are no longer duplicated on magboots and fire extinguishers!
type: Fix
id: 7627
time: '2024-11-20T01:53:53.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32138
- author: qwerltaz
changes:
- message: A new grid item view is available in the construction menu, togglable
with a button.
type: Add
- message: Construction menu default window size was tweaked.
type: Tweak
id: 7628
time: '2024-11-20T01:54:49.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32577
- author: SpaceLizard24
changes:
- message: Reduced crafting costs of colored light tubes.
type: Tweak
id: 7629
time: '2024-11-20T01:59:31.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33376
- author: thetolbean
changes:
- message: Items with a damage of 0 now have correct damage examination text.
type: Fix
id: 7630
time: '2024-11-20T02:05:15.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33064
- author: SaphireLattice
changes:
- message: The Singularity/Tesla generator now requires being surrounded by containment
fields to activate. This can be disabled with an Emag.
type: Tweak
id: 7631
time: '2024-11-20T05:55:58.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/33358
- author: TheWaffleJesus
changes:
- message: You can now craft items with stacks of capacitors without it eating it
all!
type: Fix
id: 7632
time: '2024-11-20T07:18:38.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31966

2
Resources/ConfigPresets/WizardsDen/wizardsDen.toml
View File

@@ -4,7 +4,7 @@
[game]
desc = "Official English Space Station 14 servers. Vanilla, roleplay ruleset."
lobbyenabled = true
soft_max_players = 70
soft_max_players = 80
panic_bunker.enabled = true
panic_bunker.disable_with_admins = true
panic_bunker.enable_without_admins = true

2
Resources/Credits/GitHub.txt
View File

File diff suppressed because one or more lines are too long

3
Resources/Locale/en-US/clothing/components/magboots-component.ftl
View File

@@ -1,3 +0,0 @@
# Toggle Magboots Verb
toggle-magboots-verb-get-data-text = Toggle Magboots

1
Resources/Locale/en-US/construction/ui/construction-menu.ftl
View File

@@ -5,3 +5,4 @@ construction-menu-place-ghost = Place construction ghost
construction-menu-clear-all = Clear All
construction-menu-eraser-mode = Eraser Mode
construction-menu-craft = Craft
construction-menu-grid-view = Grid View

7
Resources/Locale/en-US/crayon/crayon-component.ftl
View File

@@ -8,3 +8,10 @@ crayon-interact-invalid-location = Can't reach there!
## UI
crayon-window-title = Crayon
crayon-window-placeholder = Search, or queue a comma-separated list of names
crayon-category-1-brushes = Brushes
crayon-category-2-alphanum = Numbers and letters
crayon-category-3-symbols = Symbols
crayon-category-4-info = Signs
crayon-category-5-graffiti = Graffiti
crayon-category-random = Random

1
Resources/Locale/en-US/damage/damage-examine.ftl
View File

@@ -10,3 +10,4 @@ damage-throw = throw
damage-examine = It does the following damage:
damage-examine-type = It does the following [color=cyan]{$type}[/color] damage:
damage-value = - [color=red]{$amount}[/color] units of [color=yellow]{$type}[/color].
damage-none = It does no damage.

69
Resources/Locale/en-US/datasets/names/borer.ftl Normal file
View File

@@ -0,0 +1,69 @@
names-borer-dataset-1 = Alcyonium
names-borer-dataset-2 = Anomia
names-borer-dataset-3 = Aphrodita
names-borer-dataset-4 = Arca
names-borer-dataset-5 = Argonauta
names-borer-dataset-6 = Ascaris
names-borer-dataset-7 = Asterias
names-borer-dataset-8 = Buccinum
names-borer-dataset-9 = Bulla
names-borer-dataset-10 = Cardium
names-borer-dataset-11 = Chama
names-borer-dataset-12 = Chiton
names-borer-dataset-13 = Conus
names-borer-dataset-14 = Corallina
names-borer-dataset-15 = Cypraea
names-borer-dataset-16 = Dentalium
names-borer-dataset-17 = Donax
names-borer-dataset-18 = Doris
names-borer-dataset-19 = Echinus
names-borer-dataset-20 = Eschara
names-borer-dataset-21 = Fasciola
names-borer-dataset-22 = Furia
names-borer-dataset-23 = Gordius
names-borer-dataset-24 = Gorgonia
names-borer-dataset-25 = Haliotis
names-borer-dataset-26 = Helix
names-borer-dataset-27 = Hirudo
names-borer-dataset-28 = Holothuria
names-borer-dataset-29 = Hydra
names-borer-dataset-30 = Isis
names-borer-dataset-31 = Lepas
names-borer-dataset-32 = Lernaea
names-borer-dataset-33 = Limax
names-borer-dataset-34 = Lumbricus
names-borer-dataset-35 = Madrepora
names-borer-dataset-36 = Medusa
names-borer-dataset-37 = Millepora
names-borer-dataset-38 = Murex
names-borer-dataset-39 = Myes
names-borer-dataset-40 = Mytilus
names-borer-dataset-41 = Myxine
names-borer-dataset-42 = Nautilus
names-borer-dataset-43 = Nereis
names-borer-dataset-44 = Neritha
names-borer-dataset-45 = Ostrea
names-borer-dataset-46 = Patella
names-borer-dataset-47 = Pennatula
names-borer-dataset-48 = Pholas
names-borer-dataset-49 = Pinna
names-borer-dataset-50 = Priapus
names-borer-dataset-51 = Scyllaea
names-borer-dataset-52 = Sepia
names-borer-dataset-53 = Serpula
names-borer-dataset-54 = Sertularia
names-borer-dataset-55 = Solen
names-borer-dataset-56 = Spondylus
names-borer-dataset-57 = Strombus
names-borer-dataset-58 = Taenia
names-borer-dataset-59 = Tellina
names-borer-dataset-60 = Teredo
names-borer-dataset-61 = Tethys
names-borer-dataset-62 = Triton
names-borer-dataset-63 = Trochus
names-borer-dataset-64 = Tubipora
names-borer-dataset-65 = Tubularia
names-borer-dataset-66 = Turbo
names-borer-dataset-67 = Venus
names-borer-dataset-68 = Voluta
names-borer-dataset-69 = Volvox

3
Resources/Locale/en-US/fire-extinguisher/fire-extinguisher-component.ftl
View File

@@ -1,3 +1,4 @@
fire-extinguisher-component-after-interact-refilled-message = {$owner} is now refilled
fire-extinguisher-component-safety-on-message = Its safety is on!
fire-extinguisher-component-verb-text = Toggle safety
fire-extinguisher-component-verb-remove = Remove safety
fire-extinguisher-component-verb-engage = Engage safety

2
Resources/Locale/en-US/lobby/lobby-gui.ftl
View File

@@ -1,4 +1,4 @@
ui-lobby-title = Lobby
ui-lobby-title = Lobby
ui-lobby-ahelp-button = AHelp
ui-lobby-options-button = Options
ui-lobby-leave-button = Leave

4
Resources/Locale/en-US/magic/spells-actions.ftl
View File

@@ -1,5 +1,7 @@
action-speech-spell-forcewall = TARCOL MINTI ZHERI
action-speech-spell-forcewall = TARCOL MINTI ZHERI
action-speech-spell-knock = AULIE OXIN FIERA
action-speech-spell-smite = EI NATH!
action-speech-spell-summon-magicarp = AIE KHUSE EU
action-speech-spell-fireball = ONI'SOMA!
action-speech-spell-summon-guns = YOR'NEE VES-KORFA
action-speech-spell-summon-magic = RYGOIN FEMA-VERECO

3
Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
View File

@@ -1,4 +1,5 @@
character-setup-gui-character-setup-label = Character setup
character-setup-gui-character-setup-adminremarks-button = Admin Remarks
character-setup-gui-character-setup-stats-button = Stats
character-setup-gui-character-setup-rules-button = Rules
character-setup-gui-character-setup-close-button = Close
@@ -10,4 +11,4 @@ character-setup-gui-character-picker-button-confirm-delete-button = Confirm
character-setup-gui-save-panel-title = Unsaved character changes
character-setup-gui-save-panel-save = Save
character-setup-gui-save-panel-nosave = Don't save
character-setup-gui-save-panel-cancel = Cancel
character-setup-gui-save-panel-cancel = Cancel

2
Resources/Locale/en-US/singularity/components/generator-component.ftl Normal file
View File

@@ -0,0 +1,2 @@
comp-generator-failsafe = The {$target} shakes as the containment failsafe triggers!
comp-generator-failsafe-disabled = Something fizzles out inside of {$target}...

8
Resources/Locale/en-US/store/spellbook-catalog.ftl
View File

@@ -1,4 +1,4 @@
# Spells
# Spells
spellbook-fireball-name = Fireball
spellbook-fireball-desc = Get most crew exploding with rage when they see this fireball heading toward them!
@@ -33,6 +33,12 @@ spellbook-wand-polymorph-carp-description = For when you need a carp filet quick
spellbook-event-summon-ghosts-name = Summon Ghosts
spellbook-event-summon-ghosts-description = Who ya gonna call?
spellbook-event-summon-guns-name = Summon Guns
spellbook-event-summon-guns-description = AK47s for everyone! Places a random gun in front of everybody. Disables refunds when bought!
spellbook-event-summon-magic-name = Summon Magic
spellbook-event-summon-magic-description = Places a random magical item in front of everybody. Nothing could go wrong! Disables refunds when bought!
# Upgrades
spellbook-upgrade-fireball-name = Upgrade Fireball
spellbook-upgrade-fireball-description = Upgrades Fireball to a maximum of level 3!

509
Resources/Maps/bagel.yml
View File

@@ -665,7 +665,6 @@ entities:
1325: 54,12
1326: 53,12
1327: 52,12
1374: 6,-20
1486: 30,-23
1516: -48,16
1517: -47,17
@@ -733,6 +732,7 @@ entities:
3954: 13,-14
3979: -56,13
3980: -54,13
4774: 6,-20
- node:
cleanable: True
color: '#FFFFFFFF'
@@ -2224,6 +2224,22 @@ entities:
3652: 23,-38
3653: 23,-37
3654: 23,-39
- node:
color: '#DE3A3A96'
id: CheckerNESW
decals:
4750: 6,-22
4751: 6,-21
4752: 6,-20
4753: 7,-20
4754: 8,-20
4755: 9,-20
4756: 9,-21
4757: 9,-22
4758: 8,-22
4759: 7,-22
4760: 7,-21
4761: 8,-21
- node:
color: '#334E6DC8'
id: CheckerNWSE
@@ -2236,6 +2252,22 @@ entities:
620: -68,17
621: -69,17
622: -62,17
- node:
color: '#43990996'
id: CheckerNWSE
decals:
4762: 6,-22
4763: 6,-21
4764: 6,-20
4765: 7,-20
4766: 7,-21
4767: 7,-22
4768: 8,-22
4769: 8,-21
4770: 8,-20
4771: 9,-20
4772: 9,-21
4773: 9,-22
- node:
color: '#52B4E996'
id: CheckerNWSE
@@ -2833,6 +2865,7 @@ entities:
3856: -11,-14
3947: 13,-14
3948: 12,-11
4778: 9,-22
- node:
color: '#FFFFFFFF'
id: DirtLight
@@ -2955,11 +2988,6 @@ entities:
830: -8,-25
835: -4,-24
836: -1,-25
837: 7,-21
889: 7,-20
890: 8,-20
891: 9,-20
892: 9,-21
893: 10,-23
895: -6,-23
896: -25,-23
@@ -2996,7 +3024,6 @@ entities:
1172: 5,8
1173: -7,9
1174: -8,8
1213: 7,-22
1214: 5,-23
1215: 4,-23
1216: 7,-24
@@ -3190,6 +3217,9 @@ entities:
4668: 16,-25
4669: 13,-25
4670: 12,-23
4775: 6,-22
4776: 9,-21
4777: 9,-20
- node:
angle: 3.141592653589793 rad
color: '#FFFFFFFF'
@@ -3243,7 +3273,6 @@ entities:
690: -16,6
833: -3,-25
834: -6,-25
1212: 6,-22
1985: -40,-8
2215: 0,13
2216: -1,14
@@ -3278,6 +3307,7 @@ entities:
4630: -28,-19
4658: 17,-16
4659: 17,-15
4779: 6,-20
- node:
angle: 3.141592653589793 rad
color: '#FFFFFFFF'
@@ -4057,6 +4087,23 @@ entities:
886: -1,-12
887: -1,-11
888: -1,-10
- node:
color: '#43990996'
id: QuarterTileOverlayGreyscale
decals:
4685: 6,-23
4686: 7,-23
4687: 8,-23
4688: 9,-23
4689: 5,-23
4690: 4,-23
4691: 3,-23
4692: 10,-23
4693: 11,-23
4694: 12,-23
4695: 13,-23
4696: 14,-23
4697: 15,-23
- node:
color: '#52B4E92E'
id: QuarterTileOverlayGreyscale
@@ -4173,12 +4220,6 @@ entities:
1183: -17,19
1184: -17,20
1185: -17,21
1364: 6,-22
1365: 6,-21
1366: 6,-20
1367: 7,-20
1368: 8,-20
1369: 9,-20
1370: 6,-23
1371: 5,-23
1372: 4,-23
@@ -4352,6 +4393,18 @@ entities:
662: -17,-6
698: -18,1
699: -18,2
4813: 29,-23
4814: 28,-23
4815: 27,-23
4816: 26,-23
4817: 25,-23
4818: 24,-23
4819: 23,-23
4820: 22,-23
4821: 21,-23
4822: 20,-23
4823: 19,-23
4824: 18,-23
- node:
color: '#EFCC4196'
id: QuarterTileOverlayGreyscale
@@ -4395,6 +4448,26 @@ entities:
3886: -29,30
3887: -30,30
3888: -31,30
- node:
color: '#43990996'
id: QuarterTileOverlayGreyscale180
decals:
4718: 17,-25
4720: 19,-25
4721: 20,-25
4723: 21,-25
4724: 22,-25
4725: 23,-25
4726: 24,-25
4727: 25,-25
4728: 26,-25
4729: 27,-25
4730: 28,-25
4731: 29,-25
4732: 30,-25
4733: 31,-25
4734: 32,-25
4826: 18,-25
- node:
color: '#52B4E92E'
id: QuarterTileOverlayGreyscale180
@@ -4482,9 +4555,6 @@ entities:
1448: -32,7
1449: -33,7
1450: -34,7
1465: 9,-20
1466: 9,-21
1467: 9,-22
1494: -14,-2
1495: -15,-2
1496: -15,-3
@@ -4598,6 +4668,16 @@ entities:
4470: 36,50
4521: 44,20
4522: 45,20
- node:
color: '#DE3A3A96'
id: QuarterTileOverlayGreyscale180
decals:
4792: 14,-25
4793: 13,-25
4794: 12,-25
4795: 11,-25
4796: 10,-25
4797: 9,-25
- node:
color: '#EFB3414A'
id: QuarterTileOverlayGreyscale180
@@ -4631,6 +4711,17 @@ entities:
610: -74,16
611: -73,16
612: -72,16
- node:
color: '#43990996'
id: QuarterTileOverlayGreyscale270
decals:
4711: 9,-25
4712: 10,-25
4713: 11,-25
4714: 12,-25
4715: 13,-25
4716: 14,-25
4717: 15,-25
- node:
color: '#52B4E92E'
id: QuarterTileOverlayGreyscale270
@@ -4855,6 +4946,21 @@ entities:
decals:
696: -18,-1
697: -18,0
4798: 18,-25
4799: 19,-25
4800: 20,-25
4801: 21,-25
4802: 22,-25
4803: 23,-25
4804: 24,-25
4805: 25,-25
4806: 26,-25
4807: 27,-25
4808: 28,-25
4809: 29,-25
4810: 30,-25
4811: 31,-25
4812: 32,-25
- node:
color: '#EFB3414A'
id: QuarterTileOverlayGreyscale270
@@ -4899,6 +5005,23 @@ entities:
874: 1,-19
875: 1,-20
876: 1,-21
- node:
color: '#43990996'
id: QuarterTileOverlayGreyscale90
decals:
4698: 17,-23
4700: 19,-23
4701: 20,-23
4702: 21,-23
4703: 22,-23
4704: 23,-23
4705: 24,-23
4706: 25,-23
4707: 26,-23
4708: 27,-23
4709: 28,-23
4710: 29,-23
4825: 18,-23
- node:
color: '#52B4E92E'
id: QuarterTileOverlayGreyscale90
@@ -5041,7 +5164,6 @@ entities:
1482: 21,-23
1483: 20,-23
1484: 19,-23
1485: 18,-23
1491: -15,1
1492: -15,0
1493: -14,0
@@ -5187,6 +5309,18 @@ entities:
1635: -8,-15
1636: -8,-14
1637: -8,-13
4780: 3,-23
4781: 4,-23
4782: 5,-23
4783: 6,-23
4784: 7,-23
4785: 8,-23
4786: 9,-23
4787: 10,-23
4788: 11,-23
4789: 12,-23
4790: 13,-23
4791: 14,-23
- node:
color: '#EFB34160'
id: QuarterTileOverlayGreyscale90
@@ -5920,7 +6054,6 @@ entities:
1768: 35,7
1779: 2,-25
1780: -2,-25
1781: 18,-25
2543: 39,-35
2994: -41,23
3306: -15,48
@@ -5946,6 +6079,7 @@ entities:
4103: -18,7
4211: -17,32
4243: 38,23
4828: 18,-25
- node:
color: '#DE3A3A96'
id: WarnLineS
@@ -6034,7 +6168,6 @@ entities:
1767: 35,9
1777: 2,-23
1778: -2,-23
1782: 18,-23
1890: -42,-2
2063: -27,-23
2110: 0,24
@@ -6083,6 +6216,7 @@ entities:
4187: 57,3
4213: -17,34
4244: 38,25
4827: 18,-23
- node:
angle: -3.141592653589793 rad
color: '#FFFFFFFF'
@@ -15564,6 +15698,13 @@ entities:
- type: Transform
pos: 12.5,-25.5
parent: 60
- proto: BarSpoon
entities:
- uid: 23918
components:
- type: Transform
pos: 9.20146,-36.4394
parent: 60
- proto: BaseGasCondenser
entities:
- uid: 400
@@ -49095,6 +49236,26 @@ entities:
- type: Transform
pos: -23.5,16.5
parent: 60
- uid: 23652
components:
- type: Transform
pos: 8.5,-21.5
parent: 60
- uid: 23653
components:
- type: Transform
pos: 7.5,-20.5
parent: 60
- uid: 23914
components:
- type: Transform
pos: 7.5,-21.5
parent: 60
- uid: 23915
components:
- type: Transform
pos: 8.5,-20.5
parent: 60
- uid: 24171
components:
- type: Transform
@@ -49274,6 +49435,31 @@ entities:
parent: 60
- proto: CarpetGreen
entities:
- uid: 666
components:
- type: Transform
pos: 20.5,-27.5
parent: 60
- uid: 2278
components:
- type: Transform
pos: 19.5,-26.5
parent: 60
- uid: 2569
components:
- type: Transform
pos: 20.5,-26.5
parent: 60
- uid: 2584
components:
- type: Transform
pos: 19.5,-27.5
parent: 60
- uid: 3156
components:
- type: Transform
pos: 21.5,-26.5
parent: 60
- uid: 4195
components:
- type: Transform
@@ -49621,6 +49807,11 @@ entities:
- type: Transform
pos: 52.5,-44.5
parent: 60
- uid: 23892
components:
- type: Transform
pos: 21.5,-27.5
parent: 60
- proto: CarpetOrange
entities:
- uid: 1071
@@ -49764,11 +49955,6 @@ entities:
- type: Transform
pos: -8.5,-12.5
parent: 60
- uid: 15672
components:
- type: Transform
pos: 20.5,-28.5
parent: 60
- uid: 16543
components:
- type: Transform
@@ -49839,21 +50025,11 @@ entities:
- type: Transform
pos: 20.5,-30.5
parent: 60
- uid: 21598
components:
- type: Transform
pos: 18.5,-28.5
parent: 60
- uid: 24409
components:
- type: Transform
pos: 19.5,-31.5
parent: 60
- uid: 24410
components:
- type: Transform
pos: 19.5,-28.5
parent: 60
- uid: 24417
components:
- type: Transform
@@ -57498,12 +57674,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -7.5,25.5
parent: 60
- uid: 14388
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 18.5,-28.5
parent: 60
- uid: 14389
components:
- type: Transform
@@ -57639,12 +57809,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 20.5,-29.5
parent: 60
- uid: 24414
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 20.5,-28.5
parent: 60
- proto: CheapLighter
entities:
- uid: 24688
@@ -59916,6 +60080,46 @@ entities:
- type: Transform
pos: -15.664602,-30.50866
parent: 60
- uid: 23905
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23906
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23907
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23908
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23909
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23910
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23911
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- uid: 23912
components:
- type: Transform
pos: -27.341524,-2.4224424
parent: 60
- proto: ClothingHeadHatSkub
entities:
- uid: 6791
@@ -60609,6 +60813,48 @@ entities:
- type: Transform
pos: 22.509872,-51.419544
parent: 60
- proto: ClothingOuterSanta
entities:
- uid: 23897
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23898
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23899
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23900
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23901
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23902
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23903
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- uid: 23904
components:
- type: Transform
pos: -27.591524,-2.2661924
parent: 60
- proto: ClothingOuterSkub
entities:
- uid: 6793
@@ -61165,12 +61411,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 24.5,-5.5
parent: 60
- uid: 24349
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 13.5,-26.5
parent: 60
- proto: CommandmentCircuitBoard
entities:
- uid: 24825
@@ -62937,6 +63177,11 @@ entities:
- type: Transform
pos: -16.5,-29.5
parent: 60
- uid: 23919
components:
- type: Transform
pos: 20.5,-26.5
parent: 60
- proto: DefaultStationBeacon
entities:
- uid: 20983
@@ -72222,6 +72467,11 @@ entities:
- type: Transform
pos: -7.5,-2.5
parent: 60
- uid: 23894
components:
- type: Transform
pos: 18.5,-26.5
parent: 60
- proto: Flare
entities:
- uid: 9525
@@ -73130,6 +73380,13 @@ entities:
- type: Transform
pos: -65.522354,23.506481
parent: 60
- proto: FloraTreeChristmas02
entities:
- uid: 23913
components:
- type: Transform
pos: 7.9998736,-21.48742
parent: 60
- proto: FoodApple
entities:
- uid: 7496
@@ -73262,10 +73519,10 @@ entities:
parent: 60
- proto: FoodCondimentBottleHotsauce
entities:
- uid: 23671
- uid: 15672
components:
- type: Transform
pos: 21.70029,-26.388956
pos: 11.203171,-26.288023
parent: 60
- proto: FoodFrozenSandwich
entities:
@@ -73374,30 +73631,40 @@ entities:
parent: 60
- proto: FoodPlateSmall
entities:
- uid: 21775
- uid: 14388
components:
- type: Transform
pos: 20.513836,-26.289145
pos: 12.531296,-26.131773
parent: 60
- uid: 21789
- uid: 16144
components:
- type: Transform
pos: 20.513836,-26.195395
pos: 12.531296,-26.506773
parent: 60
- uid: 23621
- uid: 21774
components:
- type: Transform
pos: 20.513836,-26.382895
pos: 12.531296,-26.381773
parent: 60
- uid: 23629
components:
- type: Transform
pos: 20.513836,-26.507895
pos: 12.531296,-26.303648
parent: 60
- uid: 23630
- uid: 23667
components:
- type: Transform
pos: 20.513836,-26.445395
pos: 12.531296,-26.178648
parent: 60
- uid: 23671
components:
- type: Transform
pos: 12.531296,-26.428648
parent: 60
- uid: 23891
components:
- type: Transform
pos: 12.531296,-26.241148
parent: 60
- proto: FoodPoppy
entities:
@@ -73512,20 +73779,20 @@ entities:
parent: 60
- proto: Fork
entities:
- uid: 2584
- uid: 21598
components:
- type: Transform
pos: 21.138836,-26.476645
pos: 11.828171,-26.428648
parent: 60
- uid: 23653
- uid: 21775
components:
- type: Transform
pos: 21.138836,-26.476645
pos: 11.828171,-26.428648
parent: 60
- uid: 23665
- uid: 23668
components:
- type: Transform
pos: 21.138836,-26.476645
pos: 11.828171,-26.428648
parent: 60
- proto: FuelDispenser
entities:
@@ -114793,13 +115060,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -12.5,19.5
parent: 60
- uid: 2278
components:
- type: Transform
pos: 18.5,-26.5
parent: 60
- type: ApcPowerReceiver
powerLoad: 0
- uid: 2279
components:
- type: Transform
@@ -117916,6 +118176,23 @@ entities:
parent: 60
- type: ApcPowerReceiver
powerLoad: 0
- proto: PresentRandom
entities:
- uid: 23920
components:
- type: Transform
pos: 19.509592,-26.607985
parent: 60
- uid: 23921
components:
- type: Transform
pos: 19.650217,-27.232985
parent: 60
- uid: 23922
components:
- type: Transform
pos: 21.337717,-26.654861
parent: 60
- proto: Protolathe
entities:
- uid: 7081
@@ -119477,11 +119754,6 @@ entities:
parent: 60
- proto: RandomVendingDrinks
entities:
- uid: 3156
components:
- type: Transform
pos: 8.5,-19.5
parent: 60
- uid: 6319
components:
- type: Transform
@@ -119507,13 +119779,13 @@ entities:
- type: Transform
pos: -37.5,26.5
parent: 60
- proto: RandomVendingSnacks
entities:
- uid: 666
- uid: 23916
components:
- type: Transform
pos: 7.5,-19.5
parent: 60
- proto: RandomVendingSnacks
entities:
- uid: 6320
components:
- type: Transform
@@ -119529,6 +119801,11 @@ entities:
- type: Transform
pos: -38.5,26.5
parent: 60
- uid: 23917
components:
- type: Transform
pos: 8.5,-19.5
parent: 60
- proto: RCD
entities:
- uid: 1912
@@ -131513,20 +131790,20 @@ entities:
parent: 60
- proto: Spoon
entities:
- uid: 23666
- uid: 5786
components:
- type: Transform
pos: 21.43571,-26.476645
pos: 11.546921,-26.428648
parent: 60
- uid: 23667
- uid: 23893
components:
- type: Transform
pos: 21.43571,-26.476645
pos: 11.546921,-26.428648
parent: 60
- uid: 23668
- uid: 23895
components:
- type: Transform
pos: 21.43571,-26.476645
pos: 11.546921,-26.428648
parent: 60
- proto: SprayBottle
entities:
@@ -134805,11 +135082,6 @@ entities:
rot: -1.5707963267948966 rad
pos: 27.5,-32.5
parent: 60
- uid: 2569
components:
- type: Transform
pos: 19.5,-26.5
parent: 60
- uid: 2681
components:
- type: Transform
@@ -135421,11 +135693,6 @@ entities:
- type: Transform
pos: 42.5,-1.5
parent: 60
- uid: 16144
components:
- type: Transform
pos: 20.5,-26.5
parent: 60
- uid: 16410
components:
- type: Transform
@@ -135699,15 +135966,25 @@ entities:
- type: Transform
pos: -10.5,-34.5
parent: 60
- uid: 21789
components:
- type: Transform
pos: 13.5,-26.5
parent: 60
- uid: 23424
components:
- type: Transform
pos: 47.5,12.5
parent: 60
- uid: 23652
- uid: 23665
components:
- type: Transform
pos: 21.5,-26.5
pos: 11.5,-26.5
parent: 60
- uid: 23666
components:
- type: Transform
pos: 12.5,-26.5
parent: 60
- uid: 23838
components:
@@ -135841,10 +136118,12 @@ entities:
- type: Transform
pos: 19.5,-31.5
parent: 60
- uid: 24416
- proto: TableFancyGreen
entities:
- uid: 23896
components:
- type: Transform
pos: 19.5,-28.5
pos: -27.5,-2.5
parent: 60
- proto: TableGlass
entities:
@@ -136982,12 +137261,6 @@ entities:
- type: Transform
pos: -24.5,19.5
parent: 60
- uid: 24348
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 12.5,-26.5
parent: 60
- proto: TargetSyndicate
entities:
- uid: 10824
@@ -138090,11 +138363,6 @@ entities:
- type: Transform
pos: 29.5,-22.5
parent: 60
- uid: 5786
components:
- type: Transform
pos: 18.5,-26.5
parent: 60
- uid: 6039
components:
- type: Transform
@@ -138125,6 +138393,11 @@ entities:
- type: Transform
pos: 26.5,-7.5
parent: 60
- uid: 23630
components:
- type: Transform
pos: 15.5,-26.5
parent: 60
- uid: 25214
components:
- type: Transform
@@ -138181,10 +138454,10 @@ entities:
parent: 60
- proto: VendingMachineCondiments
entities:
- uid: 21774
- uid: 23621
components:
- type: Transform
pos: 19.5,-26.5
pos: 13.5,-26.5
parent: 60
- proto: VendingMachineCuraDrobe
entities:

1065
Resources/Maps/box.yml
View File

File diff suppressed because it is too large Load Diff

706
Resources/Maps/cog.yml
View File

File diff suppressed because it is too large Load Diff

1006
Resources/Maps/marathon.yml
View File

File diff suppressed because it is too large Load Diff

885
Resources/Maps/omega.yml
View File

File diff suppressed because it is too large Load Diff

1038
Resources/Maps/packed.yml
View File

File diff suppressed because it is too large Load Diff

10
Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
View File

@@ -18,6 +18,16 @@
category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
id: SecurityRiot
icon:
sprite: Clothing/OuterClothing/Armor/riot.rsi
state: icon
product: CrateSecurityRiot
cost: 7500
category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
id: TrackingImplant
icon:

9
Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
View File

@@ -1,9 +0,0 @@
- type: cargoProduct
id: CrewMonitoringBoards
icon:
sprite: Objects/Misc/module.rsi
state: cpuboard
product: CrateCrewMonitoringBoards
cost: 2000
category: cargoproduct-category-name-circuitboards
group: market

2
Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
View File

@@ -66,7 +66,7 @@
sprite: Objects/Devices/flatpack.rsi
state: solar-assembly-part
product: CrateEngineeringSolar
cost: 525
cost: 1250
category: cargoproduct-category-name-engineering
group: market

10
Resources/Prototypes/Catalog/Cargo/cargo_science.yml
View File

@@ -27,3 +27,13 @@
cost: 800
category: cargoproduct-category-name-science
group: market
- type: cargoProduct
id: CrewMonitoring
icon:
sprite: Structures/Machines/server.rsi
state: server
product: CrateCrewMonitoring
cost: 2000
category: cargoproduct-category-name-science
group: market

10
Resources/Prototypes/Catalog/Cargo/cargo_security.yml
View File

@@ -28,16 +28,6 @@
category: cargoproduct-category-name-security
group: market
- type: cargoProduct
id: SecurityRiot
icon:
sprite: Clothing/OuterClothing/Armor/riot.rsi
state: icon
product: CrateSecurityRiot
cost: 7500
category: cargoproduct-category-name-security
group: market
- type: cargoProduct
id: SecuritySupplies
icon:

2
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
View File

@@ -84,4 +84,4 @@
amount: 2
- id: WeaponBaguette
- id: SyndicateMicrowaveMachineCircuitboard
- id: PaperWrittenCombatBakeryKit
- id: PaperWrittenCombatBakeryKit

19
Resources/Prototypes/Catalog/Fills/Crates/armory.yml
View File

@@ -69,3 +69,22 @@
amount: 2
- id: MagazinePistol
amount: 4
- type: entity
id: CrateSecurityRiot
parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: swat crate
description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorRiot
amount: 2
- id: ClothingHeadHelmetRiot
amount: 2
- id: WeaponShotgunEnforcerRubber
amount: 2
- id: BoxBeanbag
amount: 2
- id: RiotShield
amount: 2

12
Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
View File

@@ -1,12 +0,0 @@
- type: entity
id: CrateCrewMonitoringBoards
parent: CrateEngineeringSecure
name: crew monitoring boards
description: Has two crew monitoring console and server replacements. Requires engineering access to open.
components:
- type: StorageFill
contents:
- id: CrewMonitoringComputerCircuitboard
amount: 2
- id: CrewMonitoringServerMachineCircuitboard
amount: 2

6
Resources/Prototypes/Catalog/Fills/Crates/engines.yml
View File

@@ -120,12 +120,14 @@
id: CrateEngineeringSolar
parent: CrateEngineering
name: solar assembly crate
description: Parts for constructing solar panels and trackers.
description: A kit with solar flatpacks and glass to construct ten solar panels.
components:
- type: StorageFill
contents:
- id: SolarAssemblyFlatpack
amount: 6
amount: 10
- id: SheetGlass10
amount: 2
- type: entity
id: CrateEngineeringShuttle

12
Resources/Prototypes/Catalog/Fills/Crates/science.yml
View File

@@ -12,3 +12,15 @@
amount: 2
- id: ClothingMaskSterile
amount: 2
- type: entity
id: CrateCrewMonitoring
parent: CrateScienceSecure
name: crew monitoring crate
description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open.
components:
- type: StorageFill
contents:
- id: CrewMonitoringServerFlatpack
- id: CrewMonitoringComputerFlatpack
amount: 3

20
Resources/Prototypes/Catalog/Fills/Crates/security.yml
View File

@@ -38,26 +38,6 @@
# - Pepperspray
# - GrenadeTeargas
- type: entity
id: CrateSecurityRiot
parent: CrateSecgear
name: swat crate
description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorRiot
amount: 2
- id: ClothingHeadHelmetRiot
amount: 2
- id: WeaponShotgunEnforcerRubber
amount: 2
- id: BoxBeanbag
amount: 2
- id: RiotShield
amount: 2
# - SecGasmask
- type: entity
id: CrateSecuritySupplies
parent: CrateSecgear

1
Resources/Prototypes/Catalog/Fills/Crates/service.yml
View File

@@ -130,6 +130,7 @@
- id: BoxFolderYellow
- id: NewtonCradle
- id: BoxEnvelope
- id: BrbSign
- type: entity
id: CrateServiceFaxMachine

30
Resources/Prototypes/Catalog/spellbook_catalog.yml
View File

@@ -1,4 +1,4 @@
# Offensive
# Offensive
- type: listing
id: SpellbookFireball
name: spellbook-fireball-name
@@ -132,6 +132,34 @@
- !type:ListingLimitedStockCondition
stock: 1
- type: listing
id: SpellbookEventSummonGuns
name: spellbook-event-summon-guns-name
description: spellbook-event-summon-guns-description
productAction: ActionSummonGuns
cost:
WizCoin: 2
categories:
- SpellbookEvents
conditions:
- !type:ListingLimitedStockCondition
stock: 1
disableRefund: true
- type: listing
id: SpellbookEventSummonMagic
name: spellbook-event-summon-magic-name
description: spellbook-event-summon-magic-description
productAction: ActionSummonMagic
cost:
WizCoin: 2
categories:
- SpellbookEvents
conditions:
- !type:ListingLimitedStockCondition
stock: 1
disableRefund: true
# Upgrades
- type: listing
id: SpellbookFireballUpgrade

75
Resources/Prototypes/Datasets/Names/borer.yml
View File

@@ -1,72 +1,5 @@
- type: dataset
id: names_borer
- type: localizedDataset
id: NamesBorer
values:
- Alcyonium
- Anomia
- Aphrodita
- Arca
- Argonauta
- Ascaris
- Asterias
- Buccinum
- Bulla
- Cardium
- Chama
- Chiton
- Conus
- Corallina
- Cypraea
- Dentalium
- Donax
- Doris
- Echinus
- Eschara
- Fasciola
- Furia
- Gordius
- Gorgonia
- Haliotis
- Helix
- Hirudo
- Holothuria
- Hydra
- Isis
- Lepas
- Lernaea
- Limax
- Lumbricus
- Madrepora
- Medusa
- Millepora
- Murex
- Myes
- Mytilus
- Myxine
- Nautilus
- Nereis
- Neritha
- Ostrea
- Patella
- Pennatula
- Pholas
- Pinna
- Priapus
- Scyllaea
- Sepia
- Serpula
- Sertularia
- Solen
- Spondylus
- Strombus
- Taenia
- Tellina
- Teredo
- Tethys
- Triton
- Trochus
- Tubipora
- Tubularia
- Turbo
- Venus
- Voluta
- Volvox
prefix: names-borer-dataset-
count: 69

586
Resources/Prototypes/Decals/crayons.yml
View File

File diff suppressed because it is too large Load Diff

1
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
View File

@@ -230,6 +230,7 @@
stealthy: true
- type: ToggleClothing
action: ActionToggleNinjaGloves
disableOnUnequip: true
- type: NinjaGloves
abilities:
- components:

1
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
View File

@@ -452,6 +452,7 @@
delay: 1.0
- type: ToggleClothing
action: ActionToggleJusticeHelm
mustEquip: false
- type: ItemTogglePointLight
- type: ToggleableLightVisuals
clothingVisuals:

1
Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
View File

@@ -155,6 +155,7 @@
# phase cloak
- type: ToggleClothing
action: ActionTogglePhaseCloak
disableOnUnequip: true
- type: ComponentToggler
parent: true
components:

3
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
View File

@@ -14,8 +14,7 @@
sprite: Clothing/Shoes/Boots/magboots.rsi
- type: ToggleClothing
action: ActionToggleMagboots
- type: ToggleVerb
text: toggle-magboots-verb-get-data-text
mustEquip: false
- type: ComponentToggler
components:
- type: NoSlip

20
Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
View File

@@ -215,4 +215,22 @@
layers:
- state: fax-machine
- type: Flatpack
entity: FaxMachineBase
entity: FaxMachineBase
- type: entity
parent: BaseFlatpack
id: CrewMonitoringServerFlatpack
name: crew monitoring server flatpack
description: A flatpack used for constructing a crew monitoring server.
components:
- type: Flatpack
entity: CrewMonitoringServer
- type: entity
parent: BaseFlatpack
id: CrewMonitoringComputerFlatpack
name: crew monitoring computer flatpack
description: A flatpack used for constructing a crew monitoring console.
components:
- type: Flatpack
entity: ComputerCrewMonitoring

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

@@ -47,8 +47,8 @@
params:
variation: 0.125
volume: -4
- type: ToggleVerb
text: fire-extinguisher-component-verb-text
verbToggleOn: fire-extinguisher-component-verb-remove
verbToggleOff: fire-extinguisher-component-verb-engage
- type: SpraySafety
- type: MeleeWeapon
wideAnimationRotation: 180

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

@@ -150,6 +150,23 @@
- LightBulb
- Trash
- type: entity
parent: BaseLightbulb
name: dim light bulb
id: DimLightBulb
description: A dim light bulb for populating the darkness of maintenance.
components:
- type: LightBulb
bulb: Bulb
color: "#ba473f"
lightEnergy: 0.5
lightRadius: 5
lightSoftness: 3
- type: Tag
tags:
- LightBulb
- Trash
- type: entity
parent: LightBulb
name: old incandescent light bulb

2
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
View File

@@ -1036,7 +1036,7 @@
id: SyringeStimulants
components:
- type: Label
currentLabel: reagent-name-hyperzine
currentLabel: reagent-name-stimulants
- type: SolutionContainerManager
solutions:
injector:

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
View File

@@ -269,7 +269,7 @@
name: throwing knife
parent: [BaseKnife, BaseSyndicateContraband]
id: ThrowingKnife
description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
description: This blood-red knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
components:
- type: Tag
tags:

2
Resources/Prototypes/Entities/Stations/base.yml
View File

@@ -73,7 +73,7 @@
vgroid: !type:DungeonSpawnGroup
minimumDistance: 300
maximumDistance: 350
nameDataset: names_borer
nameDataset: NamesBorer
stationGrid: false
addComponents:
- type: Gravity

1
Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
View File

@@ -37,6 +37,7 @@
- type: Appearance
- type: Weldable
time: 2
weldedExamineMessage: null
- type: Airtight
- type: Damageable
damageContainer: StructuralInorganic

21
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
View File

@@ -346,6 +346,27 @@
Heat: 1
popupText: powered-light-component-burn-hand
- type: entity
id: PoweredDimSmallLight
suffix: Dim
parent: PoweredSmallLightEmpty
components:
- type: Sprite
state: base
- type: PointLight
enabled: true
radius: 5
energy: 0.5
softness: 3
color: "#ba473f"
- type: PoweredLight
hasLampOnSpawn: DimLightBulb
- type: DamageOnInteract
damage:
types:
Heat: 1
popupText: powered-light-component-burn-hand
- type: entity
id: PoweredSmallLight
suffix: ""

1
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -150,6 +150,7 @@
- ExteriorLightTube
- LightBulb
- LedLightBulb
- DimLightBulb
- Bucket
- DrinkMug
- DrinkMugMetal

2
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
View File

@@ -1,7 +1,7 @@
- type: entity
id: SingularityGenerator
name: gravitational singularity generator
description: An Odd Device which produces a Gravitational Singularity when set up.
description: An Odd Device which produces a Gravitational Singularity when set up. Comes with a temporary shutdown containment failsafe.
placement:
mode: SnapgridCenter
components:

4
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
View File

@@ -2,12 +2,12 @@
id: TeslaGenerator
name: tesla generator
parent: BaseStructureDynamic
description: An Odd Device which produces a powerful Tesla ball when set up.
description: An Odd Device which produces a powerful Tesla ball when set up. Comes with a temporary shutdown containment failsafe.
components:
- type: Sprite
noRot: true
sprite: Structures/Power/Generation/Tesla/generator.rsi
state: icon
state: icon
- type: SingularityGenerator # TODO: rename the generator
spawnId: TeslaEnergyBall
- type: InteractionOutline

5
Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
View File

@@ -20,6 +20,11 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
visible: false
sprite: Structures/Storage/closet_labels.rsi
offset: "-0.065,0"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Destructible
thresholds:
- trigger:

19
Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
View File

@@ -19,6 +19,10 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
visible: false
sprite: Structures/Storage/closet_labels.rsi
map: ["enum.PaperLabelVisuals.Layer"]
- type: MovedByPressure
- type: PaperLabel
labelSlot:
@@ -86,6 +90,21 @@
SheetSteel1:
min: 1
max: 1
- type: GenericVisualizer
visuals:
enum.PaperLabelVisuals.HasLabel:
enum.PaperLabelVisuals.Layer:
True: { visible: true }
False: { visible: false }
enum.StorageVisuals.Open:
enum.PaperLabelVisuals.Layer:
True: { visible: false }
enum.PaperLabelVisuals.LabelType:
enum.PaperLabelVisuals.Layer:
Paper: { state: paper }
Bounty: { state: bounty }
CaptainsPaper: { state: captains_paper }
Invoice: { state: invoice }
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: generic

194
Resources/Prototypes/Magic/event_spells.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: ActionSummonGhosts
name: Summon Ghosts
description: Makes all current ghosts permanently invisible
@@ -10,3 +10,195 @@
sprite: Mobs/Ghosts/ghost_human.rsi
state: icon
event: !type:ToggleGhostVisibilityToAllEvent
# TODO: Add Whitelist/Blacklist and Component support to EntitySpawnLists (to avoid making huge hardcoded lists like below).
- type: entity
id: ActionSummonGuns
name: Summon Guns
description: AK47s for everyone! Places a random gun in front of everybody.
components:
- type: Magic
- type: InstantAction
useDelay: 300
itemIconStyle: BigAction
icon:
sprite: Objects/Weapons/Guns/Rifles/ak.rsi
state: base
event: !type:RandomGlobalSpawnSpellEvent
spawns:
- id: WeaponPistolViper
orGroup: Guns
- id: WeaponPistolCobra
orGroup: Guns
- id: WeaponPistolMk58
orGroup: Guns
- id: WeaponPistolN1984
orGroup: Guns
- id: WeaponRevolverDeckard
orGroup: Guns
- id: WeaponRevolverInspector
orGroup: Guns
- id: WeaponRevolverMateba
orGroup: Guns
- id: WeaponRevolverPython
orGroup: Guns
- id: WeaponRevolverPirate
orGroup: Guns
- id: WeaponRifleAk
orGroup: Guns
- id: WeaponRifleM90GrenadeLauncher
orGroup: Guns
- id: WeaponRifleLecter
orGroup: Guns
- id: WeaponShotgunBulldog
orGroup: Guns
- id: WeaponShotgunDoubleBarreled
orGroup: Guns
- id: WeaponShotgunEnforcer
orGroup: Guns
- id: WeaponShotgunKammerer
orGroup: Guns
- id: WeaponShotgunSawn
orGroup: Guns
- id: WeaponShotgunHandmade
orGroup: Guns
- id: WeaponShotgunBlunderbuss
orGroup: Guns
- id: WeaponShotgunImprovised
orGroup: Guns
- id: WeaponSubMachineGunAtreides
orGroup: Guns
- id: WeaponSubMachineGunC20r
orGroup: Guns
- id: WeaponSubMachineGunDrozd
orGroup: Guns
- id: WeaponSubMachineGunWt550
orGroup: Guns
- id: WeaponSniperMosin
orGroup: Guns
- id: WeaponSniperHristov
orGroup: Guns
- id: Musket
orGroup: Guns
- id: WeaponPistolFlintlock
orGroup: Guns
- id: WeaponLauncherChinaLake
orGroup: Guns
- id: WeaponLauncherRocket
orGroup: Guns
- id: WeaponLauncherPirateCannon
orGroup: Guns
- id: WeaponTetherGun
orGroup: Guns
- id: WeaponForceGun
orGroup: Guns
- id: WeaponGrapplingGun
orGroup: Guns
- id: WeaponLightMachineGunL6
orGroup: Guns
- id: WeaponLaserSvalinn
orGroup: Guns
- id: WeaponLaserGun
orGroup: Guns
- id: WeaponMakeshiftLaser
orGroup: Guns
- id: WeaponTeslaGun
orGroup: Guns
- id: WeaponLaserCarbinePractice
orGroup: Guns
- id: WeaponLaserCarbine
orGroup: Guns
- id: WeaponPulsePistol
orGroup: Guns
- id: WeaponPulseCarbine
orGroup: Guns
- id: WeaponPulseRifle
orGroup: Guns
- id: WeaponLaserCannon
orGroup: Guns
- id: WeaponParticleDecelerator
orGroup: Guns
- id: WeaponXrayCannon
orGroup: Guns
- id: WeaponDisablerPractice
orGroup: Guns
- id: WeaponDisabler
orGroup: Guns
- id: WeaponDisablerSMG
orGroup: Guns
- id: WeaponTaser
orGroup: Guns
- id: WeaponAntiqueLaser
orGroup: Guns
- id: WeaponAdvancedLaser
orGroup: Guns
- id: WeaponPistolCHIMP
orGroup: Guns
- id: WeaponBehonkerLaser
orGroup: Guns
- id: WeaponEnergyShotgun
orGroup: Guns
- id: WeaponMinigun
orGroup: Guns
- id: BowImprovised
orGroup: Guns
- id: WeaponFlareGun
orGroup: Guns
- id: WeaponImprovisedPneumaticCannon
orGroup: Guns
- id: WeaponWaterPistol
orGroup: Guns
- id: WeaponWaterBlaster
orGroup: Guns
- id: WeaponWaterBlasterSuper
orGroup: Guns
- id: RevolverCapGun
orGroup: Guns
- id: RevolverCapGunFake
orGroup: Guns
speech: action-speech-spell-summon-guns
- type: entity
id: ActionSummonMagic
name: Summon Magic
description: Places a random magical item in front of everybody. Nothing could go wrong!
components:
- type: Magic
- type: InstantAction
useDelay: 300
itemIconStyle: BigAction
icon:
sprite: Objects/Magic/magicactions.rsi
state: magicmissile
event: !type:RandomGlobalSpawnSpellEvent
spawns:
- id: SpawnSpellbook
orGroup: Magics
- id: ForceWallSpellbook
orGroup: Magics
- id: BlinkBook
orGroup: Magics
- id: SmiteBook
orGroup: Magics
- id: KnockSpellbook
orGroup: Magics
- id: FireballSpellbook
orGroup: Magics
- id: WeaponWandPolymorphCarp
orGroup: Magics
- id: WeaponWandPolymorphMonkey
orGroup: Magics
- id: WeaponWandFireball
orGroup: Magics
- id: WeaponWandPolymorphDoor
orGroup: Magics
- id: WeaponWandCluwne
orGroup: Magics
- id: WeaponWandPolymorphBread
orGroup: Magics
- id: WeaponStaffHealing
orGroup: Magics
- id: WeaponStaffPolymorphDoor
orGroup: Magics
speech: action-speech-spell-summon-magic

13
Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
View File

@@ -27,17 +27,8 @@
sprite: Objects/Devices/communication.rsi
state: walkietalkie
doAfter: 5
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
doAfter: 5
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
- material: Capacitor
amount: 2
doAfter: 5
- node: medsecHud
entity: ClothingEyesHudMedSec

7
Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
View File

@@ -46,11 +46,8 @@
doAfter: 1
- to: memory_cell
steps:
- tag: CapacitorStockPart
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
name: a capacitor
- material: Capacitor
amount: 1
- material: Cable
amount: 2
doAfter: 1

10
Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
View File

@@ -28,7 +28,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalBlue
name: blue crystal shard
@@ -48,7 +48,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalPink
name: pink crystal shard
@@ -68,7 +68,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalOrange
name: orange crystal shard
@@ -88,7 +88,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalRed
name: red crystal shard
@@ -108,7 +108,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalGreen
name: green crystal shard

8
Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
View File

@@ -57,12 +57,8 @@
sprite: "Objects/Power/power_cells.rsi"
state: "medium"
doAfter: 0.5
- tag: CapacitorStockPart
name: a capacitor
store: capacitor
icon:
sprite: "Objects/Misc/stock_parts.rsi"
state: "capacitor"
- material: Capacitor
amount: 1
doAfter: 0.5
- to: frame
completed:

12
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
View File

@@ -60,15 +60,7 @@
- material: Cable
amount: 2
doAfter: 1
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
- material: Capacitor
amount: 2
- node: potatoaichip
entity: PotatoAIChip

9
Resources/Prototypes/Recipes/Lathes/misc.yml
View File

@@ -52,6 +52,15 @@
Steel: 50
Glass: 50
- type: latheRecipe
id: DimLightBulb
result: DimLightBulb
category: Lights
completetime: 2
materials:
Steel: 50
Glass: 50
- type: latheRecipe
id: GlowstickRed
result: GlowstickRed

1
Resources/Prototypes/Stacks/science_stacks.yml
View File

@@ -7,6 +7,7 @@
- type: stack
id: Capacitor
name: capacitor
icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: capacitor }
spawn: CapacitorStockPart
maxCount: 10

BIN
Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 209 B

2
Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github)",
"size": {
"x": 8,

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 200 B

2
Resources/Textures/Objects/Misc/id_cards.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/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)",
"size": {
"x": 32,
"y": 32

BIN
Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 192 B

BIN
Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 594 B

After

Width:  |  Height:  |  Size: 192 B

BIN
Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 192 B

4
Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Vermidia.",
"copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
"size": {
"x": 32,
"y": 32
@@ -20,4 +20,4 @@
"name": "invoice"
}
]
}
}

BIN
Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 182 B

BIN
Resources/Textures/Structures/Storage/closet_labels.rsi/bounty.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 185 B

BIN
Resources/Textures/Structures/Storage/closet_labels.rsi/captains_paper.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 185 B

BIN
Resources/Textures/Structures/Storage/closet_labels.rsi/invoice.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 185 B

23
Resources/Textures/Structures/Storage/closet_labels.rsi/meta.json Normal file
View File

@@ -0,0 +1,23 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites by Vermidia and modified by SpaceRox1244.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "paper"
},
{
"name": "bounty"
},
{
"name": "captains_paper"
},
{
"name": "invoice"
}
]
}

BIN
Resources/Textures/Structures/Storage/closet_labels.rsi/paper.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

2
Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
View File

@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
"copyright": "Taken from tgstation",
"copyright": "Taken from tgstation, modified for SS14",
"license": "CC-BY-SA-3.0",
"states": [
{

3
Resources/migration.yml
View File

@@ -475,3 +475,6 @@ LeftLegBorgJanitor: LeftLegBorg
RightLegBorgJanitor: RightLegBorg
HeadBorgJanitor: LightHeadBorg
TorsoBorgJanitor: TorsoBorg
# 2024-11-19
CrateCrewMonitoringBoards: CrateCrewMonitoring