Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull

This commit is contained in:
Razgriz
2020-07-12 16:14:45 -07:00
1029 changed files with 311473 additions and 232993 deletions
@@ -159,6 +159,6 @@
..()
/obj/machinery/atmospherics/unary/heater/examine(mob/user)
..()
. = ..()
if(panel_open)
. += "The maintenance hatch is open."
@@ -396,7 +396,7 @@
to_chat(user, "<span class='notice'>Now welding the vent.</span>")
if(do_after(user, 20 * WT.toolspeed))
if(!src || !WT.isOn()) return
playsound(src.loc, WT.usesound, 50, 1)
playsound(src, WT.usesound, 50, 1)
if(!welded)
user.visible_message("<span class='notice'>\The [user] welds the vent shut.</span>", "<span class='notice'>You weld the vent shut.</span>", "You hear welding.")
welded = 1