From e23f5c2dd0d6f911dc269546a3b4ccaf7a8b973b Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 20 Jan 2017 18:04:12 -0600 Subject: [PATCH] Vox airtank fix --- code/game/antagonist/outsider/raider.dm | 2 +- code/game/objects/items/weapons/tanks/tank_types.dm | 9 ++++++++- code/modules/clothing/spacesuits/rig/suits/alien.dm | 2 +- .../mob/living/carbon/human/species/outsider/vox.dm | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index d149012c75..ae77e8f216 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -308,7 +308,7 @@ var/datum/antagonist/raider/raiders player.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(player), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES. player.equip_to_slot_or_del(new /obj/item/clothing/gloves/vox(player), slot_gloves) // AS ABOVE. player.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/swat/vox(player), slot_wear_mask) - player.equip_to_slot_or_del(new /obj/item/weapon/tank/phoron/vox(player), slot_back) + player.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(player), slot_back) player.equip_to_slot_or_del(new /obj/item/device/flashlight(player), slot_r_store) player.internal = locate(/obj/item/weapon/tank) in player.contents diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 6d91733c7b..6c2b6aa885 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -100,14 +100,21 @@ src.loc = F return -/obj/item/weapon/tank/phoron/vox +/obj/item/weapon/tank/vox //Can't be a child of phoron or the gas amount gets screwey. name = "phoron tank" desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon_state = "oxygen_fr" gauge_icon = null flags = CONDUCT + distribute_pressure = ONE_ATMOSPHERE*O2STANDARD slot_flags = SLOT_BACK //these ones have straps! +/obj/item/weapon/tank/vox/New() + ..() + + air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + return + /* * Emergency Oxygen */ diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index f751eeb760..1da4fbba4b 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -50,7 +50,7 @@ siemens_coefficient = 0.2 phoronproof = 1 - air_type = /obj/item/weapon/tank/phoron/vox + air_type = /obj/item/weapon/tank/vox helm_type = /obj/item/clothing/head/helmet/space/rig/vox boot_type = /obj/item/clothing/shoes/magboots/rig/vox diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index 7ff50ae70a..8a7df26cf0 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -75,11 +75,11 @@ /datum/species/vox/equip_survival_gear(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/tank/phoron/vox(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(H), slot_back) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vox(H), slot_r_hand) H.internal = H.back else - H.equip_to_slot_or_del(new /obj/item/weapon/tank/phoron/vox(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(H), slot_r_hand) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vox(H.back), slot_in_backpack) H.internal = H.r_hand H.internal = locate(/obj/item/weapon/tank) in H.contents