diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index d5c139fdb1e..3f93c550757 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -36,7 +36,9 @@ /obj/item/storage/backpack/satchel_sec = 2, /obj/item/clothing/gloves/color/black = 4, /obj/item/clothing/accessory/armband/sec = 6) - contraband = list(/obj/item/toy/figure/crew/hos = 1, + contraband = list(/obj/item/clothing/head/helmet/street_judge = 1, + /obj/item/clothing/suit/armor/vest/street_judge = 1, + /obj/item/toy/figure/crew/hos = 1, /obj/item/toy/figure/crew/secofficer = 1) prices = list(/obj/item/clothing/under/rank/security/officer/corporate = 50, @@ -62,6 +64,8 @@ /obj/item/clothing/shoes/jackboots = 20, /obj/item/clothing/shoes/jackboots/jacksandals = 20, /obj/item/clothing/shoes/laceup = 30, + /obj/item/clothing/head/helmet/street_judge = 75, + /obj/item/clothing/suit/armor/vest/street_judge = 100, /obj/item/storage/backpack/duffel/security = 50, /obj/item/storage/backpack/security = 50, /obj/item/storage/backpack/satchel_sec = 50, diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index ff42ff5fb8a..8d65e76743d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -263,6 +263,11 @@ armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 10, BIO = 0, RAD = 0, FIRE = 35, ACID = 50) strip_delay = 60 +/obj/item/clothing/head/helmet/street_judge + name = "judge's helmet" + desc = "Commonly used security headgear for the more theatrically inclined. Wear this in hostage situations to make everything worse." + icon_state = "streetjudge_hat" + //Commander /obj/item/clothing/head/helmet/ert/command name = "emergency response team commander helmet" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d7adae07f3e..6958b3bb7ca 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -80,6 +80,11 @@ return ..() +/obj/item/clothing/suit/armor/vest/street_judge + name = "judge's security armor" + desc = "Perfect for when you're looking to send a message rather than performing your actual duties." + icon_state = "streetjudgearmor" + /obj/item/clothing/suit/armor/vest/blueshield name = "blueshield's security armor" desc = "An armored vest with the badge of a Blueshield Lieutenant." diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 0eb0ce17661..47857eaf113 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/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi index c932396e249..31db7dbf58e 100644 Binary files a/icons/mob/clothing/species/drask/helmet.dmi and b/icons/mob/clothing/species/drask/helmet.dmi differ diff --git a/icons/mob/clothing/species/grey/helmet.dmi b/icons/mob/clothing/species/grey/helmet.dmi index 9890215b77f..22c0f25b2f3 100644 Binary files a/icons/mob/clothing/species/grey/helmet.dmi and b/icons/mob/clothing/species/grey/helmet.dmi differ diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi index 49ae5415e26..6f1d324a700 100644 Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 6cae59db2a9..4ec1cc172f4 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 9e33b33f17d..300a2ae85f4 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 48defd2abf7..a3f4825d257 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index bb09604b90a..40f6272a4c3 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ