mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 04:57:12 +01:00
Portal fixes - adds oldloc to Crossed()
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
|
||||
return ..()
|
||||
|
||||
/obj/item/shard/supermatter/Crossed(AM as mob|obj)
|
||||
/obj/item/shard/supermatter/Crossed(AM as mob|obj, oldloc)
|
||||
if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
to_chat(M, "<span class='danger'>You step on \the [src]!</span>")
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
/obj/machinery/power/treadmill/update_icon()
|
||||
icon_state = speed ? "conveyor-1" : "conveyor0"
|
||||
|
||||
/obj/machinery/power/treadmill/Crossed(mob/living/M)
|
||||
/obj/machinery/power/treadmill/Crossed(mob/living/M, oldloc)
|
||||
if(anchored && !M.anchored)
|
||||
if(!istype(M) || M.dir != dir)
|
||||
throw_off(M)
|
||||
|
||||
Reference in New Issue
Block a user