mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 22:50:26 +01:00
Fix tanks not showing they are connected to a mask
Fix wire pulse sound
This commit is contained in:
@@ -341,6 +341,7 @@ var/list/wire_color_directory = list()
|
||||
L << "<span class='warning'>You need wirecutters!</span>"
|
||||
if("pulse")
|
||||
if(istype(I, /obj/item/device/multitool) || IsAdminGhost(usr))
|
||||
playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
|
||||
pulse_color(target_wire)
|
||||
. = TRUE
|
||||
else
|
||||
|
||||
@@ -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>"
|
||||
|
||||
+2
-2
File diff suppressed because one or more lines are too long
@@ -12,7 +12,7 @@ component.exports = {
|
||||
</script>
|
||||
|
||||
<ui-notice>
|
||||
<span>The regulator {{data.hasHoldingTank ? "is" : "is not"}} connected to a mask.</span>
|
||||
<span>The regulator {{data.maskConnected ? "is" : "is not"}} connected to a mask.</span>
|
||||
</ui-notice>
|
||||
<ui-display>
|
||||
<ui-section label='Tank Pressure'>
|
||||
|
||||
Reference in New Issue
Block a user