Merge branch 'master' of https://github.com/Bubberstation/Bubberstation into upstream-25-02a

This commit is contained in:
Majkl-J
2025-02-25 06:56:39 -08:00
204 changed files with 9929 additions and 15079 deletions
@@ -72,6 +72,21 @@
new /obj/item/clothing/head/hats/hopcap(src)
new /obj/item/clothing/neck/cloak/hop(src)
new /obj/item/clothing/shoes/laceup(src)
//Duplication from Commdrobe
new /obj/item/clothing/head/playbunnyears/hop(src)
new /obj/item/clothing/under/rank/civilian/hop_bunnysuit(src)
new /obj/item/clothing/suit/armor/hop_tailcoat(src)
new /obj/item/clothing/neck/tie/bunnytie/hop(src)
new /obj/item/clothing/head/hopcap/beret(src)
new /obj/item/clothing/head/hopcap/beret/alt(src)
new /obj/item/clothing/head/hats/imperial/hop(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck/skirt(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade/female(src)
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial(src)
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/skirt(src)
@@ -99,6 +114,25 @@
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/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/head/hats/imperial/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper(src)
new /obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial(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)
@@ -126,6 +160,20 @@
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/neck/cloak/rd(src)
new /obj/item/clothing/shoes/jackboots(src)
//Duplication from Commdrobe
new /obj/item/clothing/head/beret/science/rd(src)
new /obj/item/clothing/head/beret/science/rd/alt(src)
new /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit(src)
new /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit/skirt(src)
new /obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial(src)
new /obj/item/clothing/neck/mantle/rdmantle(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/suit/toggle/labcoat/research_director(src)
new /obj/item/clothing/head/playbunnyears/rd(src)
new /obj/item/clothing/under/rank/rnd/research_director/bunnysuit(src)
new /obj/item/clothing/suit/jacket/research_director/tailcoat(src)
new /obj/item/clothing/neck/tie/bunnytie/rd(src)
/obj/item/storage/bag/garment/chief_medical/PopulateContents()
new /obj/item/clothing/under/rank/medical/chief_medical_officer(src)
@@ -140,6 +188,15 @@
new /obj/item/clothing/head/utility/surgerycap/cmo(src)
new /obj/item/clothing/neck/cloak/cmo(src)
new /obj/item/clothing/shoes/sneakers/blue (src)
//Duplication from Commdrobe
new /obj/item/clothing/head/beret/medical/cmo/alt(src)
new /obj/item/clothing/head/hats/imperial/cmo(src)
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial(src)
new /obj/item/clothing/neck/mantle/cmomantle(src)
new /obj/item/clothing/head/playbunnyears/cmo(src)
new /obj/item/clothing/under/rank/medical/cmo_bunnysuit(src)
new /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/cmo(src)
new /obj/item/clothing/neck/tie/bunnytie/cmo(src)
/obj/item/storage/bag/garment/engineering_chief/PopulateContents()
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
@@ -153,6 +210,15 @@
new /obj/item/clothing/head/utility/hardhat/welding/white(src)
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
//Duplication from Commdrobe
new /obj/item/clothing/head/beret/engi/ce(src)
new /obj/item/clothing/head/hats/imperial/ce(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial(src)
new /obj/item/clothing/neck/mantle/cemantle(src)
new /obj/item/clothing/head/playbunnyears/ce(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit(src)
new /obj/item/clothing/suit/utility/fire/ce_tailcoat(src)
new /obj/item/clothing/neck/tie/bunnytie/ce(src)
/obj/item/storage/bag/garment/quartermaster/PopulateContents()
new /obj/item/clothing/under/rank/cargo/qm(src)
@@ -165,3 +231,20 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/neck/cloak/qm(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
//Duplication from Comdrobe
new /obj/item/clothing/head/beret/cargo/qm(src)
new /obj/item/clothing/head/beret/cargo/qm/alt(src)
new /obj/item/clothing/neck/mantle/qm(src)
new /obj/item/clothing/under/rank/cargo/qm/skyrat/gorka(src)
new /obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck(src)
new /obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck/skirt(src)
new /obj/item/clothing/suit/brownfurrich(src)
new /obj/item/clothing/under/rank/cargo/qm/skyrat/casual(src)
new /obj/item/clothing/suit/toggle/jacket/supply/head(src)
new /obj/item/clothing/under/rank/cargo/qm/skyrat/formal(src)
new /obj/item/clothing/under/rank/cargo/qm/skyrat/formal/skirt(src)
new /obj/item/clothing/head/playbunnyears/quartermaster(src)
new /obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit(src)
new /obj/item/clothing/suit/jacket/tailcoat/quartermaster(src)
new /obj/item/clothing/neck/tie/bunnytie/cargo(src)