From 93b480e5fbce7f37d26e6d8e6ae3f97ea09d7dab Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 12 Apr 2021 22:39:09 -0400 Subject: [PATCH] Merge pull request #10149 from Novacat/nova-ert Replaces old pilot helmets --- .../crates_lockers/closets/misc_vr.dm | 2 +- code/modules/clothing/head/pilot_helmet_vr.dm | 33 +++++++++++++++++++ maps/offmap_vr/talon/talon.dm | 2 +- vorestation.dme | 1 + 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 code/modules/clothing/head/pilot_helmet_vr.dm 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 2111bd6667..7d6d96579c 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/pilot, + /obj/item/clothing/head/ompilot, /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 new file mode 100644 index 0000000000..acf700f81f --- /dev/null +++ b/code/modules/clothing/head/pilot_helmet_vr.dm @@ -0,0 +1,33 @@ +//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 + armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0) + flags_inv = HIDEEARS + cold_protection = HEAD + min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE + 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" + action_button_name = "Toggle Visor" + +/obj/item/clothing/head/ompilot/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 \ No newline at end of file diff --git a/maps/offmap_vr/talon/talon.dm b/maps/offmap_vr/talon/talon.dm index b05b7ec13a..7a51787226 100644 --- a/maps/offmap_vr/talon/talon.dm +++ b/maps/offmap_vr/talon/talon.dm @@ -344,7 +344,7 @@ Once in open space, consider disabling nonessential power-consuming electronics starts_with = list( /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/clothing/head/pilot, + /obj/item/clothing/head/ompilot, /obj/item/clothing/under/rank/pilot1, /obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/gloves/fingerless, diff --git a/vorestation.dme b/vorestation.dme index a0a133e078..a3308131f6 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2024,6 +2024,7 @@ #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\misc_vr.dm" #include "code\modules\clothing\head\pilot_helmet.dm" +#include "code\modules\clothing\head\pilot_helmet_vr.dm" #include "code\modules\clothing\head\soft_caps.dm" #include "code\modules\clothing\head\solgov.dm" #include "code\modules\clothing\head\solgov_vr.dm"