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

Merge pull request #11285 from Fox-McCloud/elecrocution-refactor

Browse Source 
Refactors Electrocution
This commit is contained in:
variableundefined
2019-04-16 19:47:42 +08:00
committed by GitHub
parent aacc82c937 58a7107eae
commit eb83a2dee7
31 changed files with 158 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/grille.dm
+7 -7
View File
@@ -245,20 +245,20 @@
/obj/structure/grille/proc/shock(mob/user, prb)
if(!anchored || broken) // unanchored/broken grilles are never connected
return 0
return FALSE
if(!prob(prb))
return 0
return FALSE
if(!in_range(src, user))//To prevent TK and mech users from getting shocked
return 0
return FALSE
var/turf/T = get_turf(src)
var/obj/structure/cable/C = T.get_cable_node()
if(C)
if(electrocute_mob(user, C, src))
if(electrocute_mob(user, C, src, 1, TRUE))
do_sparks(3, 1, src)
return 1
return TRUE
else
return 0
return 0
return FALSE
return FALSE
/obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
code/game/objects/structures/holosign.dm
+3 -3
View File
@@ -116,9 +116,9 @@
if(.)
return
if(!shockcd)
if(ismob(user))
if(isliving(user))
var/mob/living/M = user
M.electrocute_act(15,"Energy Barrier", safety=1)
M.electrocute_act(15, "Energy Barrier", safety = TRUE)
shockcd = TRUE
addtimer(CALLBACK(src, .proc/cooldown), 5)
@@ -130,6 +130,6 @@
return
var/mob/living/M = AM
M.electrocute_act(15, "Energy Barrier", safety = 1)
M.electrocute_act(15, "Energy Barrier", safety = TRUE)
shockcd = TRUE
addtimer(CALLBACK(src, .proc/cooldown), 5)