diff --git a/modular_zubbers/code/game/objects/items/storage/garment.dm b/modular_zubbers/code/game/objects/items/storage/garment.dm index 97e8703ec00..d823d9d970a 100644 --- a/modular_zubbers/code/game/objects/items/storage/garment.dm +++ b/modular_zubbers/code/game/objects/items/storage/garment.dm @@ -19,6 +19,10 @@ 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/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) /obj/item/storage/bag/garment/warden/PopulateContents() . = ..() @@ -29,6 +33,13 @@ new /obj/item/clothing/suit/armor/vest/viro/warden/wintercoat(src) new /obj/item/clothing/suit/armor/vest/viro/warden/alt(src) new /obj/item/clothing/suit/armor/vest/viro/warden(src) + new /obj/item/clothing/under/rank/security/warden/battledress/red(src) + new /obj/item/clothing/under/rank/security/warden/turtleneck/red(src) + new /obj/item/clothing/under/rank/security/warden/turtleneck/red/skirt(src) + new /obj/item/clothing/under/rank/security/warden/suit/red(src) + + + diff --git a/modular_zubbers/code/modules/clothing/under/security.dm b/modular_zubbers/code/modules/clothing/under/security.dm index b1217daaad9..9613ad0e6bc 100644 --- a/modular_zubbers/code/modules/clothing/under/security.dm +++ b/modular_zubbers/code/modules/clothing/under/security.dm @@ -237,6 +237,8 @@ inhand_icon_state = null alt_covers_chest = TRUE +// Red versions of classic bluesec gear + /obj/item/clothing/under/rank/security/viro/head_of_security/formal/skirt desc = "The insignia on this uniform tells you that this uniform belongs to the Head of Security." name = "head of security's formal uniform skirt" @@ -246,3 +248,154 @@ dying_key = DYE_REGISTRY_JUMPSKIRT female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/rank/security/officer/suit/red + name = "security officer's suit" + desc = "A sleek, formal three-piece suit with a red suit jacket dawned with security insignia, not guaranteed to be good to run in!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "security_suit" + inhand_icon_state = "r_suit" + can_adjust = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/officer/suit/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/warden/suit/red + name = "warden's suit" + desc = "A sleek, formal three-piece suit with a red suit jacket dawned with security insignia, not guaranteed to be good to run in!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "warden_suit" + inhand_icon_state = "r_suit" + can_adjust = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/warden/suit/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/head_of_security/suit/red + name = "head of security's suit" + desc = "A sleek, formal three-piece suit with a red suit jacket dawned with security insignia, not guaranteed to be good to run in!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "hos_suit" + inhand_icon_state = "r_suit" + can_adjust = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/head_of_security/suit/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/officer/turtleneck/red + name = "security turtleneck" + desc = " comfortable turtleneck in the classic security red, dawned with security insignia. Paired with black cargo pants to look tactical!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "turtleneck" + inhand_icon_state = "r_suit" + can_adjust = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/officer/turtleneck/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/officer/turtleneck/red/skirt + name = "security turtleneck skirt" + desc = "A comfortable turtleneck in the classic security red, dawned with security insignia. Paired with a black skirt to look tactical!" + icon_state = "turtleneck_skirt" + +/obj/item/clothing/under/rank/security/warden/turtleneck/red + name = "security turtleneck" + desc = " comfortable turtleneck in the classic security red, dawned with security insignia. Paired with black cargo pants to look tactical!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "turtleneck_warden" + inhand_icon_state = "r_suit" + can_adjust = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/warden/turtleneck/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/warden/turtleneck/red/skirt + name = "warden's turtleneck skirt" + desc = "A comfortable turtleneck in the classic security red, dawned with security insignia. Paired with a black skirt to look tactical!" + icon_state = "turtleneck_warden_skirt" + +/obj/item/clothing/under/rank/security/head_of_security/turtleneck/red + name = "head of security's turtleneck" + desc = "A comfortable turtleneck in the classic security red, dawned with security insignia. Paired with black cargo pants to look tactical!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "turtleneck_hos" + inhand_icon_state = "r_suit" + can_adjust = TRUE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION + +/obj/item/clothing/under/rank/security/head_of_security/turtleneck/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/head_of_security/turtleneck/red/skirt + name = "head of security's turtleneck skirt" + desc = "A comfortable turtleneck in the classic security red, dawned with security insignia. Paired with a black skirt to look tactical!" + icon_state = "turtleneck_hos_skirt" + +/obj/item/clothing/under/rank/security/warden/battledress/red + name = "warden's battle dress" + desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt. This version is specifically designed for the warden!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "battledress_warden" + can_adjust = TRUE + alt_covers_chest = FALSE + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + +/obj/item/clothing/under/rank/security/warden/battledress/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) + +/obj/item/clothing/under/rank/security/head_of_security/battledress/red + name = "head of security's battle dress" + desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt. This version is specifically designed for the head of security!" + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/security_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + icon_state = "battledress_hos" + can_adjust = TRUE + alt_covers_chest = FALSE + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + +/obj/item/clothing/under/rank/security/head_of_security/battledress/red/Initialize(mapload) + . = ..() + var/list/reskin_components = GetComponents(/datum/component/reskinable_item) + for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components) + qdel(reskin_component) diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm index f3ce1637ee7..e142eb427f6 100644 --- a/modular_zubbers/code/modules/vending/comdrobe.dm +++ b/modular_zubbers/code/modules/vending/comdrobe.dm @@ -216,6 +216,10 @@ /obj/item/clothing/suit/armor/hos/viro/trenchcoat = 1, /obj/item/clothing/suit/armor/hos/viro = 1, /obj/item/clothing/head/helmet/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, + /obj/item/clothing/under/rank/security/head_of_security/suit/red = 1, ) access_lists["[ACCESS_QM]"] = list( diff --git a/modular_zubbers/code/modules/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm index 67cb91718a2..a83e410a7dd 100644 --- a/modular_zubbers/code/modules/vending/multisec.dm +++ b/modular_zubbers/code/modules/vending/multisec.dm @@ -17,6 +17,9 @@ /obj/item/clothing/under/rank/security/officer/redsec = 6, /obj/item/clothing/under/rank/security/peacekeeper/armadyne = 6, /obj/item/clothing/under/rank/security/camo = 6, + /obj/item/clothing/under/rank/security/officer/turtleneck/red = 6, + /obj/item/clothing/under/rank/security/officer/turtleneck/red/skirt = 6, + /obj/item/clothing/under/rank/security/officer/suit/red = 6, /obj/item/clothing/shoes/jackboots = 6, /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6, /obj/item/clothing/shoes/jackboots/gogo_boots = 6, diff --git a/modular_zubbers/icons/mob/clothing/under/security.dmi b/modular_zubbers/icons/mob/clothing/under/security.dmi index 1e9ece7a113..4be4b12d062 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/security.dmi and b/modular_zubbers/icons/mob/clothing/under/security.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/security_digi.dmi b/modular_zubbers/icons/mob/clothing/under/security_digi.dmi index 749eae35b37..a9a66da3d07 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/security_digi.dmi and b/modular_zubbers/icons/mob/clothing/under/security_digi.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/under/security.dmi b/modular_zubbers/icons/obj/clothing/under/security.dmi index d8be6bedf97..dd2b6a8121c 100644 Binary files a/modular_zubbers/icons/obj/clothing/under/security.dmi and b/modular_zubbers/icons/obj/clothing/under/security.dmi differ