Skip to content

Commit

Permalink
Merge branch 'master' into legion-core-change
Browse files Browse the repository at this point in the history
  • Loading branch information
Sun-Soaked authored Nov 14, 2024
2 parents baf8da6 + e7aa119 commit 1cb3c44
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/client/verbs/looc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#6699CC")
log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in LOOC: [msg]")
return
if(mob.stat)
to_chat(src, span_danger("You cannot use LOOC while unconscious or dead."))
if(mob.stat == 4)
to_chat(src, span_danger("You cannot use LOOC while dead."))
return
if(istype(mob, /mob/dead))
to_chat(src, span_danger("You cannot use LOOC while ghosting."))
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-3723.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: Erikafox
changes:
- {code_imp: you can now looc while unconscious/in crit.}
delete-after: true

0 comments on commit 1cb3c44

Please sign in to comment.