CatStation/Resources/Prototypes/Entities
Morb0 0eba25c0eb Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
..
Clothing Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
Debugging Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) 2024-07-25 05:24:00 -07:00
Effects Flora anomaly seeds (#31987) 2024-09-21 21:54:56 +02:00
Markers Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
Mobs Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
Objects Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
Stations [Maps] Mining shuttle return (#2551) 2024-09-02 11:16:16 +03:00
Structures Merge remote-tracking branch 'wizards/master' into upstream-sync 2024-10-15 17:04:40 +03:00
Tiles Fix some descriptions (#30644) 2024-08-05 13:15:52 +10:00
Virtual Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) 2024-07-25 05:24:00 -07:00
World Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) 2024-07-25 05:24:00 -07:00
categories.yml Hide role entities in the spawn menu (#32798) 2024-10-14 14:05:49 +11:00
foldable.yml Deploy foldable (#30000) 2024-08-02 17:05:12 +10:00