diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index fbd0ca3d63b..3d635ab0dec 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1804,15 +1804,19 @@ ads_list = list("Beat perps in style!", "It's red so you can't see the blood!", "You have the right to be fashionable!", "Now you can be the fashion police you always wanted to be!") vend_reply = "Thank you for using the SecDrobe!" products = list(/obj/item/clothing/under/rank/security/corp = 4, + /obj/item/clothing/under/rank/security/skirt/corp = 4, /obj/item/clothing/under/rank/dispatch = 4, /obj/item/clothing/under/rank/security/skirt = 4, /obj/item/clothing/under/rank/security = 4, /obj/item/clothing/under/rank/security2 = 4, /obj/item/clothing/under/rank/security/formal = 4, + /obj/item/clothing/under/rank/security/fancy = 4, + /obj/item/clothing/under/rank/security/skirt/fancy = 4, /obj/item/clothing/head/soft/sec/corp = 4, /obj/item/clothing/head/officer = 4, /obj/item/clothing/head/beret/sec = 4, /obj/item/clothing/head/soft/sec = 4, + /obj/item/clothing/head/drillsgt = 4, /obj/item/clothing/mask/bandana/red = 4, /obj/item/clothing/suit/jacket/secbomber = 2, /obj/item/clothing/suit/armor/secjacket = 4, 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 57d451dc751..7e66358b45f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -93,6 +93,7 @@ new /obj/item/clothing/under/rank/head_of_security/formal(src) new /obj/item/clothing/under/rank/head_of_security/corp(src) new /obj/item/clothing/under/rank/head_of_security/skirt(src) + new /obj/item/clothing/under/rank/head_of_security/skirt/corp(src) new /obj/item/clothing/suit/armor/hos(src) new /obj/item/clothing/suit/armor/hos/alt(src) new /obj/item/clothing/head/HoS(src) @@ -132,6 +133,7 @@ new /obj/item/clothing/under/rank/warden/formal(src) new /obj/item/clothing/under/rank/warden/corp(src) new /obj/item/clothing/under/rank/warden/skirt(src) + new /obj/item/clothing/under/rank/warden/skirt/corp(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/holosign_creator/security(src) new /obj/item/clothing/mask/gas/sechailer/warden(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index a3173df3af4..7b2947125ea 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -130,6 +130,14 @@ armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 50) strip_delay = 60 +/obj/item/clothing/head/drillsgt + name = "security campaign hat" + desc = "A wide-brimmed hat inspired by drill instructors, or when paired with red Security clothing, the Canadian Mounties of Terra." + icon_state = "drillsgthat" + item_state = "drillsgthat" + armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 50) + strip_delay = 60 + /obj/item/clothing/head/beret/sec name = "security beret" desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 2bfb647c287..022700ced07 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -25,6 +25,11 @@ item_state = "r_suit" item_color = "wardenf" +/obj/item/clothing/under/rank/warden/skirt/corp + icon_state = "wardenblackf" + item_state = "wardenblackf" + item_color = "wardenblackf" + /obj/item/clothing/under/rank/security name = "security officer's jumpsuit" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." @@ -45,6 +50,26 @@ item_state = "r_suit" item_color = "secredf" +/obj/item/clothing/under/rank/security/skirt/corp + name = "corporate security jumpskirt" + icon_state = "secblackf" + item_state = "secblackf" + item_color = "secblackf" + +/obj/item/clothing/under/rank/security/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" + +/obj/item/clothing/under/rank/security/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" + /obj/item/clothing/under/rank/dispatch name = "dispatcher's uniform" desc = "A dress shirt and khakis with a security patch sewn on." @@ -112,6 +137,11 @@ item_state = "hos_corporate" item_color = "hos_corporate" +/obj/item/clothing/under/rank/head_of_security/skirt/corp + icon_state = "hosblackf" + item_state = "hosblackf" + item_color = "hosblackf" + //Jensen cosplay gear /obj/item/clothing/under/rank/head_of_security/jensen name = "head of security's jumpsuit" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 60b664f7596..c459231e1c1 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi index 94e625f1bf0..78a0a521406 100644 Binary files a/icons/mob/clothing/species/drask/uniform.dmi and b/icons/mob/clothing/species/drask/uniform.dmi differ diff --git a/icons/mob/clothing/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi index 7a74f930598..4c02d50975e 100644 Binary files a/icons/mob/clothing/species/grey/uniform.dmi and b/icons/mob/clothing/species/grey/uniform.dmi differ diff --git a/icons/mob/clothing/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi index 6dce6d799a4..48fbf6926dc 100644 Binary files a/icons/mob/clothing/species/vox/uniform.dmi and b/icons/mob/clothing/species/vox/uniform.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index cef475c79bc..311a5e3662f 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index c1228bee4c3..1108cfc5940 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index b06cabcda68..a417415278c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ