CatStation/Resources/Prototypes
Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
#	Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
..
Accents Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-04-12 02:17:14 +03:00
Access
Actions Minor slime fix (#27237) 2024-04-22 03:18:36 -07:00
AlertLevels Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Alerts dynamic alert sprites (#25452) 2024-03-28 17:32:56 +11:00
Anomaly temporarily remove broken anom behavior (#26775) 2024-04-07 01:27:16 +03:00
Atmospherics Increase air alarm low pressure thresholds. 2024-03-17 22:38:48 +01:00
Body Server-only component YAML cleanup (#26836) 2024-04-09 00:20:49 -04:00
Catalog Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Chemistry
Corvax Fix yaml linter 2024-04-17 15:34:51 +03:00
Damage Buff zombie resists (#25876) 2024-03-07 16:02:49 -05:00
Datasets Locale tweaks (#2042) 2024-04-17 08:14:19 +03:00
Decals
Device
DeviceLinking Anomalies behaviours (#24683) 2024-04-01 19:29:13 +11:00
Entities Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
EntityLists/Tools
Flavors Psicodine, Mannitol, Lipolicide and Happiness (#27134) 2024-04-22 01:45:38 -07:00
GameRules Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Guidebook SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545) 2024-04-21 12:09:26 -04:00
Hydroponics chili/chilly peppers sprite alignment fix & minor refactorization (#25971) 2024-04-20 12:06:48 +10:00
InventoryTemplates make filled inventory slots blank (#27150) 2024-04-20 13:17:29 +10:00
Loadouts Glasses in loadouts (#27286) 2024-04-26 01:18:39 +02:00
LootTables
MachineParts
Magic
Maps Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
NPCs Killer tomatoes (#26053) 2024-04-18 21:21:56 +10:00
Objectives Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Palettes Decal Beautification + Palette Update (#25689) 2024-02-29 15:27:25 -07:00
Parallaxes Little rework of existing yaml flatpacks (#24814) 2024-02-21 21:44:22 -05:00
Polymorphs General slime improvements (#23425) 2024-04-22 03:03:03 -07:00
Procedural Fix for the salvage ice labs map. (#26928) 2024-04-13 23:49:02 +03:00
RCD Bug fix for deconstructing tiles and lattice with RCDs (#26863) 2024-04-11 22:26:34 +10:00
Reagents Treatment of blood loss in the Rat King (#26887) 2024-04-26 17:47:01 +10:00
Recipes Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Research Make the cargo telepad T2 civilian (#26270) 2024-04-24 23:21:28 +10:00
Roles Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Shaders
SoundCollections New lobby music (#2030) 2024-04-11 12:38:03 +03:00
Species Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-02-29 12:28:26 +03:00
Stacks Add astro-jungle/mowed grass and astro-snow (#26381) 2024-03-24 18:14:04 -07:00
StatusEffects Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
StatusIcon Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-26 11:19:50 +03:00
Store Changed names of uplink categories and swapped around items (#25079) 2024-03-13 20:47:17 +11:00
Tiles Add astro-jungle/mowed grass and astro-snow (#26381) 2024-03-24 18:14:04 -07:00
Traits Southern accent (#26543) 2024-03-31 15:39:40 +11:00
Voice Locale tweaks (#2018) 2024-04-08 11:20:51 +03:00
Wires Arcade machine improvements (#24200) 2024-03-28 17:28:45 +11:00
World
XenoArch Server-only component YAML cleanup (#26836) 2024-04-09 00:20:49 -04:00
ai_factions.yml
audio.yml New salvage expedition ambience. (#25983) 2024-03-11 17:56:01 +11:00
bar_signs.yml
edge_spreaders.yml
explosion.yml Adjust syndicate hardbomb damage (#26548) 2024-03-30 15:36:33 +11:00
floor_trap.yml Floor trap (#26314) 2024-04-20 16:09:00 +10:00
fonts.yml
game_presets.yml Mega Antag Refactor (#25786) 2024-04-25 11:31:45 +10:00
holidays.yml
hud.yml Remove Eris UI theme (#25673) 2024-02-28 23:53:48 -06:00
item_size.yml
lobbyscreens.yml New lobby art: TerminalStation (#26505) 2024-04-04 07:28:30 +02:00
name_identifier_groups.yml fix cargo teleporter (#27255) 2024-04-23 22:07:12 +10:00
ore.yml Adds minable salt "ore" (#25324) 2024-02-26 16:34:15 -07:00
radio_channels.yml
round_announcements.yml
secret_weights.yml reenable revs (#25704) 2024-03-03 11:30:22 +11:00
silicon-laws.yml
status_effects.yml
tags.yml Add Truncheon to Secbelt Whitelist (#27281) 2024-04-24 16:43:56 +03:00
themes.yml THE RETURN OF ITEM STATUS (#22986) 2024-04-21 23:16:23 +10:00
threats.yml
tool_qualities.yml
typing_indicator.yml Add idle state to vox typing indicator 2024-02-17 12:44:41 +03:00
weather.yml