cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vox airtank fix

Browse Source
This commit is contained in:
Anewbe
2017-01-20 18:04:12 -06:00
parent 27ea27964e
commit e23f5c2dd0
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/antagonist/outsider/raider.dm
View File

@@ -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/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/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/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.equip_to_slot_or_del(new /obj/item/device/flashlight(player), slot_r_store)
player.internal = locate(/obj/item/weapon/tank) in player.contents player.internal = locate(/obj/item/weapon/tank) in player.contents

9
code/game/objects/items/weapons/tanks/tank_types.dm
View File

@@ -100,14 +100,21 @@
src.loc = F src.loc = F
return 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" name = "phoron tank"
desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
icon_state = "oxygen_fr" icon_state = "oxygen_fr"
gauge_icon = null gauge_icon = null
flags = CONDUCT flags = CONDUCT
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
slot_flags = SLOT_BACK //these ones have straps! 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 * Emergency Oxygen
*/ */

2
code/modules/clothing/spacesuits/rig/suits/alien.dm
View File

@@ -50,7 +50,7 @@
siemens_coefficient = 0.2 siemens_coefficient = 0.2
phoronproof = 1 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 helm_type = /obj/item/clothing/head/helmet/space/rig/vox
boot_type = /obj/item/clothing/shoes/magboots/rig/vox boot_type = /obj/item/clothing/shoes/magboots/rig/vox

4
code/modules/mob/living/carbon/human/species/outsider/vox.dm
View File

@@ -75,11 +75,11 @@
/datum/species/vox/equip_survival_gear(var/mob/living/carbon/human/H) /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) H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
if(H.backbag == 1) 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.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vox(H), slot_r_hand)
H.internal = H.back H.internal = H.back
else 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.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vox(H.back), slot_in_backpack)
H.internal = H.r_hand H.internal = H.r_hand
H.internal = locate(/obj/item/weapon/tank) in H.contents H.internal = locate(/obj/item/weapon/tank) in H.contents