cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lynx Fixes Runtimes

Browse Source
This commit is contained in:
Neerti
2019-03-30 18:51:00 -04:00
committed by VirgoBot
parent 056f921ce7
commit 5967a92f02
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/bombspawner.dm
+4
View File
@@ -157,7 +157,11 @@
if(co != null) carbon_amt = co
..()
<<<<<<< HEAD
/obj/effect/spawner/newbomb/Initialize(newloc) //VOREStation Edit
=======
/obj/effect/spawner/newbomb/Initialize(newloc)
>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
..(newloc)
var/obj/item/device/transfer_valve/V = new(src.loc)
code/game/objects/items/weapons/tanks/jetpack.dm
+12
View File
@@ -83,7 +83,11 @@
icon_state = "jetpack-void"
item_state_slots = list(slot_r_hand_str = "jetpack-void", slot_l_hand_str = "jetpack-void")
<<<<<<< HEAD
/obj/item/weapon/tank/jetpack/void/Initialize() //VOREStation Edit
=======
/obj/item/weapon/tank/jetpack/void/Initialize()
>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
@@ -94,7 +98,11 @@
icon_state = "jetpack"
item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack")
<<<<<<< HEAD
/obj/item/weapon/tank/jetpack/oxygen/Initialize() //VOREStation Edit
=======
/obj/item/weapon/tank/jetpack/oxygen/Initialize()
>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
..()
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return
@@ -106,7 +114,11 @@
icon_state = "jetpack-black"
item_state_slots = list(slot_r_hand_str = "jetpack-black", slot_l_hand_str = "jetpack-black")
<<<<<<< HEAD
/obj/item/weapon/tank/jetpack/carbondioxide/Initialize() //VOREStation Edit
=======
/obj/item/weapon/tank/jetpack/carbondioxide/Initialize()
>>>>>>> e57c96f... Merge pull request #6021 from Novacat/nova-runtimes
..()
air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
return