shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400

Browse Source 
[MIRROR] Assmos tweaks/minor additions.
This commit is contained in:
LetterJay
2017-11-12 08:21:09 -06:00
committed by GitHub
parent f2ef581114 62529fe3b1
commit 9b406f88a7
6 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tanks/tanks.dm
+3 -1
View File
@@ -233,6 +233,8 @@
return 0
var/pressure = air_contents.return_pressure()
var/temperature = air_contents.return_pressure()
if(pressure > TANK_FRAGMENT_PRESSURE)
if(!istype(src.loc, /obj/item/device/transfer_valve))
message_admins("Explosive tank rupture! Last key to touch the tank was [src.fingerprintslast].")
@@ -252,7 +254,7 @@
else
qdel(src)
else if(pressure > TANK_RUPTURE_PRESSURE)
else if(pressure > TANK_RUPTURE_PRESSURE || temperature > TANK_MELT_TEMPERATURE)
if(integrity <= 0)
var/turf/T = get_turf(src)
if(!T)