cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict fix

Browse Source
This commit is contained in:
Mars
2018-08-28 11:28:13 +02:00
parent bedaad976f 98df7d3e6d
commit f2532e74ba
79 changed files with 837 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment_locker.dm
+3
View File
@@ -664,6 +664,9 @@
var/turf/T = get_turf(H)
T.add_vomit_floor(H)
playsound(H, 'sound/effects/splat.ogg', 50, 1)
else
visible_message("<span class='warning'>[src] flickers and fails, due to bluespace interference!</span>")
qdel(src)
/**********************Resonator**********************/