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

[MDB IGNORE] More /area/ typepath organization and cleanup (#67107)

Browse Source 
This further continues what I did in b4fb8f3ed1 (but instead of just stations, its now every (most) applicable area in the game
This commit is contained in:
Jolly
2022-05-23 15:01:19 -04:00
committed by GitHub
parent d5b7f09849
commit cfc2330528
103 changed files with 7239 additions and 7107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+8 -7
View File
@@ -149,7 +149,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
user.forceMove(locate(roomReservation.bottom_left_coords[1] + hotelRoomTemp.landingZoneRelativeX, roomReservation.bottom_left_coords[2] + hotelRoomTemp.landingZoneRelativeY, roomReservation.bottom_left_coords[3]))
/obj/item/hilbertshotel/proc/linkTurfs(datum/turf_reservation/currentReservation, currentRoomnumber)
var/area/hilbertshotel/currentArea = get_area(locate(currentReservation.bottom_left_coords[1], currentReservation.bottom_left_coords[2], currentReservation.bottom_left_coords[3]))
var/area/misc/hilbertshotel/currentArea = get_area(locate(currentReservation.bottom_left_coords[1], currentReservation.bottom_left_coords[2], currentReservation.bottom_left_coords[3]))
currentArea.name = "Hilbert's Hotel Room [currentRoomnumber]"
currentArea.parentSphere = src
currentArea.storageTurf = storageTurf
@@ -345,7 +345,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
qdel(src)
/area/hilbertshotel
// Despite using the ruins.dmi, hilbertshotel is not a ruin
/area/misc/hilbertshotel
name = "Hilbert's Hotel Room"
icon = 'icons/area/areas_ruins.dmi'
icon_state = "hilbertshotel"
@@ -359,7 +360,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
var/datum/turf_reservation/reservation
var/turf/storageTurf
/area/hilbertshotel/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
/area/misc/hilbertshotel/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
. = ..()
if(istype(arrived, /obj/item/hilbertshotel))
relocate(arrived)
@@ -368,7 +369,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
if(parentSphere == H)
relocate(H)
/area/hilbertshotel/proc/relocate(obj/item/hilbertshotel/H)
/area/misc/hilbertshotel/proc/relocate(obj/item/hilbertshotel/H)
if(prob(0.135685)) //Because screw you
qdel(H)
return
@@ -396,7 +397,7 @@ 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/gone, direction)
/area/misc/hilbertshotel/Exited(atom/movable/gone, direction)
. = ..()
if(ismob(gone))
var/mob/M = gone
@@ -410,7 +411,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
if(!stillPopulated)
storeRoom()
/area/hilbertshotel/proc/storeRoom()
/area/misc/hilbertshotel/proc/storeRoom()
var/roomSize = (reservation.top_right_coords[1]-reservation.bottom_left_coords[1]+1)*(reservation.top_right_coords[2]-reservation.bottom_left_coords[2]+1)
var/storage[roomSize]
var/turfNumber = 1
@@ -432,7 +433,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
parentSphere.activeRooms -= "[roomnumber]"
qdel(reservation)
/area/hilbertshotelstorage
/area/misc/hilbertshotelstorage
name = "Hilbert's Hotel Storage Room"
icon = 'icons/area/areas_ruins.dmi'
icon_state = "hilbertshotel"