CatStation/Resources/Prototypes
Morb0 8ba54ec466 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Audio/ContentAudioSystem.cs
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
#	Resources/Prototypes/Datasets/ion_storm.yml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
..
Accents Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-25 21:03:49 +03:00
Access Central Command Access, Doors, and Locked Vendor (#22924) 2023-12-24 13:49:23 -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 Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-07-10 07:03:24 +03:00
Alerts Minor alert locale (#22926) 2023-12-24 14:13:02 -05:00
Atmospherics give plasma half of co2 air alarm threshold (#22938) 2023-12-24 23:51:32 -07:00
Body Adds gingerbread men to the game (#22927) 2023-12-25 01:11:37 -07:00
Catalog Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
Chemistry add mixing categories to chem guidebook (#22566) 2023-12-15 16:59:54 -07:00
Corvax more new year lobby arts (#1689) 2023-12-28 00:33:46 +03:00
Damage Adds gingerbread men to the game (#22927) 2023-12-25 01:11:37 -07:00
Datasets Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
Decals decal settings (#20324) 2023-09-18 17:17:48 -06:00
Device Shuttle timers (#19471) 2023-12-20 09:30:29 +11:00
DeviceLinking add power sensor (#20400) 2023-12-16 11:32:42 -07:00
Entities Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
EntityLists/Tools
Flavors Holy water (#22524) 2023-12-15 02:52:21 -07:00
GameRules Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
Guidebook Add access logs (IC ones) (#17810) 2023-12-26 18:24:53 -04:00
Hydroponics Botany balancing fixes and QoL ('No romerol ambrosia' edition) (#21756) 2023-12-02 12:01:58 -05:00
InventoryTemplates Corner Clothing UI (#22883) 2023-12-22 23:32:23 -07:00
LootTables [replacement] Drozd (#16071) 2023-05-03 21:35:32 -06:00
MachineParts SMES and substation require power cells as machine parts (#20344) 2023-10-12 12:06:03 -04:00
Magic Action Upgrade System (#22277) 2023-12-15 02:41:44 -07:00
Maps Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
NPCs hide medibot messages from chat and logs (#21468) 2023-11-05 18:21:04 -07:00
Objectives Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
Palettes Makes unpowered flashlights emmagables. (#16143) 2023-05-07 16:08:03 +10:00
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 Add coal distribution to progen (#22755) 2023-12-20 16:46:20 -07:00
Reagents Nerfed bloodsuckers- They can no longer tank some incoming damage types by chugging blood (#22880) 2023-12-24 14:59:44 -05:00
Recipes Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-29 16:58:52 +03:00
Research Science magboots (#23107) 2023-12-28 20:08:07 -07:00
Roles Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-25 21:03:49 +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-29 16:58:52 +03:00
Species Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-25 21:03:49 +03:00
Stacks Adds coal (#22559) 2023-12-18 14:38:11 -05: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 Uplink catalog localization (#12931) 2022-12-19 21:52:59 -06:00
Tiles Faux astro-tiles for science & mappers (#22586) 2023-12-16 01:20:57 -07:00
Traits some lil brrrr (#21955) 2023-11-29 19:21:35 -08:00
Voice Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-16 12:36:47 +03:00
Wires Hardbombs & Defusables (#15380) 2023-09-11 18:42:38 -07:00
World Dynamic space world generation and debris. (#15120) 2023-05-16 06:36:45 -05:00
XenoArch Rename Miasma to Ammonia (#22791) 2023-12-20 21:19:50 -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 Added "Spacebucks" barsign (#15660) 2023-04-23 18:13:31 -04:00
edge_spreaders.yml Remove SpreaderNodeGroup (#20230) 2023-10-01 16:56:41 -04:00
explosion.yml structural damage rework / melee damage curve flattening (#22705) 2023-12-18 21:38:49 -05:00
fonts.yml Ion law visuals (#22908) 2023-12-23 23:58:02 -07:00
game_presets.yml Revolutionaries (#18477) 2023-10-04 18:47:33 -07:00
holidays.yml Add Towel Day (#16364) 2023-05-12 13:39:18 -07:00
hud.yml Move HUD options to general options tab (#22884) 2023-12-22 23:32:56 -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 Adds coal (#22559) 2023-12-18 14:38:11 -05:00
radio_channels.yml Merge remote-tracking branch 'upstream/master' into update-sposnors 2023-11-08 03:00:51 +03:00
round_announcements.yml Fix some announcements code (#16585) 2023-05-21 20:06:05 +10:00
secret_weights.yml Update Secret gamemode weights (#1542) 2023-11-04 12:05:14 +03:00
silicon-laws.yml add ninja borg laws (#22778) 2023-12-24 09:37:35 -05:00
status_effects.yml stimulants increase stamina (#18754) 2023-08-06 21:06:23 +10:00
tags.yml Add Chef's Belt (#22868) 2023-12-23 00:11:30 -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 Weather effects (#12528) 2023-01-17 20:26:52 +11:00