New security helmet and coat

modular_ss220/clothing/code/helmet.dm

@@ -68,6 +68,22 @@
 		"Nucleation"		=	'modular_ss220/clothing/icons/mob/helmet.dmi',
 		)
 
+/obj/item/clothing/head/helmet/ert/security
+	icon_state = "ember_sec"
+	item_state = "ember_sec"
+
+/obj/item/clothing/head/helmet/ert/engineer
+	icon_state = "ember_eng"
+	item_state = "ember_eng"
+
+/obj/item/clothing/head/helmet/ert/medical
+	icon_state = "ember_med"
+	item_state = "ember_med"
+
+/obj/item/clothing/head/helmet/ert/janitor
+	icon_state = "ember_jan"
+	item_state = "ember_jan"
+
 /obj/item/clothing/head/helmet/ert/command
 	icon_state = "ember_com"
 	item_state = "ember_com"
@@ -83,12 +99,12 @@
 		toggle_nvg(user)
 
 /obj/item/clothing/head/helmet/ert/command/item_action_slot_check(slot)
-	if(slot == SLOT_HUD_HEAD)
+	if(slot == ITEM_SLOT_HEAD)
 		return TRUE
 
 /obj/item/clothing/head/helmet/ert/command/equipped(mob/user, slot, initial)
 	. = ..()
-	if(nvg_enabled && slot == SLOT_HUD_HEAD)
+	if(nvg_enabled && slot == ITEM_SLOT_HEAD)
 		ADD_TRAIT(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]")
 
 /obj/item/clothing/head/helmet/ert/command/dropped(mob/user)
@@ -125,10 +141,6 @@
 	user.update_inv_head()
 	to_chat(user, span_notice("[msg]"))
 
-/obj/item/clothing/head/helmet/ert/security
-	icon_state = "ember_sec"
-	item_state = "ember_sec"
-
 /obj/item/clothing/head/helmet/ert/security/paranormal
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
@@ -166,12 +178,77 @@
 		"Vulpkanin" 		= 	'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi',
 		"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/ert/medical
-	icon_state = "ember_med"
-	item_state = "ember_med"
+/obj/item/clothing/head/helmet/cop
+	name = "шлем обороняющего гражданских"
+	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/ert/janitor
-	icon_state = "ember_jan"
-	item_state = "ember_jan"
+/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"

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 = "серая шинель"
+	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',
+		)

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,
+	)