diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 3be99e8d337..cf3e4b7283f 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -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) diff --git a/modular_zubbers/code/game/objects/items/storage/garment.dm b/modular_zubbers/code/game/objects/items/storage/garment.dm index d823d9d970a..32d89fffde4 100644 --- a/modular_zubbers/code/game/objects/items/storage/garment.dm +++ b/modular_zubbers/code/game/objects/items/storage/garment.dm @@ -11,18 +11,30 @@ . = ..() new /obj/item/clothing/under/rank/security/viro/head_of_security/viro(src) new /obj/item/clothing/under/rank/security/viro/head_of_security/skirt(src) - new /obj/item/clothing/under/rank/security/viro/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/viro/head_of_security/formal(src) new /obj/item/clothing/under/rank/security/viro/head_of_security/formal/skirt(src) new /obj/item/clothing/suit/armor/hos/viro/trenchcoat/winter(src) - new /obj/item/clothing/suit/armor/hos/viro/trenchcoat(src) new /obj/item/clothing/suit/armor/hos/viro(src) - new /obj/item/clothing/head/helmet/viro/hos(src) - new /obj/item/clothing/under/rank/security/head_of_security/battledress/red(src) + new /obj/item/clothing/suit/armor/hos/viro/vest(src) + new /obj/item/clothing/head/helmet/sec/viro/hos(src) new /obj/item/clothing/under/rank/security/head_of_security/turtleneck/red(src) new /obj/item/clothing/under/rank/security/head_of_security/turtleneck/red/skirt(src) - new /obj/item/clothing/under/rank/security/head_of_security/suit/red(src) + new /obj/item/clothing/under/rank/security/head_of_security/redsec(src) + new /obj/item/clothing/shoes/jackboots/sec/redsec(src) + new /obj/item/clothing/head/hos_kepi(src) + 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/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/under/rank/security/head_of_security/suit/red(src) + new /obj/item/clothing/head/hats/hos/beret/navyhos(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() . = ..() diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index 3a65e4d98a7..e6630031d09 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -720,17 +720,21 @@ // virosec helmets, sprites by axietheaxolotl -/obj/item/clothing/head/helmet/viro +/obj/item/clothing/head/helmet/sec/viro name = "helmet" desc = "Standard Security gear. Protects the head from impacts." + base_icon_state = "security_helmet" icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "security_helmet" -/obj/item/clothing/head/helmet/viro/hos - name = "helmet" +/obj/item/clothing/head/helmet/sec/viro/hos + name = "head of security's helmet" desc = "Standard Security gear. Protects the head from impacts. This one has a golden stripe." + base_icon_state = "hos_helmet" icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "hos_helmet" + armor_type = /datum/armor/hats_hos + diff --git a/modular_zubbers/code/modules/clothing/suits/armor.dm b/modular_zubbers/code/modules/clothing/suits/armor.dm index a1aa2068a46..fc0c1000d23 100644 --- a/modular_zubbers/code/modules/clothing/suits/armor.dm +++ b/modular_zubbers/code/modules/clothing/suits/armor.dm @@ -194,6 +194,12 @@ heat_protection = CHEST|GROIN|LEGS|ARMS strip_delay = 8 SECONDS +/obj/item/clothing/suit/armor/hos/viro/vest + name = "Head of Security's Plate Carrier" + desc = "A plate carrier enhanced with a special alloy for some extra protection and style for those with a commanding presence." + icon_state = "hos_platecarrier" + inhand_icon_state = "armor" + /datum/armor/armor_hos melee = 30 bullet = 30 diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm index e142eb427f6..52624161594 100644 --- a/modular_zubbers/code/modules/vending/comdrobe.dm +++ b/modular_zubbers/code/modules/vending/comdrobe.dm @@ -214,8 +214,9 @@ /obj/item/clothing/under/rank/security/viro/head_of_security/formal/skirt = 1, /obj/item/clothing/suit/armor/hos/viro/trenchcoat/winter = 1, /obj/item/clothing/suit/armor/hos/viro/trenchcoat = 1, + /obj/item/clothing/suit/armor/hos/viro/vest = 1, /obj/item/clothing/suit/armor/hos/viro = 1, - /obj/item/clothing/head/helmet/viro/hos = 1, + /obj/item/clothing/head/helmet/sec/viro/hos = 1, /obj/item/clothing/under/rank/security/head_of_security/battledress/red = 1, /obj/item/clothing/under/rank/security/head_of_security/turtleneck/red = 1, /obj/item/clothing/under/rank/security/head_of_security/turtleneck/red/skirt = 1, diff --git a/modular_zubbers/code/modules/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm index 9246567b7fb..8d0e193662e 100644 --- a/modular_zubbers/code/modules/vending/multisec.dm +++ b/modular_zubbers/code/modules/vending/multisec.dm @@ -82,6 +82,7 @@ /obj/item/clothing/suit/armor/vest/viro/leatherjacket = 6, /obj/item/clothing/suit/armor/vest/viro/softshell = 6, /obj/item/clothing/head/sec/viro = 6, + /obj/item/clothing/head/helmet/sec/viro = 6, /obj/item/clothing/head/sec/viro/beanie = 6, ), diff --git a/modular_zubbers/icons/mob/clothing/head/hats.dmi b/modular_zubbers/icons/mob/clothing/head/hats.dmi index cb911e5ac9b..1a11e4f0d77 100644 Binary files a/modular_zubbers/icons/mob/clothing/head/hats.dmi and b/modular_zubbers/icons/mob/clothing/head/hats.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/armor.dmi b/modular_zubbers/icons/mob/clothing/suits/armor.dmi index 269388297b4..28c8e7f6cca 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/armor.dmi and b/modular_zubbers/icons/mob/clothing/suits/armor.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/security.dmi b/modular_zubbers/icons/mob/clothing/under/security.dmi index d067248da07..a631f94b346 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/security.dmi and b/modular_zubbers/icons/mob/clothing/under/security.dmi differ