Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

In-view verbs work for varying view ranges #6591

Merged
merged 1 commit into from
Jul 3, 2024
Merged

In-view verbs work for varying view ranges #6591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/admin/callproc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
to_chat(usr, SPAN_BOLDWARNING("Warning: Force attempt has been logged."))
message_admins("[key_name(usr)] has attempted to execute a restricted proc. ([procname])")

/client/proc/callproc_datum(datum/called_datum as null|area|mob|obj|turf)
/client/proc/callproc_datum(datum/called_datum as null|area|mob|obj|turf in view(src))
set category = "Debug"
set name = "Datum ProcCall"
set waitfor = FALSE
Expand Down
10 changes: 5 additions & 5 deletions code/modules/admin/tabs/admin_tab.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
if(tgui_alert(src, "Do you want to strip yourself as well?", "Confirmation", list("Yes", "No")) == "Yes")
strip_self = TRUE

for(var/mob/living/current_mob in view())
for(var/mob/living/current_mob in view(src))
if(!strip_self && usr == current_mob)
continue
for (var/obj/item/current_item in current_mob)
Expand All @@ -458,7 +458,7 @@
if(alert("This will rejuvenate ALL mobs within your view range. Are you sure?",,"Yes","Cancel") == "Cancel")
return

for(var/mob/living/M in view())
for(var/mob/living/M in view(src))
M.rejuvenate(FALSE)

message_admins(WRAP_STAFF_LOG(usr, "ahealed everyone in [get_area(usr)] ([usr.x],[usr.y],[usr.z])."), usr.x, usr.y, usr.z)
Expand All @@ -476,7 +476,7 @@
if(alert("This will rejuvenate ALL humans within your view range. Are you sure?",,"Yes","Cancel") == "Cancel")
return

for(var/mob/living/carbon/human/M in view())
for(var/mob/living/carbon/human/M in view(src))
M.rejuvenate(FALSE)

message_admins(WRAP_STAFF_LOG(usr, "ahealed all humans in [get_area(usr)] ([usr.x],[usr.y],[usr.z])"), usr.x, usr.y, usr.z)
Expand All @@ -493,7 +493,7 @@
if(alert("This will rejuvenate ALL revivable humans within your view range. Are you sure?",,"Yes","Cancel") == "Cancel")
return

for(var/mob/living/carbon/human/M in view())
for(var/mob/living/carbon/human/M in view(src))
if(!ishuman_strict(M) && !ishumansynth_strict(M))
continue

Expand All @@ -519,7 +519,7 @@
if(alert("This will rejuvenate ALL xenos within your view range. Are you sure?",,"Yes","Cancel") == "Cancel")
return

for(var/mob/living/carbon/xenomorph/X in view())
for(var/mob/living/carbon/xenomorph/X in view(src))
X.rejuvenate(FALSE)

message_admins(WRAP_STAFF_LOG(usr, "ahealed all xenos in [get_area(usr)] ([usr.x],[usr.y],[usr.z])"), usr.x, usr.y, usr.z)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/freeforghosts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
if(alert("This will free ALL mobs within your view range. Are you sure?",,"Yes","Cancel") == "Cancel")
return

for(var/mob/living/M in view())
for(var/mob/living/M in view(src))
free_for_ghosts(M, notify = FALSE)

message_admins(WRAP_STAFF_LOG(usr, "freed all mobs in [get_area(usr)] ([usr.x],[usr.y],[usr.z])"), usr.x, usr.y, usr.z)
8 changes: 4 additions & 4 deletions code/modules/admin/verbs/mob_verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
else
return

/client/proc/cmd_admin_object_narrate(obj/selected)
/client/proc/cmd_admin_object_narrate(obj/selected in view(src))
set name = "Object Narrate"
set category = null

Expand Down Expand Up @@ -234,7 +234,7 @@
log_admin("[key_name(src)] sent an Object Narrate with message [message].")
message_admins("[key_name(src)] sent an Object Narrate with message [message].")

/client/proc/cmd_admin_direct_narrate(mob/M)
/client/proc/cmd_admin_direct_narrate(mob/M in GLOB.mob_list)
set name = "Narrate"
set category = null

Expand Down Expand Up @@ -330,7 +330,7 @@

message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!")

/client/proc/cmd_admin_change_their_hivenumber(mob/living/carbon/H)
/client/proc/cmd_admin_change_their_hivenumber(mob/living/carbon/H in GLOB.living_mob_list)
set name = "Change Hivenumber"
set category = null

Expand Down Expand Up @@ -370,7 +370,7 @@
message_admins("[key_name(src)] changed hivenumber of [H] to [H.hivenumber].")


/client/proc/cmd_admin_change_their_name(mob/living/carbon/carbon)
/client/proc/cmd_admin_change_their_name(mob/living/carbon/carbon in GLOB.living_mob_list)
set name = "Change Name"
set category = null

Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/select_equipment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
var/datum/job/J = GLOB.RoleAuthority.roles_by_name[newskillset]
H.set_skills(J.get_skills())

/client/proc/cmd_admin_dress(mob/M)
/client/proc/cmd_admin_dress(mob/M in GLOB.mob_list)
set category = null
set name = "Select Equipment"

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/dead/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
usr.forceMove(pick(L))
following = null

/mob/dead/observer/proc/scan_health(mob/living/target in view(src.client))
/mob/dead/observer/proc/scan_health(mob/living/target in GLOB.living_mob_list)
set name = "Scan Health"

if(!istype(target))
Expand Down Expand Up @@ -695,7 +695,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
last_health_display.target_mob = target
last_health_display.look_at(src, DETAIL_LEVEL_FULL, bypass_checks = TRUE)

/mob/dead/observer/verb/follow_local(mob/target)
/mob/dead/observer/verb/follow_local(mob/target in GLOB.mob_list)
set category = "Ghost.Follow"
set name = "Follow Local Mob"
set desc = "Follow on-screen mob"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list(
* [this byond forum post](https://secure.byond.com/forum/?post=1326139&page=2#comment8198716)
* for why this isn't atom/verb/examine()
*/
/mob/verb/examinate(atom/examinify as mob|obj|turf in view())
/mob/verb/examinate(atom/examinify as mob|obj|turf in view(client))
set name = "Examine"
set category = "IC"

Expand Down
Loading