diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 9fb43f65669..a94a6ef1d5e 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -454,7 +454,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001) clothes_s = new /icon('icons/mob/clothing/under/captain.dmi', "captain_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Head of Security") - clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "hosred_s") + clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "hos_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Warden") clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "warden_s") @@ -464,7 +464,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001) clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY) if("Security Officer") - clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "secred_s") + clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "security_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Chief Engineer") clothes_s = new /icon('icons/mob/clothing/under/engineering.dmi', "chief_s") diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index bb6829aad4c..e5acae7ba86 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1314,7 +1314,7 @@ if(4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_HOS) - clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "hosred_s") + clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "hos_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY) has_gloves = TRUE @@ -1359,7 +1359,7 @@ if(4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_OFFICER) - clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "secred_s") + clothes_s = new /icon('icons/mob/clothing/under/security.dmi', "security_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if(prob(1)) clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_officer"), ICON_OVERLAY) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index a494f577213..a01a84cd3d9 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -20,21 +20,21 @@ /obj/item/clothing/under/rank/security/warden/skirt name = "warden's jumpskirt" desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders." - icon_state = "wardenf" + icon_state = "warden_skirt" item_state = "r_suit" - item_color = "wardenf" + item_color = "warden_skirt" /obj/item/clothing/under/rank/security/warden/skirt/corporate - icon_state = "wardenblackf" - item_state = "wardenblackf" - item_color = "wardenblackf" + icon_state = "warden_corporate_skirt" + item_state = "warden_corporate_skirt" + item_color = "warden_corporate_skirt" /obj/item/clothing/under/rank/security/officer name = "security officer's jumpsuit" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." icon_state = "security" item_state = "r_suit" - item_color = "secred" + item_color = "security" /obj/item/clothing/under/rank/security/officer/sensor sensor_mode = SENSOR_COORDS @@ -43,28 +43,29 @@ /obj/item/clothing/under/rank/security/officer/skirt name = "security officer's jumpskirt" desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts." - icon_state = "secredf" + icon_state = "security_skirt" item_state = "r_suit" - item_color = "secredf" + item_color = "security_skirt" /obj/item/clothing/under/rank/security/officer/skirt/corporate name = "corporate security jumpskirt" - icon_state = "secblackf" - item_state = "secblackf" - item_color = "secblackf" + icon_state = "sec_corporate_skirt" + item_state = "sec_corporate_skirt" + item_color = "sec_corporate_skirt" /obj/item/clothing/under/rank/security/officer/fancy name = "security dress shirt" desc = "A red dress shirt paired with a pair of black trousers, for the more formal Security Officer." - icon_state = "secshirt" - item_state = "secshirt" - item_color = "secshirt" + icon_state = "sec_shirt" + item_state = "sec_shirt" + item_color = "sec_shirt" + /obj/item/clothing/under/rank/security/officer/skirt/fancy name = "security dress skirt" desc = "A red blouse paired with a black skirt, for the more formal Security Officer." - icon_state = "secshirtf" - item_state = "secshirtf" - item_color = "secshirtf" + icon_state = "sec_shirt_skirt" + item_state = "sec_shirt_skirt" + item_color = "sec_shirt_skirt" /obj/item/clothing/under/rank/security/officer/dispatch name = "dispatcher's uniform" @@ -76,9 +77,9 @@ /obj/item/clothing/under/rank/security/officer/uniform name = "security officer's uniform" desc = "It's made of a slightly sturdier material, to allow for robust protection." - icon_state = "redshirt2" + icon_state = "redshirt" //pants, actually item_state = "r_suit" - item_color = "redshirt2" + item_color = "redshirt" /obj/item/clothing/under/rank/security/officer/corporate name = "corporate security jumpsuit" @@ -109,16 +110,16 @@ desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." icon_state = "hos" item_state = "r_suit" - item_color = "hosred" + item_color = "hos" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) strip_delay = 60 /obj/item/clothing/under/rank/security/head_of_security/skirt name = "head of security's jumpskirt" desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." - icon_state = "hosredf" + icon_state = "hos_skirt" item_state = "r_suit" - item_color = "hosredf" + item_color = "hos_skirt" /obj/item/clothing/under/rank/security/head_of_security/corporate icon_state = "hos_corporate" @@ -126,16 +127,16 @@ item_color = "hos_corporate" /obj/item/clothing/under/rank/security/head_of_security/skirt/corporate - icon_state = "hosblackf" - item_state = "hosblackf" - item_color = "hosblackf" + icon_state = "hos_corporate_skirt" + item_state = "hos_corporate_skirt" + item_color = "hos_corporate_skirt" /obj/item/clothing/under/rank/security/formal name = "security suit" desc = "A formal security suit for officers complete with nanotrasen belt buckle." - icon_state = "security_formal" + icon_state = "sec_formal" item_state = "gy_suit" - item_color = "security_formal" + item_color = "sec_formal" /obj/item/clothing/under/rank/security/formal/warden name = "warden's suit" diff --git a/icons/mob/clothing/species/drask/under/security.dmi b/icons/mob/clothing/species/drask/under/security.dmi index be31f33f801..706af17fc26 100644 Binary files a/icons/mob/clothing/species/drask/under/security.dmi and b/icons/mob/clothing/species/drask/under/security.dmi differ diff --git a/icons/mob/clothing/species/grey/under/security.dmi b/icons/mob/clothing/species/grey/under/security.dmi index 0b93f7b080e..6a2d9e4448b 100644 Binary files a/icons/mob/clothing/species/grey/under/security.dmi and b/icons/mob/clothing/species/grey/under/security.dmi differ diff --git a/icons/mob/clothing/species/vox/under/security.dmi b/icons/mob/clothing/species/vox/under/security.dmi index 49b8e7d957c..ca9f21ccf2d 100644 Binary files a/icons/mob/clothing/species/vox/under/security.dmi and b/icons/mob/clothing/species/vox/under/security.dmi differ diff --git a/icons/mob/clothing/under/security.dmi b/icons/mob/clothing/under/security.dmi index df5859aea59..da1b0deff94 100644 Binary files a/icons/mob/clothing/under/security.dmi and b/icons/mob/clothing/under/security.dmi differ diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi index b8a9eebed44..bab6669ae12 100644 Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ