cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-feb12-2026

Browse Source
This commit is contained in:
Alexis
2026-03-02 07:42:16 -05:00
parent 4dc38c0ad6 b721351dd4
commit 5c5a636485
385 changed files with 227785 additions and 5757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/garment.dm
+6 -14
View File
@@ -86,8 +86,7 @@
new /obj/item/clothing/suit/armor/vest/hop/hop_formal(src)
new /obj/item/clothing/neck/mantle/hopmantle(src)
/obj/item/storage/bag/garment/hos/PopulateContents()
new /obj/item/clothing/under/rank/security/head_of_security(src)
/obj/item/storage/bag/garment/hos/PopulateContents() /* BUBBER EDIT - OVERWRITTEN IN modular_zubbers\code\modules\security\sec_garment_overrides.dm
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
@@ -105,20 +104,12 @@
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)
new /obj/item/clothing/under/rank/security/peacekeeper/skirt_hos(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/under/rank/security/head_of_security/parade(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female(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)
@@ -127,11 +118,11 @@
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()
/obj/item/storage/bag/garment/warden/PopulateContents() /* BUBBER EDIT - OVERWRITTEN IN modular_zubbers\code\modules\security\sec_garment_overrides.dm
new /obj/item/clothing/suit/armor/vest/warden(src)
new /obj/item/clothing/head/hats/warden(src)
new /obj/item/clothing/head/hats/warden/drill(src)
@@ -144,6 +135,7 @@
new /obj/item/clothing/gloves/kaza_ruk/sec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/mask/gas/sechailer(src)
*/
/obj/item/storage/bag/garment/research_director/PopulateContents()
new /obj/item/clothing/under/rank/rnd/research_director(src)
code/game/objects/items/tools/engineering/painter/paintable_decals.dm
-2
View File
@@ -181,7 +181,6 @@
"Engi Yellow" = /obj/effect/turf_decal/tile/yellow::color,
"Med Blue" = /obj/effect/turf_decal/tile/blue::color,
"R&D Purple" = /obj/effect/turf_decal/tile/purple::color,
"Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/tile/red::color,
"Service Green" = /obj/effect/turf_decal/tile/green::color,
"Custom" = "custom",
@@ -236,7 +235,6 @@
"Engi Yellow" = /obj/effect/turf_decal/siding/yellow::color,
"Med Blue" = /obj/effect/turf_decal/siding/blue::color,
"R&D Purple" = /obj/effect/turf_decal/siding/purple::color,
"Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/siding/red::color,
"Service Green" = /obj/effect/turf_decal/siding/green::color,
"Custom" = "custom",