cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9220 from VOREStation/upstream-merge-7702

Browse Source 
[MIRROR] Tesla ball and containment field shock fixes
This commit is contained in:
Verkister
2020-10-18 15:25:26 +03:00
committed by Chompstation Bot
parent a3f9f88bea
commit 68b59b03fb
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/power/singularity/containment_field.dm
View File

@@ -12,11 +12,19 @@
light_range = 4
var/obj/machinery/field_generator/FG1 = null
var/obj/machinery/field_generator/FG2 = null
var/list/shockdirs
var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
/obj/machinery/containment_field/Initialize()
. = ..()
shockdirs = list(turn(dir,90),turn(dir,-90))
sense_proximity(callback = .HasProximity)
/obj/machinery/containment_field/set_dir(new_dir)
. = ..()
if(.)
shockdirs = list(turn(dir,90),turn(dir,-90))
/obj/machinery/containment_field/Destroy()
unsense_proximity(callback = .HasProximity)
if(FG1 && !FG1.clean_up)
@@ -36,11 +44,17 @@
/obj/machinery/containment_field/ex_act(severity)
return 0
/obj/machinery/containment_field/Crossed(mob/living/L)
if(!istype(L) || L.incorporeal_move)
return
shock(L)
/obj/machinery/containment_field/HasProximity(turf/T, atom/movable/AM, old_loc)
if(istype(AM,/mob/living/silicon) && prob(40))
shock(AM)
return 1
if(istype(AM,/mob/living/carbon) && prob(50))
if(!istype(AM, /mob/living) || AM:incorporeal_move)
return 0
if(!(get_dir(src,AM) in shockdirs))
return 0
if(issilicon(AM) ? prob(40) : prob(50))
shock(AM)
return 1
return 0

3
code/modules/power/singularity/field_generator.dm
View File

@@ -285,11 +285,10 @@ field_generator power level display
var/field_dir = get_dir(T,get_step(G.loc, NSEW))
T = get_step(T, NSEW)
if(!locate(/obj/machinery/containment_field) in T)
var/obj/machinery/containment_field/CF = new/obj/machinery/containment_field()
var/obj/machinery/containment_field/CF = new/obj/machinery/containment_field(T)
CF.set_master(src,G)
fields += CF
G.fields += CF
CF.loc = T
CF.set_dir(field_dir)
var/listcheck = 0
for(var/obj/machinery/field_generator/FG in connected_gens)