defines isspacearea (#25064)

* isspace define

* istype to isspacearea

* paranthesis

* fixes

* I HATE VSCDEV ON MMOBILE
This commit is contained in:
Deniz
2024-04-12 20:44:22 +02:00
committed by GitHub
parent d29b88f81b
commit d88e03c297
8 changed files with 10 additions and 8 deletions
+2
View File
@@ -113,6 +113,8 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
// Areas
//#define isarea(A, B, C...) BYOND proc, can test multiple arguments and only return TRUE if all are areas
#define isspacearea(A) (istype(A, /area/space))
// Structures
#define isstructure(A) (istype((A), /obj/structure))
+1 -1
View File
@@ -561,7 +561,7 @@
if(is_mining_level(user.z) && !is_mining_level(destination.z)) //No effect if you stay on lavaland
actual_selected_rune.handle_portal("lava")
else if(!is_station_level(user.z) || istype(get_area(user), /area/space))
else if(!is_station_level(user.z) || isspacearea(get_area(user)))
actual_selected_rune.handle_portal("space", origin)
if(user == target)
+1 -1
View File
@@ -776,7 +776,7 @@
if(is_mining_level(R.z) && !is_mining_level(actual_selected_rune.z))
actual_selected_rune.handle_portal("lava")
else if(!is_station_level(R.z) || istype(get_area(src), /area/space))
else if(!is_station_level(R.z) || isspacearea(get_area(src)))
actual_selected_rune.handle_portal("space", T)
new /obj/effect/portal/cult(get_turf(R), get_turf(actual_selected_rune), src, 4 MINUTES)
to_chat(user, "<span class='cultitalic'>You use the magic of the amulet to turn [R] into a portal.</span>")
+1 -1
View File
@@ -136,7 +136,7 @@
var/turf/runeturf = get_turf(user)
var/datum/game_mode/gamemode = SSticker.mode
if(ispath(rune, /obj/effect/rune/summon))
if(!is_station_level(runeturf.z) || istype(A, /area/space))
if(!is_station_level(runeturf.z) || isspacearea(A))
to_chat(user, "<span class='cultitalic'>The veil is not weak enough here to summon a cultist, you must be on station!</span>")
return
+2 -2
View File
@@ -511,7 +511,7 @@ structure_check() searches for nearby cultist structures required for the invoca
..()
if(is_mining_level(z) && !is_mining_level(target.z)) //No effect if you stay on lavaland
actual_selected_rune.handle_portal("lava")
else if(!is_station_level(z) || istype(get_area(src), /area/space))
else if(!is_station_level(z) || isspacearea(get_area(src)))
actual_selected_rune.handle_portal("space", T)
user.visible_message("<span class='warning'>There is a sharp crack of inrushing air, and everything above the rune disappears!</span>",
"<span class='cult'>You[moveuser ? "r vision blurs, and you suddenly appear somewhere else":" send everything above the rune away"].</span>")
@@ -907,7 +907,7 @@ structure_check() searches for nearby cultist structures required for the invoca
var/choice = tgui_alert(user, "You tear open a connection to the spirit realm...", "Invoke", list("Summon a Cult Ghost", "Ascend as a Dark Spirit", "Cancel"))
if(choice == "Summon a Cult Ghost")
if(!is_station_level(z) || istype(get_area(src), /area/space))
if(!is_station_level(z) || isspacearea(get_area(src)))
to_chat(user, "<span class='cultitalic'>The veil is not weak enough here to manifest spirits, you must be on station!</span>")
fail_invoke()
log_game("Manifest rune failed - not on station")
@@ -32,7 +32,7 @@
return
if(mount_requirements & MOUNTED_FRAME_NOSPACE)
var/area/my_area = get_area(build_turf)
if(!istype(my_area) || !my_area.requires_power || istype(my_area, /area/space))
if(!istype(my_area) || !my_area.requires_power || isspacearea(my_area))
to_chat(user, "<span class='warning'>[src] cannot be placed in this area.</span>")
return
return TRUE
@@ -266,7 +266,7 @@
nagged = TRUE
/mob/living/simple_animal/bot/floorbot/proc/is_hull_breach(turf/t) // Ignore space tiles not considered part of a structure, also ignores shuttle docking areas.
return !istype(get_area(t), /area/space)
return !isspacearea(get_area(t))
// Floorbots, having several functions, need sort out special conditions here.
/mob/living/simple_animal/bot/floorbot/process_scan(atom/scan_target)
+1 -1
View File
@@ -267,7 +267,7 @@
return ..()
/mob/camera/aiEye/remote/shuttle_docker/setLoc(T)
if(isspaceturf(get_turf(T)) || istype(get_area(T), /area/space) || istype(get_area(T), /area/shuttle))
if(isspaceturf(get_turf(T)) || isspacearea(get_area(T)) || istype(get_area(T), /area/shuttle))
..()
var/obj/machinery/computer/camera_advanced/shuttle_docker/console = origin
console.checkLandingSpot()