diff --git a/modular_ss220/clothing/code/helmet.dm b/modular_ss220/clothing/code/helmet.dm index 9fc5388a9aa3..3a78ce6b3fae 100644 --- a/modular_ss220/clothing/code/helmet.dm +++ b/modular_ss220/clothing/code/helmet.dm @@ -179,3 +179,77 @@ "Nucleation" = 'modular_ss220/clothing/icons/mob/helmet.dmi', ) armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 50, FIRE = 200, ACID = 115) + +/obj/item/clothing/head/helmet/cop + name = "helmet of civil defend officer" + desc = "Шлем для любителей свежего воздуха. Подними эту банку!" + flags = BLOCKHAIR + flags_inv = HIDEMASK | HIDEEARS | HIDEEYES | HIDEFACE + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + icon = 'modular_ss220/clothing/icons/object/helmet.dmi' + icon_state = "cop0" + item_state = "cop0" + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/helmet.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/helmet.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/species/machine/helmet.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi', + "Nucleation" = 'modular_ss220/clothing/icons/mob/helmet.dmi', + ) + armor = list(MELEE = 10, BULLET = 20, LASER = 10, ENERGY = 15, BOMB = 1, RAD = 0, FIRE = 50, ACID = 50) + actions_types = list(/datum/action/item_action/toggle_helmet_light) + var/on = FALSE + var/brightness_on = 2 + +/obj/item/clothing/head/helmet/cop/attack_self(mob/living/user) + toggle_helmet_light(user) + +/obj/item/clothing/head/helmet/cop/proc/toggle_helmet_light(mob/living/user) + on = !on + if(on) + turn_on(user) + else + turn_off(user) + update_icon(UPDATE_ICON_STATE) + +/obj/item/clothing/head/helmet/cop/update_icon_state() + icon_state = "cop[on]" + item_state = "cop[on]" + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + H.update_inv_head() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtons() + +/obj/item/clothing/head/helmet/cop/proc/turn_on(mob/user) + set_light(brightness_on) + +/obj/item/clothing/head/helmet/cop/proc/turn_off(mob/user) + set_light(0) + +/obj/item/clothing/head/helmet/cop/extinguish_light(force = FALSE) + if(on) + on = FALSE + turn_off() + update_icon(UPDATE_ICON_STATE) + visible_message(span_danger("[src]'s light fades and turns off.")) + +/obj/item/clothing/head/helmet/cop/v2 + icon_state = "cop1" + item_state = "cop1" diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index bc5d8211f484..461307fc9a58 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -437,3 +437,37 @@ lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi' righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi' +/* Security */ +/obj/item/clothing/suit/armor/cop + name = "grey overcoat" + desc = "Не забудьте про шлем любителя свежего воздуха." + icon = 'modular_ss220/clothing/icons/object/suits.dmi' + icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' + icon_state = "armored_coat" + item_state = "armored_coat" + armor = list(MELEE = 25, BULLET = 25, LASER = 15, ENERGY = 5, BOMB = 1, RAD = 0, FIRE = 50, ACID = 50) + body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS + cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS + heat_protection = UPPER_TORSO | LOWER_TORSO | ARMS + sprite_sheets = list( + "Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Ancient Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Diona" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/suits.dmi', + "Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Grey" = 'modular_ss220/clothing/icons/mob/species/grey/suits.dmi', + "Human" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Kidan" = 'modular_ss220/clothing/icons/mob/species/kidan/suits.dmi', + "Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Monkey" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Nian" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Plasmaman" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/suits.dmi', + "Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi', + "Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi', + ) diff --git a/modular_ss220/clothing/icons/mob/helmet.dmi b/modular_ss220/clothing/icons/mob/helmet.dmi index f446553cf564..fc353c303244 100644 Binary files a/modular_ss220/clothing/icons/mob/helmet.dmi and b/modular_ss220/clothing/icons/mob/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/drask/helmet.dmi b/modular_ss220/clothing/icons/mob/species/drask/helmet.dmi index 36b7c7462bee..2cf0134e80fc 100644 Binary files a/modular_ss220/clothing/icons/mob/species/drask/helmet.dmi and b/modular_ss220/clothing/icons/mob/species/drask/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/drask/suits.dmi b/modular_ss220/clothing/icons/mob/species/drask/suits.dmi index 1fdb6b70608c..81a6c26428b0 100644 Binary files a/modular_ss220/clothing/icons/mob/species/drask/suits.dmi and b/modular_ss220/clothing/icons/mob/species/drask/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/grey/helmet.dmi b/modular_ss220/clothing/icons/mob/species/grey/helmet.dmi new file mode 100644 index 000000000000..f53e198b0636 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/grey/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/grey/suits.dmi b/modular_ss220/clothing/icons/mob/species/grey/suits.dmi index 3f62407fd4d2..0ad29d5e444b 100644 Binary files a/modular_ss220/clothing/icons/mob/species/grey/suits.dmi and b/modular_ss220/clothing/icons/mob/species/grey/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi b/modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi index be0f897a88dc..6f3a8fa91a59 100644 Binary files a/modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi and b/modular_ss220/clothing/icons/mob/species/kidan/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi b/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi index 1f95f6438931..42a3c5744e6f 100644 Binary files a/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi and b/modular_ss220/clothing/icons/mob/species/kidan/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/machine/helmet.dmi b/modular_ss220/clothing/icons/mob/species/machine/helmet.dmi new file mode 100644 index 000000000000..e47fdbb72df0 Binary files /dev/null and b/modular_ss220/clothing/icons/mob/species/machine/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi b/modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi index 31865926b986..10497b79169c 100644 Binary files a/modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi and b/modular_ss220/clothing/icons/mob/species/tajaran/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi b/modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi index 34ca762e9dc8..ce073de0db94 100644 Binary files a/modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi and b/modular_ss220/clothing/icons/mob/species/unathi/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/helmet.dmi b/modular_ss220/clothing/icons/mob/species/vox/helmet.dmi index 9bd035a6efbb..c71bdb6cdb83 100644 Binary files a/modular_ss220/clothing/icons/mob/species/vox/helmet.dmi and b/modular_ss220/clothing/icons/mob/species/vox/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/suits.dmi b/modular_ss220/clothing/icons/mob/species/vox/suits.dmi index c1b4423ee12e..82285790156c 100644 Binary files a/modular_ss220/clothing/icons/mob/species/vox/suits.dmi and b/modular_ss220/clothing/icons/mob/species/vox/suits.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi b/modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi index 736081458282..72ffbfb18134 100644 Binary files a/modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi and b/modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/mob/suits.dmi b/modular_ss220/clothing/icons/mob/suits.dmi index 1fdf65d327a2..1574a5bec556 100644 Binary files a/modular_ss220/clothing/icons/mob/suits.dmi and b/modular_ss220/clothing/icons/mob/suits.dmi differ diff --git a/modular_ss220/clothing/icons/object/helmet.dmi b/modular_ss220/clothing/icons/object/helmet.dmi index 683c86811fb5..00638d903dc6 100644 Binary files a/modular_ss220/clothing/icons/object/helmet.dmi and b/modular_ss220/clothing/icons/object/helmet.dmi differ diff --git a/modular_ss220/clothing/icons/object/suits.dmi b/modular_ss220/clothing/icons/object/suits.dmi index 2adce2ca6a0b..496774fd8102 100644 Binary files a/modular_ss220/clothing/icons/object/suits.dmi and b/modular_ss220/clothing/icons/object/suits.dmi differ diff --git a/modular_ss220/jobs/code/objects/wardrobe_vendors.dm b/modular_ss220/jobs/code/objects/wardrobe_vendors.dm index f508f3d87774..cd0890e1c5c2 100644 --- a/modular_ss220/jobs/code/objects/wardrobe_vendors.dm +++ b/modular_ss220/jobs/code/objects/wardrobe_vendors.dm @@ -8,6 +8,14 @@ /obj/item/clothing/head/surgery/green/light = 5, /obj/item/clothing/under/rank/medical/scrubs/green/light = 5, ) + prices |= list( + /obj/item/clothing/under/rank/medical/doctor/intern = 50, + /obj/item/clothing/under/rank/medical/doctor/intern/skirt = 50, + /obj/item/clothing/under/rank/medical/doctor/intern/assistant = 50, + /obj/item/clothing/under/rank/medical/doctor/intern/assistant/skirt = 50, + /obj/item/clothing/head/surgery/green/light = 20, + /obj/item/clothing/under/rank/medical/scrubs/green/light = 50, + ) /obj/machinery/economy/vending/secdrobe/Initialize(mapload) @@ -18,6 +26,20 @@ /obj/item/clothing/under/rank/security/officer/cadet/assistant = 5, /obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt = 5, ) + contraband |= list( + /obj/item/clothing/head/helmet/cop = 2, + /obj/item/clothing/head/helmet/cop/v2 = 1, + /obj/item/clothing/suit/armor/cop = 3, + ) + prices |= list( + /obj/item/clothing/under/rank/security/officer/cadet = 50, + /obj/item/clothing/under/rank/security/officer/cadet/skirt = 50, + /obj/item/clothing/under/rank/security/officer/cadet/assistant = 50, + /obj/item/clothing/under/rank/security/officer/cadet/assistant/skirt = 50, + /obj/item/clothing/head/helmet/cop = 200, + /obj/item/clothing/head/helmet/cop/v2 = 200, + /obj/item/clothing/suit/armor/cop = 200, + ) /obj/machinery/economy/vending/scidrobe/Initialize(mapload) @@ -28,7 +50,12 @@ /obj/item/clothing/under/rank/rnd/scientist/student/assistant = 5, /obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt = 5, ) - + prices |= list( + /obj/item/clothing/under/rank/rnd/scientist/student = 50, + /obj/item/clothing/under/rank/rnd/scientist/student/skirt = 50, + /obj/item/clothing/under/rank/rnd/scientist/student/assistant = 50, + /obj/item/clothing/under/rank/rnd/scientist/student/assistant/skirt = 50, + ) /obj/machinery/economy/vending/engidrobe/Initialize(mapload) . = ..() @@ -38,3 +65,9 @@ /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant = 5, /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt = 5, ) + prices |= list( + /obj/item/clothing/under/rank/engineering/engineer/trainee = 50, + /obj/item/clothing/under/rank/engineering/engineer/trainee/skirt = 50, + /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant = 50, + /obj/item/clothing/under/rank/engineering/engineer/trainee/assistant/skirt = 50, + )