shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7173 from Citadel-Station-13/kevinz000-patch-11

Browse Source 
readds tesla coil deathtraps
This commit is contained in:
deathride58
2018-07-06 01:37:42 -04:00
committed by GitHub
parent cec2871db2 97531c61ff
commit cee8da4fdb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/coil.dm
+3 -3
View File
@@ -25,7 +25,7 @@
/obj/machinery/power/tesla_coil/Initialize() /obj/machinery/power/tesla_coil/Initialize()
. = ..() . = ..()
// wires = new /datum/wires/tesla_coil(src) //CITADEL EDIT, Kevinz you cheaty fuccboi. wires = new /datum/wires/tesla_coil(src) //CITADEL EDIT, Kevinz you cheaty fuccboi.
linked_techweb = SSresearch.science_tech linked_techweb = SSresearch.science_tech
/obj/machinery/power/tesla_coil/RefreshParts() /obj/machinery/power/tesla_coil/RefreshParts()
@@ -62,9 +62,9 @@
if(default_deconstruction_crowbar(W)) if(default_deconstruction_crowbar(W))
return return
/*if(is_wire_tool(W) && panel_open) CITADEL EDIT - They removed the wires because they don't like my cheating if(is_wire_tool(W) && panel_open)
wires.interact(user) wires.interact(user)
return*/ return
return ..() return ..()