cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01: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
code/modules/assembly/bomb.dm
+2 -2
View File
@@ -77,9 +77,9 @@
if(bombassembly)
bombassembly.HasProximity(AM)
/obj/item/onetankbomb/Crossed(atom/movable/AM) //for mousetraps
/obj/item/onetankbomb/Crossed(atom/movable/AM, oldloc) //for mousetraps
if(bombassembly)
bombassembly.Crossed(AM)
bombassembly.Crossed(AM, oldloc)
/obj/item/onetankbomb/on_found(mob/finder) //for mousetraps
if(bombassembly)
code/modules/assembly/holder.dm
+3 -3
View File
@@ -85,11 +85,11 @@
a_right.HasProximity(AM)
/obj/item/assembly_holder/Crossed(atom/movable/AM)
/obj/item/assembly_holder/Crossed(atom/movable/AM, oldloc)
if(a_left)
a_left.Crossed(AM)
a_left.Crossed(AM, oldloc)
if(a_right)
a_right.Crossed(AM)
a_right.Crossed(AM, oldloc)
/obj/item/assembly_holder/on_found(mob/finder)
if(a_left)
code/modules/assembly/infrared.dm
+1 -1
View File
@@ -269,7 +269,7 @@
/obj/effect/beam/i_beam/Bumped()
hit()
/obj/effect/beam/i_beam/Crossed(atom/movable/AM)
/obj/effect/beam/i_beam/Crossed(atom/movable/AM, oldloc)
if(!isobj(AM) && !isliving(AM))
return
if(istype(AM, /obj/effect))
code/modules/assembly/mousetrap.dm
+1 -1
View File
@@ -93,7 +93,7 @@
return
..()
/obj/item/assembly/mousetrap/Crossed(atom/movable/AM)
/obj/item/assembly/mousetrap/Crossed(atom/movable/AM, oldloc)
if(armed)
if(ishuman(AM))
var/mob/living/carbon/H = AM