Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: harryob <[email protected]>
  • Loading branch information
stanalbatross and harryob authored Aug 1, 2023
1 parent 9848beb commit 3d54b36
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions code/game/machinery/computer/almayer_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@

var/signed = null
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
var/obj/item/card/id/id = H.wear_id
var/mob/living/carbon/human/human_user = usr
var/obj/item/card/id/id = human_user.wear_id
if(istype(id))
var/paygrade = get_paygrades(id.paygrade, FALSE, H.gender)
var/paygrade = get_paygrades(id.paygrade, FALSE, human_user.gender)
signed = "[paygrade] [id.registered_name]"

COOLDOWN_START(src, cooldown_message, COOLDOWN_COMM_MESSAGE)
Expand Down Expand Up @@ -228,9 +228,9 @@
to_chat(usr, SPAN_WARNING("The ship is already undergoing self-destruct procedures!"))
return FALSE

for(var/client/C in GLOB.admins)
if((R_ADMIN|R_MOD) & C.admin_holder.rights)
C << 'sound/effects/sos-morse-code.ogg'
for(var/client/admin_client as anything in GLOB.admins)
if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
admin_client << 'sound/effects/sos-morse-code.ogg'
message_admins("[key_name(usr)] has requested a Distress Beacon! [CC_MARK(usr)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];distress=\ref[usr]'>SEND</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccdeny=\ref[usr]'>DENY</A>) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))

Expand Down Expand Up @@ -259,9 +259,9 @@
to_chat(usr, SPAN_WARNING("The [MAIN_SHIP_NAME]'s self-destruct is already activated."))
return FALSE

for(var/client/C in GLOB.admins)
if((R_ADMIN|R_MOD) & C.admin_holder.rights)
C << 'sound/effects/sos-morse-code.ogg'
for(var/client/admin_client as anything in GLOB.admins)
if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
admin_client << 'sound/effects/sos-morse-code.ogg'
message_admins("[key_name(usr)] has requested Self-Destruct! [CC_MARK(usr)] (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];destroyship=\ref[usr]'>GRANT</A>) (<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];sddeny=\ref[usr]'>DENY</A>) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command."))
COOLDOWN_START(src, cooldown_destruct, COOLDOWN_COMM_DESTRUCT)
Expand Down

0 comments on commit 3d54b36

Please sign in to comment.