Merge branch 'master' into translate

modular_ss220/clothing/code/helmet.dm

@@ -1,3 +1,4 @@
+// MARK: Miscellaneous
 /obj/item/clothing/head/helmet/bike_helmet
 	name = "байкерский шлем"
 	desc = "Крутой шлем."
@@ -38,3 +39,130 @@
 	desc = "Крутой шлем. На вид хлипкий..."
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
+// MARK: ERT
+/obj/item/clothing/head/helmet/ert
+	icon = 'modular_ss220/clothing/icons/object/helmet.dmi'
+	icon_state = "ember_sec"
+	item_state = "ember_sec"
+	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/helmet.dmi',
+		"Human" 			= 	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		"Kidan" 			= 	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		"Machine"			= 	'modular_ss220/clothing/icons/mob/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/helmet.dmi',
+		"Unathi" 			= 	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		"Vox" 				= 	'modular_ss220/clothing/icons/mob/species/vox/helmet.dmi',
+		"Vulpkanin" 		= 	'modular_ss220/clothing/icons/mob/species/vulpkanin/helmet.dmi',
+		"Lich" 				= 	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		"Nucleation"		=	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		)
+
+/obj/item/clothing/head/helmet/ert/command
+	icon_state = "ember_com"
+	item_state = "ember_com"
+	actions_types = list(/datum/action/item_action/toggle_nvg)
+	/// Is night vision goggles enabled?
+	var/nvg_enabled = FALSE
+
+/datum/action/item_action/toggle_nvg
+	name = "Toggle Nightvision"
+
+/obj/item/clothing/head/helmet/ert/command/ui_action_click(mob/user, actiontype)
+	if(actiontype == /datum/action/item_action/toggle_nvg)
+		toggle_nvg(user)
+
+/obj/item/clothing/head/helmet/ert/command/item_action_slot_check(slot)
+	if(slot == SLOT_HUD_HEAD)
+		return TRUE
+
+/obj/item/clothing/head/helmet/ert/command/equipped(mob/user, slot, initial)
+	. = ..()
+	if(nvg_enabled && slot == SLOT_HUD_HEAD)
+		ADD_TRAIT(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]")
+
+/obj/item/clothing/head/helmet/ert/command/dropped(mob/user)
+	. = ..()
+	if(user)
+		REMOVE_TRAIT(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]")
+
+/obj/item/clothing/head/helmet/ert/command/update_icon_state()
+	. = ..()
+	if(nvg_enabled)
+		icon_state = initial(icon_state) + "_nvg"
+		item_state = initial(item_state) + "_nvg"
+	else
+		icon_state = initial(icon_state)
+		item_state = initial(item_state)
+
+/obj/item/clothing/head/helmet/ert/command/proc/toggle_nvg(mob/user)
+	var/msg
+	if(!HAS_TRAIT_FROM(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]"))
+		ADD_TRAIT(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]")
+		msg = "You lowered your night-vision goggles over your eyes."
+		nvg_enabled = TRUE
+	else
+		REMOVE_TRAIT(user, TRAIT_NIGHT_VISION, "ert_commander_helmet[UID()]")
+		msg = "You raised your night-vision goggles."
+		nvg_enabled = FALSE
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(H.head == src)
+			H.update_sight()
+
+	update_icon(UPDATE_ICON_STATE)
+	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/space/ert_engineer
+	name = "emergency response team engineer space helmet"
+	desc = "Space helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
+	icon = 'modular_ss220/clothing/icons/object/helmet.dmi'
+	icon_state = "ember_eng"
+	item_state = "ember_eng"
+	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/helmet.dmi',
+		"Human" 			= 	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		"Kidan" 			= 	'modular_ss220/clothing/icons/mob/helmet.dmi',
+		"Machine"			= 	'modular_ss220/clothing/icons/mob/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/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 = 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/ert/janitor
+	icon_state = "ember_jan"
+	item_state = "ember_jan"

modular_ss220/clothing/code/suits.dm

@@ -1,3 +1,4 @@
+// MARK: Miscellaneous
 /obj/item/clothing/suit/v_jacket
 	name = "куртка V"
 	desc = "Куртка так называемого V."
@@ -73,32 +74,6 @@
 	name = "светло-голубой акулий капюшон"
 	icon_state = "shark_casual_light"
 
-/obj/item/clothing/suit/space/deathsquad/officer/syndie
-	name = "куртка офицера синдиката"
-	desc = "Длинная куртка из высокопрочного волокна."
-	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
-	icon_state = "jacket_syndie"
-	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-
-/obj/item/clothing/suit/space/deathsquad/officer/field
-	name = "полевая форма офицера флота Нанотрейзен"
-	desc = "Парадный плащ, разработанный в качестве массового варианта формы Верховного Главнокомандующего. У этой униформы нет тех же защитных свойств, что и у оригинала, но она все ещё является довольно удобным и стильным предметом гардероба."
-	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
-	icon_state = "ntsc_uniform"
-	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
-
-/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
-	name = "армированная мантия офицера флота Нанотрейзен"
-	desc = "Один из вариантов торжественного одеяния сотрудников Верховного Командования Нанотрейзен, подойдет для официальной встречи или важного вылета. Сшита из лёгкой и сверхпрочной ткани."
-	icon = 'modular_ss220/clothing/icons/object/cloaks.dmi'
-	icon_state = "ntsc_cloak"
-	icon_override = 'modular_ss220/clothing/icons/mob/cloaks.dmi'
-
-/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/coat_nt
-	name = "полевой плащ офицера флота Нанотрейзен"
-	desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом."
-	icon_state = "ntsc_coat"
-
 /obj/item/clothing/suit/hooded/vi_arcane
 	name = "куртка Вай"
 	desc = "Слегка потрёпанный жакет боевой девчушки Вай."
@@ -247,15 +222,7 @@
 		"Nucleation"		=	'modular_ss220/clothing/icons/mob/suits.dmi',
 		)
 
-/datum/supply_packs/misc/soundhand
-	name = "Soundhand Fan Crate"
-	contains = list(/obj/item/clothing/suit/storage/soundhand_black_jacket,
-					/obj/item/clothing/suit/storage/soundhand_olive_jacket,
-					/obj/item/clothing/suit/storage/soundhand_brown_jacket)
-	cost = 600
-	containername = "soundhand fan crate"
-
-/* Space Battle */
+// MARK: Space Battle
 /obj/item/clothing/suit/space/hardsuit/security
 	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
 	icon_state = "hardsuit-sec-old"
@@ -266,6 +233,109 @@
 	icon_state = "hardsuit0-sec"
 	icon_override = 'modular_ss220/clothing/icons/mob/helmet.dmi'
 
-/* SOO jacket */
+// MARK: NT & Syndie
+/* NANOTRASEN */
 /obj/item/clothing/suit/space/deathsquad/officer/soo_brown
 	icon_state = "brtrenchcoat_open"
+
+/obj/item/clothing/suit/space/deathsquad/officer/field
+	name = "полевая форма офицера флота Нанотрейзен"
+	desc = "Парадный плащ, разработанный в качестве массового варианта формы Верховного Главнокомандующего. У этой униформы нет тех же защитных свойств, что и у оригинала, но она все ещё является довольно удобным и стильным предметом гардероба."
+	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
+	icon_state = "ntsc_uniform"
+	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
+
+/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt
+	name = "армированная мантия офицера флота Нанотрейзен"
+	desc = "Один из вариантов торжественного одеяния сотрудников Верховного Командования Нанотрейзен, подойдет для официальной встречи или важного вылета. Сшита из лёгкой и сверхпрочной ткани."
+	icon = 'modular_ss220/clothing/icons/object/cloaks.dmi'
+	icon_state = "ntsc_cloak"
+	icon_override = 'modular_ss220/clothing/icons/mob/cloaks.dmi'
+
+/obj/item/clothing/suit/space/deathsquad/officer/field/cloak_nt/coat_nt
+	name = "полевой плащ офицера флота Нанотрейзен"
+	desc = "Парадный плащ нового образца, внедряемый на объектах компании в последнее время. Отличительной чертой является стоячий воротник и резаный подол. Невысокие показатели защиты нивелируются пафосом, источаемым этим плащом."
+	icon_state = "ntsc_coat"
+
+/* SYNDICATE */
+/obj/item/clothing/suit/space/deathsquad/officer/syndie
+	name = "куртка офицера синдиката"
+	desc = "Длинная куртка из высокопрочного волокна."
+	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
+	icon_state = "jacket_syndie"
+	icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
+
+// MARK: ERT
+/obj/item/clothing/suit/armor/vest/ert
+	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
+	icon_state = "ember_sec"
+	item_state = "ember_sec"
+	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/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',
+		)
+
+/obj/item/clothing/suit/armor/vest/ert/command
+	icon_state = "ember_com"
+	item_state = "ember_com"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+/obj/item/clothing/suit/armor/vest/ert/security
+	icon_state = "ember_sec"
+	item_state = "ember_sec"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+/obj/item/clothing/suit/space/ert_engineer
+	name = "emergency response team engineer space suit"
+	desc = "Space suit worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
+	icon = 'modular_ss220/clothing/icons/object/suits.dmi'
+	icon_state = "ember_eng"
+	item_state = "ember_eng"
+	armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 50, FIRE = 200, ACID = 115)
+	slowdown = 0.5
+	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/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',
+		)
+
+/obj/item/clothing/suit/armor/vest/ert/medical
+	icon_state = "ember_med"
+	item_state = "ember_med"
+
+/obj/item/clothing/suit/armor/vest/ert/janitor
+	icon_state = "ember_jan"
+	item_state = "ember_jan"