cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-08-13 20:01:22 +02:00
parent 88e747970c a823409997
commit 5c02633707
322 changed files with 17638 additions and 11790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/persistence/graffiti.dm
View File

@@ -39,10 +39,10 @@
to_chat(user, "It reads \"[message]\".")
/obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user)
if(is_hot(thing))
if(istype(thing, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/welder = thing
if(welder.isOn() && welder.remove_fuel(0,user) && do_after(user, 5, src) && !QDELETED(src))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
playsound(src.loc, welder.usesound, 50, 1)
user.visible_message("<span class='notice'>\The [user] clears away some graffiti.</span>")
qdel(src)
else if(thing.sharp)
@@ -61,4 +61,4 @@
if(lowertext(message) == "elbereth")
to_chat(user, "<span class='notice'>You feel much safer.</span>")
else
. = ..()
. = ..()