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

Pre-emptive Conflict Prevention

Browse Source 
Just noticed that my comments were very different and the mirror that's in will conflict if I don't commit this change.
This commit is contained in:
TheFurryFeline
2019-06-06 13:38:31 -04:00
parent b8bbe08b83
commit 0aa11a1813
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/machinery.dm
View File

@@ -408,7 +408,7 @@ Class Procs:
/obj/machinery/proc/dismantle() /obj/machinery/proc/dismantle()
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
//TFF 3/6/19 - port Cit RP fix of infinite frames. //TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK!
if(!circuit) if(!circuit)
return 0 return 0
var/obj/structure/frame/A = new /obj/structure/frame(src.loc) var/obj/structure/frame/A = new /obj/structure/frame(src.loc)