Morb0 2deb2ac88b Merge remote-tracking branch 'wizards/master' into upstream-sync ...

# Conflicts:
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
#	Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json

2024-11-08 17:29:34 +03:00

..

AirlockSystem.cs

Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync

2024-09-19 10:30:01 +03:00

DoorSystem.cs

Fixes bolt lights of previously unpowered bolted doors (#33063)

2024-10-31 22:04:08 -04:00

FirelockSystem.cs

Power stuff (#31314)

2024-08-25 22:18:42 +10:00