Merge pull request #10149 from Novacat/nova-ert

Replaces old pilot helmets
This commit is contained in:
Novacat
2021-04-12 22:39:09 -04:00
committed by Chompstation Bot
parent 3c78d5bae6
commit 93b480e5fb
4 changed files with 36 additions and 2 deletions

View File

@@ -124,7 +124,7 @@
/obj/item/weapon/storage/backpack/parachute, /obj/item/weapon/storage/backpack/parachute,
/obj/item/weapon/material/knife/tacknife/survival, /obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/gun/energy/locked/frontier/holdout, /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/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/suit/storage/toggle/bomber/pilot,
/obj/item/clothing/shoes/boots/winter/explorer, /obj/item/clothing/shoes/boots/winter/explorer,

View File

@@ -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

View File

@@ -344,7 +344,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
starts_with = list( starts_with = list(
/obj/item/weapon/material/knife/tacknife/survival, /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/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/suit/storage/toggle/bomber/pilot,
/obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/fingerless,

View File

@@ -2024,6 +2024,7 @@
#include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\misc_vr.dm" #include "code\modules\clothing\head\misc_vr.dm"
#include "code\modules\clothing\head\pilot_helmet.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\soft_caps.dm"
#include "code\modules\clothing\head\solgov.dm" #include "code\modules\clothing\head\solgov.dm"
#include "code\modules\clothing\head\solgov_vr.dm" #include "code\modules\clothing\head\solgov_vr.dm"