diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 6be3942fd7..be66fb2f35 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/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, diff --git a/code/modules/clothing/head/pilot_helmet_vr.dm b/code/modules/clothing/head/pilot_helmet_vr.dm index acf700f81f..34f6c3293d 100644 --- a/code/modules/clothing/head/pilot_helmet_vr.dm +++ b/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 \ No newline at end of file + 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 diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index c4f7a47b69..77aeb8bff7 100644 Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ diff --git a/icons/mob/species/teshari/helmet_vr.dmi b/icons/mob/species/teshari/helmet_vr.dmi index 72074b0473..757bfea1f2 100644 Binary files a/icons/mob/species/teshari/helmet_vr.dmi and b/icons/mob/species/teshari/helmet_vr.dmi differ diff --git a/icons/obj/clothing/helmets_vr.dmi b/icons/obj/clothing/helmets_vr.dmi index f635aae960..4d8beae127 100644 Binary files a/icons/obj/clothing/helmets_vr.dmi and b/icons/obj/clothing/helmets_vr.dmi differ diff --git a/maps/southern_cross/loadout/loadout_head.dm b/maps/southern_cross/loadout/loadout_head.dm index cbf7d63c26..06b220bf1e 100644 --- a/maps/southern_cross/loadout/loadout_head.dm +++ b/maps/southern_cross/loadout/loadout_head.dm @@ -1,4 +1,9 @@ /datum/gear/head/pilot - display_name = "helmet, pilot (Pilot)" - path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit + display_name = "helmet, standard pilot (Pilot)" + path = /obj/item/clothing/head/pilot_vr //VOREStation Edit + allowed_roles = list("Pilot") + +/datum/gear/head/pilot + display_name = "helmet, colored pilot (Pilot)" + path = /obj/item/clothing/head/pilot_vr/alt //VOREStation Edit allowed_roles = list("Pilot")