mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 00:27:31 +01:00
muchatras
74a3fa6d03
## About The Pull Request This PR is basically an hos outfit cleanup: - It fixes the viro sec helmet and the hos sec helmet from not being able to carry a flashlight, it also put the hos helmet to the same armor level as all other head garbs - It removes all of the duplicates from the hos outfit bag - It fixes stray pixels from the viro hos uniform - It fixes a missing icon from the softshell coat - It removes one of the viro hos trenchcoat which I couldn't find the worn icon anywhere (currently invisible ingame) - Re-add the hos plate carrier that was forgotten in the code and the security viro helmet in the sec vendor - Migrates all of the hos custom garment from the TG code into the Bubber module ## Why It's Good For The Game The hos outfit bag had 9 duplicated items Before: <img width="473" height="538" alt="image" src="https://github.com/user-attachments/assets/8fffe8e1-8267-4300-b27e-c7adb3591821" /> After: <img width="470" height="467" alt="Screenshot 2026-06-24 183746" src="https://github.com/user-attachments/assets/b326f63d-b998-40fc-baae-ed046823fb86" /> The removed coat was identical to another one that is working, but had a red pixel on one of the arm. I'll eventually try to find the missing icon Everything that was there is still there The plate carrier is cool and awesome and is my prized jewel that I didn't create myself Bugs bad ## Proof Of Testing The plate, the helmet with flashlight, the uniform with no more stray pixel floating <img width="83" height="74" alt="Screenshot 2026-06-24 185003" src="https://github.com/user-attachments/assets/4048f68d-cf3e-47a8-bae1-17d2f7f0efe4" /> ## Changelog 🆑 add: Re-added the hos plate carrier and sec helmets from viro (in vendor) fix: Fixed certain missing/broken icons from sec outfits fix: Fixed the viro sec helmets fix: Removed all the duplicates from the hos outfit bag /🆑
224 lines
11 KiB
Plaintext
224 lines
11 KiB
Plaintext
/obj/item/storage/bag/garment
|
|
name = "garment bag"
|
|
icon = 'icons/obj/storage/storage.dmi'
|
|
icon_state = "garment_bag"
|
|
desc = "A bag for storing extra clothes and shoes."
|
|
slot_flags = NONE
|
|
resistance_flags = FLAMMABLE
|
|
storage_type = /datum/storage/bag/garment
|
|
|
|
/obj/item/storage/bag/garment/captain
|
|
name = "captain's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the captain."
|
|
|
|
/obj/item/storage/bag/garment/hos
|
|
name = "head of security's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the head of security."
|
|
|
|
/obj/item/storage/bag/garment/warden
|
|
name = "warden's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the warden."
|
|
|
|
/obj/item/storage/bag/garment/hop
|
|
name = "head of personnel's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the head of personnel."
|
|
|
|
/obj/item/storage/bag/garment/research_director
|
|
name = "research director's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the research director."
|
|
|
|
/obj/item/storage/bag/garment/chief_medical
|
|
name = "chief medical officer's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the chief medical officer."
|
|
|
|
/obj/item/storage/bag/garment/engineering_chief
|
|
name = "chief engineer's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the chief engineer."
|
|
|
|
/obj/item/storage/bag/garment/quartermaster
|
|
name = "quartermasters's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster."
|
|
|
|
/obj/item/storage/bag/garment/paramedic
|
|
name = "EMT's garment bag"
|
|
desc = "A bag for storing extra clothes and shoes. This one belongs to the emergency medical team."
|
|
|
|
/obj/item/storage/bag/garment/captain/PopulateContents()
|
|
new /obj/item/clothing/under/rank/captain(src)
|
|
new /obj/item/clothing/under/rank/captain/skirt(src)
|
|
new /obj/item/clothing/under/rank/captain/parade(src)
|
|
new /obj/item/clothing/under/rank/captain/royal(src)
|
|
new /obj/item/clothing/suit/armor/vest/capcarapace(src)
|
|
new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src)
|
|
new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
|
|
new /obj/item/clothing/suit/jacket/capjacket(src)
|
|
new /obj/item/clothing/glasses/sunglasses/gar/giga(src)
|
|
new /obj/item/clothing/gloves/captain(src)
|
|
new /obj/item/clothing/head/costume/crown/fancy(src)
|
|
new /obj/item/clothing/head/hats/caphat(src)
|
|
new /obj/item/clothing/head/hats/caphat/parade(src)
|
|
new /obj/item/clothing/head/hats/caphat/bicorne(src)
|
|
new /obj/item/clothing/neck/cloak/cap(src)
|
|
new /obj/item/clothing/shoes/laceup(src)
|
|
new /obj/item/storage/backpack/captain(src)
|
|
new /obj/item/storage/backpack/satchel/cap(src)
|
|
new /obj/item/storage/backpack/duffelbag/captain(src)
|
|
new /obj/item/storage/backpack/messenger/cap(src)
|
|
|
|
/obj/item/storage/bag/garment/hop/PopulateContents()
|
|
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
|
|
new /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt(src)
|
|
new /obj/item/clothing/suit/armor/vest/hop(src)
|
|
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
|
|
//new /obj/item/clothing/glasses/sunglasses(src) //BUBBER REMOVAL - They get civhuds by override in modular file
|
|
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/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/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)
|
|
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)
|
|
new /obj/item/clothing/under/rank/security/head_of_security/grey(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/gloves/tackler/combat(src)
|
|
new /obj/item/clothing/suit/armor/hos(src)
|
|
new /obj/item/clothing/suit/armor/hos/hos_formal(src)
|
|
new /obj/item/clothing/suit/armor/hos/trenchcoat/winter(src)
|
|
new /obj/item/clothing/suit/armor/vest/leather(src)
|
|
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
|
|
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga(src)
|
|
new /obj/item/clothing/head/hats/hos/beret(src)
|
|
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)
|
|
|
|
/obj/item/storage/bag/garment/warden/PopulateContents()
|
|
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)
|
|
new /obj/item/clothing/head/hats/warden/red(src)
|
|
new /obj/item/clothing/head/beret/sec/navywarden(src)
|
|
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
|
|
new /obj/item/clothing/under/rank/security/warden/formal(src)
|
|
new /obj/item/clothing/suit/jacket/warden/blue(src) //SKYRAT ADDITION - FORMAL COAT
|
|
new /obj/item/clothing/under/rank/security/warden/skirt(src)
|
|
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)
|
|
new /obj/item/clothing/under/rank/rnd/research_director/skirt(src)
|
|
new /obj/item/clothing/under/rank/rnd/research_director/alt(src)
|
|
new /obj/item/clothing/under/rank/rnd/research_director/alt/skirt(src)
|
|
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck(src)
|
|
new /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt(src)
|
|
new /obj/item/clothing/suit/toggle/labcoat/skyrat/rd(src) //SKYRAT EDIT ADDITION
|
|
new /obj/item/clothing/suit/hooded/wintercoat/science/rd(src)
|
|
new /obj/item/clothing/head/beret/science/rd(src)
|
|
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/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/toggle/labcoat/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)
|
|
new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src)
|
|
new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs(src)
|
|
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck(src)
|
|
new /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/skirt(src)
|
|
new /obj/item/clothing/suit/hooded/wintercoat/medical/cmo(src)
|
|
new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
|
|
new /obj/item/clothing/gloves/latex/nitrile(src)
|
|
new /obj/item/clothing/head/beret/medical/cmo(src)
|
|
new /obj/item/clothing/head/utility/surgerycap/cmo(src)
|
|
new /obj/item/clothing/neck/cloak/cmo(src)
|
|
new /obj/item/clothing/shoes/sneakers/white(src)
|
|
new /obj/item/storage/backpack/chief_medic(src)
|
|
new /obj/item/storage/backpack/satchel/chief_medic(src)
|
|
new /obj/item/storage/backpack/duffelbag/chief_medic(src)
|
|
new /obj/item/storage/backpack/messenger/chief_medic(src)
|
|
//Duplication from Commdrobe
|
|
new /obj/item/clothing/head/beret/medical/cmo/alt(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/cmo/doctor_tailcoat(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)
|
|
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
|
|
new /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck(src)
|
|
new /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt(src)
|
|
new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src)
|
|
new /obj/item/clothing/glasses/meson/engine(src)
|
|
new /obj/item/clothing/gloves/chief_engineer(src)
|
|
new /obj/item/clothing/head/utility/hardhat/white(src)
|
|
new /obj/item/clothing/head/utility/hardhat/welding/white(src)
|
|
new /obj/item/clothing/neck/cloak/ce(src)
|
|
new /obj/item/clothing/shoes/workboots(src)
|
|
|
|
/obj/item/storage/bag/garment/quartermaster/PopulateContents()
|
|
new /obj/item/clothing/under/rank/cargo/qm(src)
|
|
new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
|
|
new /obj/item/clothing/suit/hooded/wintercoat/cargo/qm(src)
|
|
new /obj/item/clothing/suit/utility/fire/firefighter(src)
|
|
new /obj/item/clothing/gloves/fingerless(src)
|
|
new /obj/item/clothing/suit/jacket/quartermaster(src)
|
|
new /obj/item/clothing/head/soft(src)
|
|
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)
|
|
|
|
|
|
/obj/item/storage/bag/garment/paramedic/PopulateContents()
|
|
new /obj/item/clothing/under/rank/medical/paramedic(src)
|
|
new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
|
|
new /obj/item/clothing/gloves/latex/nitrile(src)
|
|
new /obj/item/clothing/shoes/workboots/black(src)
|
|
new /obj/item/clothing/glasses/hud/health(src)
|