cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Power Insulated (#6055)

Browse Source 
It is now no longer to electrocute yourself by merely clicking on an exposed power cable with an object that happens to be conductive. Power cables are now insulated.

It is now possible to sever cables with an object that is sharp or edgy by clicking on an exposed power cable with said object while on help intent (to alleviate potential misclicks while fighting in maint, which one assumes is normally done in harm intent.) If the sharp object is conductive you will electrocute yourself.
This commit is contained in:
LordFowl
2019-02-20 14:54:17 -05:00
committed by Erki
parent 6ffdcab6f2
commit 0537ae6b0c
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/power/cable.dm
View File

@@ -132,7 +132,15 @@ var/list/possible_cable_coil_colours = list(
if(!T.can_have_cabling())
return
if(W.iswirecutter())
if(W.iswirecutter() || (W.sharp || W.edge))
if(!W.iswirecutter())
if(user.a_intent != I_HELP)
return
if(W.flags & CONDUCT)
shock(user, 50, 0.7)
if(d1 == 12 || d2 == 12)
user << "<span class='warning'>You must cut this cable from above.</span>"
return
@@ -182,10 +190,6 @@ var/list/possible_cable_coil_colours = list(
shock(user, 5, 0.2)
else
if (W.flags & CONDUCT)
shock(user, 50, 0.7)
src.add_fingerprint(user)
// shock the user with probability prb