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/modules/ruins/spaceruin_code/hilbertshotel.dm
+16 -16
View File
@@ -262,10 +262,10 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
icon_state = base_icon_state
return ..()
/turf/open/space/bluespace/Entered(atom/movable/A)
/turf/open/space/bluespace/Entered(atom/movable/arrived, direction)
. = ..()
if(parentSphere && A.forceMove(get_turf(parentSphere)))
do_sparks(3, FALSE, get_turf(A))
if(parentSphere && arrived.forceMove(get_turf(parentSphere)))
do_sparks(3, FALSE, get_turf(arrived))
/turf/closed/indestructible/hoteldoor
name = "Hotel Door"
@@ -359,11 +359,11 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/turf_reservation/reservation
var/turf/storageTurf
/area/hilbertshotel/Entered(atom/movable/AM)
/area/hilbertshotel/Entered(atom/movable/arrived, direction)
. = ..()
if(istype(AM, /obj/item/hilbertshotel))
relocate(AM)
var/list/obj/item/hilbertshotel/hotels = AM.get_all_contents_type(/obj/item/hilbertshotel)
if(istype(arrived, /obj/item/hilbertshotel))
relocate(arrived)
var/list/obj/item/hilbertshotel/hotels = arrived.get_all_contents_type(/obj/item/hilbertshotel)
for(var/obj/item/hilbertshotel/H in hotels)
if(parentSphere == H)
relocate(H)
@@ -396,10 +396,10 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
to_chat(M, span_danger("[H] almost implodes in upon itself, but quickly rebounds, shooting off into a random point in space!"))
H.forceMove(targetturf)
/area/hilbertshotel/Exited(atom/movable/AM)
/area/hilbertshotel/Exited(atom/movable/gone, direction)
. = ..()
if(ismob(AM))
var/mob/M = AM
if(ismob(gone))
var/mob/M = gone
if(M.mind)
var/stillPopulated = FALSE
var/list/currentLivingMobs = get_all_contents_type(/mob/living) //Got to catch anyone hiding in anything
@@ -447,16 +447,16 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/roomNumber
var/obj/item/hilbertshotel/parentSphere
/obj/item/abstracthotelstorage/Entered(atom/movable/AM, atom/oldLoc)
/obj/item/abstracthotelstorage/Entered(atom/movable/arrived, direction)
. = ..()
if(ismob(AM))
var/mob/M = AM
if(ismob(arrived))
var/mob/M = arrived
M.notransform = TRUE
/obj/item/abstracthotelstorage/Exited(atom/movable/AM, atom/newLoc)
/obj/item/abstracthotelstorage/Exited(atom/movable/gone, direction)
. = ..()
if(ismob(AM))
var/mob/M = AM
if(ismob(gone))
var/mob/M = gone
M.notransform = FALSE
//Space Ruin stuff