cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Portal fixes - adds oldloc to Crossed()

Browse Source
This commit is contained in:
Mark van Alphen
2019-07-15 20:16:17 +02:00
parent 10ef2311ab
commit fd579015b1
59 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,11 +33,10 @@
return 0
/obj/machinery/field/containment/Crossed(mob/mover)
/obj/machinery/field/containment/Crossed(mob/mover, oldloc)
if(isliving(mover))
shock_field(mover)
/obj/machinery/field/containment/Crossed(obj/mover)
if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
bump_field(mover)

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

@@ -287,7 +287,7 @@ field_generator power level display
fields += CF
G.fields += CF
for(var/mob/living/L in T)
CF.Crossed(L)
CF.Crossed(L, null)
connected_gens |= G
G.connected_gens |= src

2
code/modules/power/singularity/particle_accelerator/particle.dm
View File

@@ -39,7 +39,7 @@
var/obj/singularity/S = A
S.energy += energy
/obj/effect/accelerated_particle/Crossed(atom/A)
/obj/effect/accelerated_particle/Crossed(atom/A, oldloc)
if(isliving(A))
toxmob(A)