Merge pull request #1975 from CHOMPStationBot/upstream-merge-10339

[MIRROR] Ports the Baystation Pilot Helmets

code/game/objects/structures/crates_lockers/closets/misc_vr.dm

@@ -124,7 +124,7 @@
 		/obj/item/weapon/storage/backpack/parachute,
 		/obj/item/weapon/material/knife/tacknife/survival,
 		/obj/item/weapon/gun/energy/locked/frontier/holdout,
-		/obj/item/clothing/head/ompilot,
+		/obj/item/clothing/head/pilot_vr,
 		/obj/item/clothing/under/rank/pilot1,
 		/obj/item/clothing/suit/storage/toggle/bomber/pilot,
 		/obj/item/clothing/shoes/boots/winter/explorer,

code/modules/clothing/head/pilot_helmet_vr.dm

@@ -1,14 +1,9 @@
-//Overmap pilots. Same gear, without the dumb interface.
-
-/obj/item/clothing/head/ompilot
-	name = "pilot helmet"
-	desc = "Standard pilot gear. Protects the head from impacts."
-	icon_state = "pilot_helmet1"
-	item_icons = list(slot_head_str = 'icons/mob/pilot_helmet.dmi')
-	sprite_sheets = list(
-		SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi'
-		)
-	flags = THICKMATERIAL
+//Pilot helmets
+/obj/item/clothing/head/pilot_vr
+	name = "standard pilot helmet"
+	desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor"
+	icon = 'icons/obj/clothing/helmets_vr.dmi'
+	icon_state = "pilot1"
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0)
 	flags_inv = HIDEEARS
 	cold_protection = HEAD
@@ -16,18 +11,36 @@
 	heat_protection = HEAD
 	max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 	w_class = ITEMSIZE_NORMAL
-
-/obj/item/clothing/head/ompilot/alt
-	name = "pilot helmet"
-	desc = "Standard pilot gear. Protects the head from impacts. This one has a retractable visor"
-	icon_state = "pilot_helmet2"
+	item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+	sprite_sheets = list(
+		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+		)
 	action_button_name = "Toggle Visor"
 
-/obj/item/clothing/head/ompilot/alt/attack_self(mob/user as mob)
+/obj/item/clothing/head/pilot_vr/attack_self(mob/user as mob)
 	if(src.icon_state == initial(icon_state))
 		src.icon_state = "[icon_state]up"
 		to_chat(user, "You raise the visor on the pilot helmet.")
 	else
 		src.icon_state = initial(icon_state)
 		to_chat(user, "You lower the visor on the pilot helmet.")
-	update_clothing_icon() //so our mob-overlays update
+	update_clothing_icon() //so our mob-overlays update
+
+/obj/item/clothing/head/pilot_vr/alt
+	name = "colored pilot helmet"
+	desc = "A colored version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
+	icon_state = "pilot2"
+	item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+	sprite_sheets = list(
+		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+		)
+	action_button_name = "Toggle Visor"
+
+/obj/item/clothing/head/pilot_vr/alt/attack_self(mob/user as mob)
+	if(src.icon_state == initial(icon_state))
+		src.icon_state = "[icon_state]up"
+		to_chat(user, "You raise the visor on the pilot helmet.")
+	else
+		src.icon_state = initial(icon_state)
+		to_chat(user, "You lower the visor on the pilot helmet.")
+	update_clothing_icon() //so our mob-overlays update

maps/southern_cross/loadout/loadout_head.dm

@@ -1,4 +1,4 @@
 /datum/gear/head/pilot
 	display_name = "helmet, pilot (Pilot)"
 	path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit
-	allowed_roles = list("Pilot")
+	allowed_roles = list("Pilot")

maps/southern_cross/loadout/loadout_vr.dm

@@ -0,0 +1,9 @@
+/datum/gear/head/pilot/standard
+	display_name = "helmet, standard pilot (Pilot)"
+	path = /obj/item/clothing/head/pilot_vr
+	allowed_roles = list("Pilot")
+
+/datum/gear/head/pilot/colored
+	display_name = "helmet, colored pilot (Pilot)"
+	path = /obj/item/clothing/head/pilot_vr/alt
+	allowed_roles = list("Pilot")

maps/southern_cross/southern_cross.dm

@@ -18,7 +18,6 @@
 	#include "shuttles/ert.dm"
 
 	#include "loadout/loadout_accessories.dm"
-	#include "loadout/loadout_head.dm"
 	#include "loadout/loadout_suit.dm"
 	#include "loadout/loadout_uniform.dm"
 

vorestation.dme

@@ -4269,7 +4269,6 @@
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
 #include "maps\southern_cross\items\clothing\sc_suit.dm"
 #include "maps\southern_cross\items\clothing\sc_under.dm"
-#include "maps\southern_cross\loadout\loadout_head.dm"
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
 #include "maps\southern_cross\overmap\shuttles.dm"
@@ -4278,6 +4277,7 @@
 #include "maps\southern_cross\structures\closets\misc.dm"
 #include "maps\southern_cross\structures\closets\research.dm"
 #include "maps\southern_cross\structures\closets\security.dm"
+#include "maps\southern_cross\loadout\loadout_vr.dm"
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\engine_submaps\engine.dm"
 #include "maps\submaps\engine_submaps\engine_areas.dm"