cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors move procs to support multitle objects (#6423)

Browse Source 
* Refactors move procs to support multitle objects

* Update _blob.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-22 23:40:04 +02:00
committed by GitHub
parent 3d784d4c1e
commit d85a02babd
82 changed files with 349 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+2 -2
View File
@@ -423,9 +423,9 @@
// Objects that try to exit a locker by stepping were doing so successfully,
// and due to an oversight in turf/Enter() were going through walls. That
// should be independently resolved, but this is also an interesting twist.
/obj/structure/closet/Exit(atom/movable/AM)
/obj/structure/closet/Exit(atom/movable/leaving, direction)
open()
if(AM.loc == src)
if(leaving.loc == src)
return FALSE
return TRUE
code/game/objects/structures/industrial_lift.dm
+2 -2
View File
@@ -173,9 +173,9 @@ GLOBAL_LIST_EMPTY(lifts)
lift_master_datum = new(src)
/obj/structure/industrial_lift/proc/UncrossedRemoveItemFromLift(datum/source, atom/movable/potential_rider)
/obj/structure/industrial_lift/proc/UncrossedRemoveItemFromLift(datum/source, atom/movable/gone, direction)
SIGNAL_HANDLER
RemoveItemFromLift(potential_rider)
RemoveItemFromLift(gone)
/obj/structure/industrial_lift/proc/RemoveItemFromLift(atom/movable/potential_rider)
SIGNAL_HANDLER
code/game/objects/structures/railings.dm
+2 -2
View File
@@ -84,10 +84,10 @@
AddElement(/datum/element/connect_loc, src, loc_connections)
/obj/structure/railing/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
/obj/structure/railing/proc/on_exit(datum/source, atom/movable/leaving, direction)
SIGNAL_HANDLER
if(!(get_dir(leaving.loc, new_location) & dir))
if(!(direction & dir))
return
if (!density)
code/game/objects/structures/stairs.dm
+2 -2
View File
@@ -60,10 +60,10 @@
if(S)
S.update_appearance()
/obj/structure/stairs/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
/obj/structure/stairs/proc/on_exit(datum/source, atom/movable/leaving, direction)
SIGNAL_HANDLER
if(!isobserver(leaving) && isTerminator() && (get_dir(src, new_location) == dir))
if(!isobserver(leaving) && isTerminator() && direction == dir)
INVOKE_ASYNC(src, .proc/stair_ascend, leaving)
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -74,13 +74,13 @@
else
return 1
/obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
/obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, direction)
SIGNAL_HANDLER
if (leaving.pass_flags & pass_flags_self)
return
if (get_dir(loc, new_location) == dir && density)
if (direction == dir && density)
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
code/game/objects/structures/window.dm
+2 -2
View File
@@ -124,7 +124,7 @@
return TRUE
/obj/structure/window/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
/obj/structure/window/proc/on_exit(datum/source, atom/movable/leaving, direction)
SIGNAL_HANDLER
if (istype(leaving) && (leaving.pass_flags & pass_flags_self))
@@ -133,7 +133,7 @@
if (fulltile)
return
if(get_dir(leaving.loc, new_location) == dir && density)
if(direction == dir && density)
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT