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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix up a few bugs with Admin Freeze #29

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Fix up a few bugs with Admin Freeze #29

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/game/objects/effects/overlays.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
name = "adminoverlay"
icon = 'icons/effects/effects.dmi'
icon_state = "admin"
layer = 4.1
layer = ABOVE_ALL_MOB_LAYER

/obj/effect/overlay/vis
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
Expand Down
6 changes: 3 additions & 3 deletions code/modules/admin/verbs/freeze.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms.

/// Created here as a base proc. Override as needed for any type of object or mob you want able to be frozen.
/atom/movable/proc/admin_Freeze(client/admin)
to_chat(admin, "<span class='warning'>Freeze is not able to be called on this type of object.</span")
to_chat(admin, "<span class='warning'>Freeze is not able to be called on this type of object.</span>")
return

///mob freeze procs
Expand All @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms.
GLOB.frozen_atom_list += src

var/obj/effect/overlay/adminoverlay/AO = new
if(skip_overlays)
if(!skip_overlays)
overlays += AO

anchored = TRUE
Expand All @@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms.
else
GLOB.frozen_atom_list -= src

if(skip_overlays)
if(!skip_overlays)
overlays -= frozen

anchored = FALSE
Expand Down