CatStation/Resources/Prototypes
Morb0 33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
..
Accents Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-11 21:56:43 +03:00
Access Access/Airlock Revamp (#21701) 2023-11-16 15:20:48 -07:00
Actions adds the death acidifier implant and returns the micro-bomb implant to the uplink (#22060) 2023-12-01 13:14:45 -07:00
AlertLevels
Alerts Fix borg mobstates (#21307) 2023-11-09 16:14:06 -07:00
Atmospherics Remove plasma miners from maps (#22358) 2023-12-11 16:21:25 -07:00
Body Fix hand order (#22306) 2023-12-11 11:44:44 +11:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-14 00:57:14 +03:00
Chemistry Space Sharkminnow (#20658) 2023-11-12 17:42:48 -07:00
Corvax New map "Outpost" (#1632) 2023-12-13 01:51:51 +03:00
Damage Borgs No Longer Take Structural Damage (#21716) 2023-11-19 17:44:22 +11:00
Datasets Dataset ops p2 (#1627) 2023-12-12 11:30:07 +03:00
Decals decal settings (#20324) 2023-09-18 17:17:48 -06:00
Device
DeviceLinking Anomaly Synchronizer (#20945) 2023-11-05 21:02:02 -07:00
Entities Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-14 00:57:14 +03:00
EntityLists/Tools
Flavors New mutation species plant, Lemoon Tree (#22023) 2023-11-30 16:44:23 -05:00
GameRules Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-11-04 12:16:53 +03:00
Guidebook 3 New Brute Chemicals (And Razorium) (#22103) 2023-12-06 22:05:29 -05:00
Hydroponics Botany balancing fixes and QoL ('No romerol ambrosia' edition) (#21756) 2023-12-02 12:01:58 -05:00
InventoryTemplates Even spaced hotbar (#22252) 2023-12-11 04:37:51 -07:00
LootTables
MachineParts SMES and substation require power cells as machine parts (#20344) 2023-10-12 12:06:03 -04:00
Magic Instruments, plushies, gunpet, and bibles. (#22398) 2023-12-12 01:03:47 -07:00
Maps Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-12 11:00:46 +03:00
NPCs hide medibot messages from chat and logs (#21468) 2023-11-05 18:21:04 -07:00
Objectives Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-12-03 15:10:26 +03:00
Palettes
Parallaxes Origin Station Update 06.11.2023 (notice boards and gasgiant parallax) (#21492) 2023-11-07 18:26:22 -07:00
Polymorphs The Mobs of the Living Light (#21338) 2023-11-05 19:24:14 -07:00
Procedural Update desert planet walls to WallRockSand (#21783) 2023-11-21 20:01:30 -05:00
Reagents Fix frezon intoxication (#22453) 2023-12-13 12:17:48 -08:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-14 00:57:14 +03:00
Research artifact crusher (#22301) 2023-12-12 10:15:47 +11:00
Roles Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-14 00:57:14 +03:00
Shaders Gateway destinations (#21040) 2023-11-14 19:23:40 -07:00
SoundCollections Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-08 13:54:31 +03:00
Species [Race] Vulpkanin (#1595) 2023-12-10 15:42:57 +03:00
Stacks adds lime tiles (#22235) 2023-12-08 12:49:07 -06:00
StatusEffects Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-24 12:56:24 +03:00
StatusIcon Move mindshield icon to other side (#1624) 2023-12-10 23:42:33 +03:00
Store
Tiles adds lime tiles (#22235) 2023-12-08 12:49:07 -06:00
Traits some lil brrrr (#21955) 2023-11-29 19:21:35 -08:00
Voice Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-12-03 15:10:26 +03:00
Wires Hardbombs & Defusables (#15380) 2023-09-11 18:42:38 -07:00
World
XenoArch Grid Inventory (#21931) 2023-12-04 16:04:39 -07:00
ai_factions.yml Revolutionaries (#18477) 2023-10-04 18:47:33 -07:00
audio.yml Add Voyage Neverending to mining music (#21631) 2023-11-17 00:28:06 +11:00
bar_signs.yml
edge_spreaders.yml Remove SpreaderNodeGroup (#20230) 2023-10-01 16:56:41 -04:00
explosion.yml Hardbombs & Defusables (#15380) 2023-09-11 18:42:38 -07:00
fonts.yml allow richtext on papers + edit premade documents (#18154) 2023-08-22 21:50:03 +10:00
game_presets.yml Revolutionaries (#18477) 2023-10-04 18:47:33 -07:00
holidays.yml
hud.yml The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287) 2023-12-11 02:28:17 -07:00
item_size.yml Grid Inventory (#21931) 2023-12-04 16:04:39 -07:00
lobbyscreens.yml
name_identifier_groups.yml Borgs (#18136) 2023-08-12 16:39:58 -05:00
ore.yml Artifact fragments can now stack. (#21232) 2023-11-05 19:21:07 -07:00
radio_channels.yml Merge remote-tracking branch 'upstream/master' into update-sposnors 2023-11-08 03:00:51 +03:00
round_announcements.yml
secret_weights.yml Update Secret gamemode weights (#1542) 2023-11-04 12:05:14 +03:00
silicon-laws.yml Ion storm event (#20277) 2023-10-26 22:40:13 -04:00
status_effects.yml stimulants increase stamina (#18754) 2023-08-06 21:06:23 +10:00
tags.yml let cyberpen edit stamped papers (#22457) 2023-12-13 14:33:31 -07:00
themes.yml The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287) 2023-12-11 02:28:17 -07:00
threats.yml fix dragon threat (#22096) 2023-12-02 15:41:36 -05:00
tool_qualities.yml Add rolling pins for flattening dough (#20624) 2023-10-02 11:21:15 -08:00
typing_indicator.yml Add arachnid idle state for typing indicator 2023-09-05 01:23:47 +03:00
weather.yml