Merge branch 'master' of github.com:Bubberstation/Bubberstation into upstream-sync-7-22-2026

This commit is contained in:
Maia
2026-08-14 19:51:24 +02:00
8 changed files with 62 additions and 5 deletions
@@ -1,2 +1,4 @@
// Enables secborg and puts silicons in control of security
#define STATION_TRAIT_HOS_AI "station_trait_hos_ai"
// Enabled heads of staff to be antags
#define STATION_TRAIT_HEAD_ANTAG "station_trait_head_antag"