Morb0
a0bce916fb
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
Errant
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
2024-08-15 20:26:57 +02:00
Morb0
8ffde2eea4
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test-packaging.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
# Tools/gen_build_info.py
2024-07-14 12:15:16 +03:00
Chief-Engineer
6371a04621
Fix baby jail ( #29896 )
...
* Revert "Revert Baby Jail (#29891 )"
This reverts commit 24a2866747
2024-07-11 15:14:01 +10:00
Morb0
6d1173b8f3
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/labeler.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
2024-07-11 04:43:23 +03:00
Vasilis
24a2866747
Revert Baby Jail ( #29891 )
...
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763 )"
This reverts commit 3ceb92a0c4
2024-07-11 10:33:47 +10:00
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03:00
Hannah Giovanna Dawson
1bb9d9451f
Panic Bunker uses minutes not hours ( #28805 )
...
* Panic Bunker uses minutes not hours
* Fixing an instance of hours
2024-06-09 22:45:47 +02:00
Hannah Giovanna Dawson
3ceb92a0c4
SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) ( #28763 )
2024-06-09 14:58:10 -04:00
Morb
63551a4471
[Secrets] VPN guard ( #1594 )
2023-11-28 18:52:28 +03:00
DrSmugleaf
db4ad40430
Add panic bunker UI and automatic panic bunker ( #20954 )
2023-10-13 11:56:12 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
ShadowCommander
9d70bdde9c
Keep players in the PlayerTab until round end ( #5921 )
...
* Rework AdminSystem to keep players in the PlayerTab until round end
* Prevent sending PlayerStatus to deadminned admins
* Change _playerList to non-nullable
* Clean up unused usings
* Consolidate duplicate foreach loop code
2021-12-30 16:12:28 +01:00
Paul Ritter
e74301a856
refactors adminmenu a timid amount ( #5095 )
...
Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-11-10 23:26:25 +11:00
