cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 15:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Items are now assumed to be conductive, rather than the opposite

Browse Source
This commit is contained in:
Anewbe
2019-03-02 20:34:49 -06:00
parent 85d332e94b
commit aade8c356f
89 changed files with 27 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/power/lighting.dm
View File

@@ -430,7 +430,7 @@
if(M == user)
continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
if(on && (W.flags & CONDUCT))
if(on && !(W.flags & NOCONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3)
@@ -468,7 +468,7 @@
return
user << "You stick \the [W] into the light socket!"
if(has_power() && (W.flags & CONDUCT))
if(has_power() && !(W.flags & NOCONDUCT))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()