fixes some locate checks being in world (#25365)

This commit is contained in:
GDN
2024-05-10 13:57:30 +00:00
committed by GitHub
parent f28b525e62
commit 110f775d8e
3 changed files with 5 additions and 6 deletions
+3 -3
View File
@@ -96,15 +96,15 @@
/obj/item/pinpointer/proc/scandisk()
if(!the_disk)
the_disk = locate()
the_disk = locate() in GLOB.poi_list
/obj/item/pinpointer/proc/scanbomb()
if(!syndicate)
if(!the_bomb)
the_bomb = locate()
the_bomb = locate() in GLOB.poi_list
else
if(!the_s_bomb)
the_s_bomb = locate()
the_s_bomb = locate() in GLOB.poi_list
/obj/item/pinpointer/proc/point_at_target(atom/target)
if(!target)
+1 -2
View File
@@ -65,8 +65,7 @@
return FALSE
/datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user, obj/item/spellbook/book) //return point value or -1 for failure
var/area/wizard_station/A = locate()
if(!(user in A.contents))
if(!istype(get_area(user), /area/wizard_station))
to_chat(user, "<span class='warning'>You can only refund spells at the wizard lair.</span>")
return -1
if(!S) //This happens when the spell's source is from another spellbook, from loadouts, or adminery, this create a new template temporary spell
+1 -1
View File
@@ -116,7 +116,7 @@
status_tab_data[++status_tab_data.len] = list("Power Stored:", "[blob_points]/[max_blob_points]")
/mob/camera/blob/Move(NewLoc, Dir = 0)
var/obj/structure/blob/B = locate() in range("3x3", NewLoc)
var/obj/structure/blob/B = locate() in range(3, NewLoc)
if(B)
loc = NewLoc
else