diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 8d50cc113ac..f2d8979bfdd 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -18,7 +18,7 @@ new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/head/caphat(src) new /obj/item/clothing/under/rank/captain/parade(src) - new /obj/item/clothing/under/rank/captain/parade/female(src) //SKYRAT EDIT ADD + new /obj/item/clothing/suit/armor/captain/parade/female(src) //SKYRAT EDIT ADD new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src) new /obj/item/clothing/head/caphat/parade(src) new /obj/item/clothing/suit/captunic(src) @@ -76,7 +76,7 @@ new /obj/item/clothing/neck/cloak/hos(src) new /obj/item/cartridge/hos(src) new /obj/item/radio/headset/heads/hos(src) - new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src) + new /obj/item/clothing/suit/armor/hos/parade/female(src) // SKYRAT EDIT CHANGE - ORIGINAL: new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src) new /obj/item/clothing/under/rank/security/head_of_security/parade(src) new /obj/item/clothing/suit/armor/hos/parade(src) // SKYRAT EDIT ADDITION new /obj/item/clothing/suit/armor/vest/leather(src) diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi index 235c8edcb20..f5735b0cd56 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/under/captain.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/under/captain.dmi deleted file mode 100644 index 5ecedd1d7c4..00000000000 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/under/captain.dmi and /dev/null differ diff --git a/modular_skyrat/modules/customization/icons/mob/clothing/under/security.dmi b/modular_skyrat/modules/customization/icons/mob/clothing/under/security.dmi index 8d38aa9e981..173fa7382ad 100644 Binary files a/modular_skyrat/modules/customization/icons/mob/clothing/under/security.dmi and b/modular_skyrat/modules/customization/icons/mob/clothing/under/security.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi index cf13282551c..4cdb9c7a552 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/under/captain.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/under/captain.dmi deleted file mode 100644 index 66d224a47ed..00000000000 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/under/captain.dmi and /dev/null differ diff --git a/modular_skyrat/modules/customization/icons/obj/clothing/under/security.dmi b/modular_skyrat/modules/customization/icons/obj/clothing/under/security.dmi index 604b74638e5..0a14857adf3 100644 Binary files a/modular_skyrat/modules/customization/icons/obj/clothing/under/security.dmi and b/modular_skyrat/modules/customization/icons/obj/clothing/under/security.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm b/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm index fed7befd8b9..91337a1531b 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/armor.dm @@ -1,3 +1,7 @@ +// MODULAR ARMOUR + +// SECURITY OFFICER + /obj/item/clothing/suit/armor/navyblue icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' @@ -6,6 +10,8 @@ icon_state = "officerbluejacket" body_parts_covered = CHEST|ARMS +// HEAD OF SECURITY + /obj/item/clothing/suit/armor/hos/navyblue icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' @@ -16,6 +22,16 @@ cold_protection = CHEST|ARMS heat_protection = CHEST|ARMS +/obj/item/clothing/suit/armor/hos/parade/female + name = "head of security's female parade jacket" + desc = "A luxurious jacket for the head of security, woven in a deep red. This one comes with white trousers. On the lapel is a small pin in the shape of a deer's head." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + icon_state = "hos_parade_fem" + inhand_icon_state = "hos_parade_fem" + +// WARDEN + /obj/item/clothing/suit/armor/vest/warden/navyblue icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' @@ -23,3 +39,13 @@ desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." icon_state = "wardenbluejacket" body_parts_covered = CHEST|ARMS + +// CAPTAIN + +/obj/item/clothing/suit/armor/captain/parade/female + name = "captain's female parade jacket" + desc = "A captain's luxury-wear, for special occasions." + icon = 'modular_skyrat/modules/customization/icons/obj/clothing/suits.dmi' + worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/suit.dmi' + icon_state = "cap_parade_fem" + inhand_icon_state = "by_suit" diff --git a/modular_skyrat/modules/customization/modules/clothing/under/captain.dm b/modular_skyrat/modules/customization/modules/clothing/under/captain.dm deleted file mode 100644 index 49fdf2fa439..00000000000 --- a/modular_skyrat/modules/customization/modules/clothing/under/captain.dm +++ /dev/null @@ -1,10 +0,0 @@ -// CAPTAIN'S MODULAR CLOTHING - -/obj/item/clothing/under/rank/captain/parade/female - name = "captain's female parade uniform" - desc = "A captain's luxury-wear, for special occasions." - icon = 'modular_skyrat/modules/customization/icons/obj/clothing/under/captain.dmi' - worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/under/captain.dmi' - icon_state = "cap_parade_fem" - inhand_icon_state = "by_suit" - can_adjust = FALSE diff --git a/modular_skyrat/modules/customization/modules/clothing/under/security.dm b/modular_skyrat/modules/customization/modules/clothing/under/security.dm index c40e4746c9b..185a7b18e98 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/security.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/security.dm @@ -11,15 +11,6 @@ inhand_icon_state = "hos_parade_male" can_adjust = FALSE -/obj/item/clothing/under/rank/security/head_of_security/parade/female - name = "head of security's female parade uniform" - desc = "A luxurious uniform for the head of security, woven in a deep red. This one comes with white trousers. On the lapel is a small pin in the shape of a deer's head." - icon = 'modular_skyrat/modules/customization/icons/obj/clothing/under/security.dmi' - worn_icon = 'modular_skyrat/modules/customization/icons/mob/clothing/under/security.dmi' - icon_state = "hos_parade_fem" - inhand_icon_state = "hos_parade_fem" - can_adjust = FALSE - /obj/item/clothing/suit/armor/hos/parade name = "head of security's parade jacket" desc = "A luxurious deep red jacket for the head of security, woven with a golden trim. It smells of gunpowder and authority." diff --git a/tgstation.dme b/tgstation.dme index 624af3ca27c..eec81a74bc7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3639,7 +3639,6 @@ #include "modular_skyrat\modules\customization\modules\clothing\suits\coats.dm" #include "modular_skyrat\modules\customization\modules\clothing\suits\hardsuit_tailsprites.dm" #include "modular_skyrat\modules\customization\modules\clothing\suits\misc.dm" -#include "modular_skyrat\modules\customization\modules\clothing\under\captain.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\costumes.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\misc.dm" #include "modular_skyrat\modules\customization\modules\clothing\under\pants.dm"