cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/life.dm
This commit is contained in:
phil235
2015-04-23 01:32:20 +02:00
parent 21b0750283 f23db26b6a
commit 6aadd8df8d
65 changed files with 2386 additions and 2216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/girders.dm
+4 -5
View File
@@ -23,11 +23,10 @@
if(do_after(user, 40, target = src))
if( !WT.isOn() )
return
if(state == 1)
user << "<span class='notice'>You disassemble the girder.</span>"
var/obj/item/stack/sheet/metal/M = new (loc, 2)
M.add_fingerprint(user)
qdel(src)
user << "<span class='notice'>You disassemble the girder.</span>"
var/obj/item/stack/sheet/metal/M = new (loc, 2)
M.add_fingerprint(user)
qdel(src)
else if(istype(W, /obj/item/weapon/wrench) && state == GIRDER_DISPLACED)
if (!istype(src.loc, /turf/simulated/floor))