Merge branch 'master' into upstream-2026-06-23

This commit is contained in:
Roxy
2026-06-27 13:07:00 -04:00
58 changed files with 801 additions and 141 deletions
@@ -106,30 +106,6 @@
new /obj/item/clothing/head/hats/hos/cap(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
new /obj/item/clothing/neck/cloak/hos(src)
//BUBBER ADDITION BEGIN
new /obj/item/clothing/neck/cloak/hos/redsec(src)
new /obj/item/clothing/under/rank/security/head_of_security/redsec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
new /obj/item/clothing/shoes/jackboots/sec/redsec(src)
new /obj/item/clothing/head/hos_kepi(src)
//BUBBER ADDITION END
//Duplication from Commdrobe
new /obj/item/clothing/head/hats/warden/drill/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/roselia(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/redsec(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec(src)
new /obj/item/clothing/head/hats/hos/elofy(src)
new /obj/item/clothing/suit/armor/hos/elofy(src)
new /obj/item/clothing/gloves/elofy(src)
new /obj/item/clothing/shoes/jackboots/elofy(src)
new /obj/item/clothing/head/playbunnyears/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/bunnysuit(src)
new /obj/item/clothing/suit/armor/hos_tailcoat(src)
new /obj/item/clothing/head/hats/hos/beret/navyhos(src)
new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper(src)
new /obj/item/clothing/suit/jacket/hos/blue(src)
new /obj/item/clothing/neck/mantle/hosmantle(src)
/obj/item/storage/bag/garment/warden/PopulateContents()
new /obj/item/clothing/suit/armor/vest/warden(src)