cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tanks not showing they are connected to a mask

Browse Source 
Fix wire pulse sound
This commit is contained in:
Bjorn Neergaard
2016-01-23 18:56:34 -06:00
parent ca24badfb6
commit 2998624bc3
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/tanks/tanks.dm
+15 -14
View File
@@ -120,22 +120,23 @@
data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
data["minReleasePressure"] = round(TANK_MIN_RELEASE_PRESSURE)
data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE)
data["valveOpen"] = FALSE
data["maskConnected"] = FALSE
var/mob/living/carbon/user = loc
var/mask = FALSE
if(!istype(user))
var/mob/living/carbon/user = null
if(istype(loc, /mob/living/carbon))
user = loc
else if(istype(loc.loc, /mob/living/carbon))
user = loc.loc
if(!istype(user))
user = null
if(!isnull(user) && user.internal == src)
mask = TRUE
if(user && user.internal == src)
data["valveOpen"] = TRUE
else if(src in user && !user.internal)
mask = TRUE
if(mask && user.wear_mask && (user.wear_mask.flags & MASKINTERNALS))
data["maskConnected"] = TRUE
else
data["valveOpen"] = FALSE
if(user.wear_mask && (user.wear_mask.flags & MASKINTERNALS))
if(data["valveOpen"] || ((src in user) && !user.internal))
data["maskConnected"] = TRUE
else
data["maskConnected"] = FALSE
return data
/obj/item/weapon/tank/ui_act(action, params)
@@ -172,7 +173,7 @@
if(user.wear_mask && (user.wear_mask.flags & MASKINTERNALS))
user.internal = src
user.internals.icon_state = "internal1"
usr << "<span class='notice'>You open [src] valve.</span>"
usr << "<span class='notice'>You open \the [src] valve.</span>"
. = TRUE
else
usr << "<span class='warning'>You need something to connect to [src]!</span>"