From 4b2083c87675ab95bdb06b7dd5442ce275aa7120 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Fri, 20 Feb 2015 18:50:45 +0000 Subject: [PATCH 1/7] Duty Officer Runtime bugs #384 --- code/WorkInProgress/kilakk/fax.dm | 9 ++++++- code/datums/datumvars.dm | 4 +-- code/game/gamemodes/game_mode.dm | 3 ++- code/game/verbs/ooc.dm | 26 ++++++++++++++++++- code/game/verbs/who.dm | 21 ++++++++++++++- .../admin/permissionverbs/permissionedit.dm | 6 +++-- .../permissionverbs/permsission lists.dm | 1 + code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/pray.dm | 23 +++++++++++++--- code/modules/aurora/duty officer.dm | 16 ++++++++---- code/modules/mob/dead/observer/observer.dm | 10 ++++++- code/modules/mob/say.dm | 3 ++- 12 files changed, 103 insertions(+), 21 deletions(-) diff --git a/code/WorkInProgress/kilakk/fax.dm b/code/WorkInProgress/kilakk/fax.dm index be3c5e6c..1a1409f6 100644 --- a/code/WorkInProgress/kilakk/fax.dm +++ b/code/WorkInProgress/kilakk/fax.dm @@ -179,8 +179,15 @@ var/list/alldepartments = list("Central Command") /proc/Centcomm_fax(var/sent, var/sentname, var/mob/Sender) - var/msg = "\blue CENTCOMM FAX: [key_name(Sender,0,1,0)] (PP) (VV) (SM) (JMP) (CA) (RPLY): Receiving '[sentname]' via secure connection ... view message" for(var/client/C in admins) + var/msg = "\blue CENTCOMM FAX: " + if(C.holder.rights & (R_ADMIN|R_FUN|R_MOD)) + msg += "[key_name(Sender,1)] (PP) (VV) (SM) (JMP) (CA)" + else + msg += "[key_name(Sender,0,1,0)]" + + msg += " (RPLY): Receiving '[sentname]' via secure connection ... view message" + if(C.holder.rights & (R_ADMIN|R_DUTYOFF|R_FUN)) C << msg diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 60511952..e81260d4 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -419,9 +419,7 @@ client if( (usr.client != src) || !src.holder ) return if(href_list["Vars"]) - if(!holder.rights & (R_ADMIN|R_MOD|R_FUN|R_DEV)) - usr << "This can only be used on instances of type /mob" - debug_variables(locate(href_list["Vars"])) + debug_variables(locate(href_list["Vars"])) //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). else if(href_list["rename"]) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0932b1fc..b4f69084 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -479,7 +479,8 @@ proc/display_roundstart_logout_report() for(var/mob/M in mob_list) if(M.client && M.client.holder) - M << msg + if(M.client.holder.rights & (R_ADMIN|R_MOD|R_DEV)) + M << msg proc/get_nt_opposed() diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 28edeb4c..76b91a15 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -40,6 +40,16 @@ var/global/normal_ooc_colour = "#002eb8" return if(holder) + if(holder.rights & R_DUTYOFF && !(holder.rights & (R_ADMIN|R_MOD|R_DEV))) + if(!ooc_allowed) + src << "\red OOC is globally muted" + return + if(!dooc_allowed && (mob.stat == DEAD)) + usr << "\red OOC for dead mobs has been turned off." + return + if(prefs.muted & MUTE_OOC) + src << "\red You cannot use OOC (muted)." + return if(holder.rights & R_DEV && !(holder.rights & R_ADMIN)) if(!ooc_allowed && !ooc_dev_allowed) src << "\red OOC is muted for developers" @@ -147,6 +157,19 @@ var/global/normal_ooc_colour = "#002eb8" return if(holder) + msg_scopes("holder") + if(holder.rights & R_DUTYOFF && !(holder.rights & (R_ADMIN|R_MOD|R_DEV))) + msg_scopes("holder 1") + if(!looc_allowed) + src << "\red LOOC is muted." + return + if(!dooc_allowed && (mob.stat == DEAD)) + usr << "\red OOC for dead mobs has been turned off." + return + if(prefs.muted & MUTE_OOC) + src << "\red You cannot use OOC (muted)." + return + msg_scopes("holder 2") if(holder.rights & R_DEV && !(holder.rights & R_ADMIN)) if(!looc_allowed && !looc_dev_allowed) src << "\red LOOC is muted for developers" @@ -177,7 +200,8 @@ var/global/normal_ooc_colour = "#002eb8" display_name = holder.fakekey C << "LOOC: [display_name]: [msg]" for(var/client/C in admins) - if(C.holder.rights & R_DUTYOFF && (!C.holder.rights & (R_ADMIN|R_MOD|R_DEV))) + if(!C.holder.rights & (R_ADMIN|R_MOD|R_DEV)) + msg_scopes("holder 4") continue if(C.prefs.toggles & CHAT_LOOC) var/prefix = "(R)LOOC" diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index a87caf20..df5febed 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -50,6 +50,8 @@ var/modmsg = "" var/devmsg = "" var/eventmsg = "" + var/dutymsg = "" + var/num_duty_online = 0 var/num_devs_online = 0 var/num_mods_online = 0 var/num_event_online = 0 @@ -120,6 +122,20 @@ devmsg += " (AFK)" devmsg += "\n" num_devs_online++ + else if(R_DUTYOFF & C.holder.rights && !(C.holder.rights & (R_ADMIN|R_MOD))) + dutymsg += "\t[C]" + + if(isobserver(C.mob)) + devmsg += " - Observing" + else if(istype(C.mob,/mob/new_player)) + devmsg += " - Lobby" + else + devmsg += " - Playing" + + if(C.is_afk()) + devmsg += " (AFK)" + devmsg += "\n" + num_duty_online++ else for(var/client/C in admins) @@ -141,5 +157,8 @@ if(num_event_online) eventwho += "\n Current Event Hosts([num_event_online]):\n" + eventmsg - msg = "Current Admins ([num_admins_online]):\n" + msg + "\n Current Moderators([num_mods_online]):\n" + modmsg + eventwho + "\n Current Developers([num_devs_online]):\n" + devmsg + if(num_duty_online) + dutymsg = "\n Current Duty Officers([num_event_online]):\n" + dutymsg + + msg = "Current Admins ([num_admins_online]):\n" + msg + "\n Current Moderators([num_mods_online]):\n" + modmsg + eventwho + "\n Current Developers([num_devs_online]):\n" + devmsg + dutymsg src << msg \ No newline at end of file diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index a52e289d..be0509d4 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -80,9 +80,9 @@ var/flags switch(new_rank) if("Head Developer") - flags = 32767 + flags = 65535 if("Head Admin") - flags = 32767 + flags = 65535 if("Primary Admin") flags = 8191 if("Secondary Admin") @@ -97,6 +97,8 @@ flags = 5672 if("Retired Admin") flags = 8194 + if("Duty Officer") + flags = 32768 else flags = 0 diff --git a/code/modules/admin/permissionverbs/permsission lists.dm b/code/modules/admin/permissionverbs/permsission lists.dm index 653994ea..252e9b90 100644 --- a/code/modules/admin/permissionverbs/permsission lists.dm +++ b/code/modules/admin/permissionverbs/permsission lists.dm @@ -393,6 +393,7 @@ var/list/admin_verbs_hideable = list( var/list/admin_verbs_duty = list( /client/proc/spawn_duty_officer, + /client/proc/cmd_admin_create_centcom_report, /client/proc/cmd_duty_say, /client/verb/returntobody ) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index c88e92a6..5788619c 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -155,7 +155,7 @@ if(admin_ranks.len) new_rank = input("Please select a rank", "New rank", null, null) as null|anything in (admin_ranks|"*New Rank*") else - new_rank = input("Please select a rank", "New rank", null, null) as null|anything in list("Head Developer","Head Admin", "Primary Admin", "Secondary Admin", "Moderator", "Trial Moderator", "Event Host - Moderator", "Event Host", "Retired Admin", "*New Rank*") + new_rank = input("Please select a rank", "New rank", null, null) as null|anything in list("Head Developer","Head Admin", "Primary Admin", "Secondary Admin", "Moderator", "Trial Moderator", "Event Host - Moderator", "Event Host", "Retired Admin", "Duty Officer", "*New Rank*") var/rights = 0 if(D) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 090625b5..776c5355 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -30,13 +30,28 @@ //Stealing the second var because why not) /proc/Centcomm_announce(var/text , var/mob/Sender , var/silicon = 0 , var/iamessage) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) + var/modmin = " (PP) (VV) (SM) (JMP) (CA) (BSA)" + var/msg_start = "\blue CENTCOMM" + var/msg_end = "" + if(silicon) - msg = "\blue CENTCOMM(A.L.I.C.E.):[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg_start += "(A.L.I.C.E.):" + msg_end = "(RPLY): [msg]" else - msg = "\blue CENTCOMM[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" + msg_start += "[iamessage ? " IA" : ""]:" + msg_end = "(RPLY): [msg]" + for(var/client/C in admins) - if(C.holder.rights & (R_ADMIN|R_DUTYOFF|R_FUN)) - C << msg + if(C.holder.rights & (R_ADMIN|R_MOD|R_FUN)) + if(C.holder.rights & R_MOD && !C.holder.rights & R_DUTYOFF) + continue + C << "[msg_start][key_name(Sender, 1)][modmin][msg_end]" + continue + if(C.holder.rights & (R_DUTYOFF)) + if(C.holder.rights & R_MOD) + C << "[msg_start][key_name(Sender, 1)][msg_end]" + else + C << "[msg_start][key_name(Sender, 0, 1, 0)][msg_end]" /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) diff --git a/code/modules/aurora/duty officer.dm b/code/modules/aurora/duty officer.dm index f0ddb525..4702a0d0 100644 --- a/code/modules/aurora/duty officer.dm +++ b/code/modules/aurora/duty officer.dm @@ -16,12 +16,14 @@ src << "\red The game hasn't started yet!" return - if(mob.mind.special_role == "Duty Officer") + if(mob.mind && mob.mind.special_role == "Duty Officer") src << "\red You are already a Duty Officer" return + var/wasLiving = 0 if(istype(mob, /mob/living)) holder.original_mob = mob + wasLiving = 1 for (var/obj/effect/landmark/L in landmarks_list) if(L.name == "DutyOfficer") @@ -102,13 +104,16 @@ M.mind = new M.mind.current = M M.mind.original = M - M.mind.admin_mob_placeholder = mob + if(wasLiving) + M.mind.admin_mob_placeholder = mob M.mind.assigned_role = "Central Command Duty Officer" M.mind.special_role = "Duty Officer" M.loc = L.loc M.key = key - spawn(1) - holder.original_mob.key = "@[key]" + + if(wasLiving) + spawn(1) + holder.original_mob.key = "@[key]" M.equip_if_possible(new /obj/item/clothing/under/rank/centcom/officer(M), slot_w_uniform) M.equip_if_possible(new /obj/item/clothing/shoes/centcom(M), slot_shoes) @@ -145,7 +150,7 @@ if(!check_rights(0)) return - if(mob.mind.special_role != "Duty Officer") + if(!mob.mind || mob.mind.special_role != "Duty Officer") verbs -= /client/verb/returntobody return @@ -162,6 +167,7 @@ verbs -= /client/verb/returntobody return holder.original_mob.key = key + holder.original_mob = null else if(mob.mind.admin_mob_placeholder) mob.mind.admin_mob_placeholder.key = key diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index eab7dc34..3a3f6cdd 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -173,6 +173,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return //didn't want to ghost after-all + if(client.holder && mind.special_role == "DutyOfficer") + client.holder.original_mob = null + var/mob/dead/observer/ghost = ghostize(0) + ghost.timeofdeath = world.time + mind.admin_mob_placeholder = null + del(src) + return + resting = 1 var/turf/location = get_turf(src) message_admins("[key_name_admin(usr)] has ghosted. (JMP)") @@ -243,7 +251,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp usr << "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you." return mind.current.ajourn=0 - if(mind.current == client.holder.original_mob) + if(client.holder && mind.current == client.holder.original_mob) client.holder.original_mob = null mind.current.key = key return 1 diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index c7a968a1..ad2e5977 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -63,7 +63,8 @@ continue if(M.client && M.client.holder && (M.client.prefs.toggles & CHAT_DEAD) ) // Show the message to admins/mods with deadchat toggled on - M << rendered //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not. + if(M.client.holder.rights & (R_MOD|R_ADMIN|R_DEV|R_FUN)) + M << rendered //Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not. return From 85ae2372b13878dcb843715f437ccb7ef7e185c9 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Fri, 20 Feb 2015 20:38:44 +0000 Subject: [PATCH 2/7] Wrong var --- code/game/verbs/who.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index df5febed..aa81c91c 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -126,15 +126,15 @@ dutymsg += "\t[C]" if(isobserver(C.mob)) - devmsg += " - Observing" + dutymsg += " - Observing" else if(istype(C.mob,/mob/new_player)) - devmsg += " - Lobby" + dutymsg += " - Lobby" else - devmsg += " - Playing" + dutymsg += " - Playing" if(C.is_afk()) - devmsg += " (AFK)" - devmsg += "\n" + dutymsg += " (AFK)" + dutymsg += "\n" num_duty_online++ else From 45b0d82d89a3a49cd417397c2c18964f40954854 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Fri, 20 Feb 2015 22:13:40 +0000 Subject: [PATCH 3/7] Gear update --- code/modules/client/preferences_gear.dm | 40 +++++++++++-------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index aeb675b1..e44a2bba 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -14,12 +14,6 @@ proc/populate_gear_list() var/whitelisted //Term to check the whitelist for.. //Standard gear datums. -/* -/datum/gear/cards - display_name = "deck of cards" - path = /obj/item/weapon/deck - cost = 2*/ - /datum/gear/dice display_name = "d20" path = /obj/item/weapon/dice/d20 @@ -35,7 +29,6 @@ proc/populate_gear_list() path = /obj/item/weapon/storage/wallet cost = 2 - /datum/gear/comb display_name = "purple comb" path = /obj/item/weapon/fluff/cado_keppel_1 @@ -186,28 +179,28 @@ proc/populate_gear_list() /datum/gear/labcoat display_name = "labcoat" path = /obj/item/clothing/suit/storage/labcoat - cost = 3 + cost = 2 // slot = slot_wear_suit /datum/gear/bluescrubs display_name = "blue scrubs" path = /obj/item/clothing/under/rank/medical/blue - cost = 1 + cost = 3 /datum/gear/purplescrubs display_name = "purple scrubs" path = /obj/item/clothing/under/rank/medical/purple - cost = 1 + cost = 3 /datum/gear/greenscrubs display_name = "green scrubs" path = /obj/item/clothing/under/rank/medical/green - cost = 1 + cost = 3 /datum/gear/surgeryapron display_name = "surgical apron" path = /obj/item/clothing/suit/apron/surgery - cost = 1 + cost = 2 /datum/gear/sandal @@ -219,7 +212,7 @@ proc/populate_gear_list() /datum/gear/work_boots display_name = "work boots" path = /obj/item/clothing/shoes/work_boots - cost = 1 + cost = 2 /datum/gear/leather display_name = "leather shoes" @@ -272,13 +265,13 @@ proc/populate_gear_list() /datum/gear/green_gloves display_name = "green gloves" path = /obj/item/clothing/gloves/green - cost = 2 + cost = 1 // slot = slot_gloves /datum/gear/white_gloves display_name = "white gloves" path = /obj/item/clothing/gloves/white - cost = 2 + cost = 1 // slot = slot_gloves /datum/gear/black_shoes @@ -338,7 +331,7 @@ proc/populate_gear_list() /datum/gear/jackboots display_name = "jackboots" path = /obj/item/clothing/shoes/jackboots - cost = 3 + cost = 2 // slot = slot_shoes /datum/gear/webbing @@ -455,7 +448,6 @@ proc/populate_gear_list() path = /obj/item/clothing/under/lawyer/oldman cost = 3 - //Security /datum/gear/security display_name = "Security HUD" @@ -495,22 +487,26 @@ proc/populate_gear_list() // slot = slot_head allowed_roles = list("Security Officer","Head of Security","Warden") +/* +// Disabled until there is an alt-uniform for each department +// Uniforms cost 3 points. + /datum/gear/formal_uni display_name = "formal officer's uniform" path = /obj/item/clothing/under/rank/security/formal - cost = 1 + cost = 3 allowed_roles = list("Security Officer") /datum/gear/formal_cap display_name = "officer's formal cap" path = /obj/item/clothing/head/helmet/secfcap - cost = 1 + cost = 2 allowed_roles = list("Security Officer","Head of Security","Warden") /datum/gear/formal_uniw display_name = "formal warden's uniform" path = /obj/item/clothing/under/rank/warden/formal - cost = 1 + cost = 3 allowed_roles = list("Warden") /datum/gear/formal_jacketw @@ -522,7 +518,7 @@ proc/populate_gear_list() /datum/gear/formal_unihos display_name = "formal Head of Security's uniform" path = /obj/item/clothing/under/rank/head_of_security/formal - cost = 1 + cost = 3 allowed_roles = list("Head of Security") /datum/gear/formal_jackethos @@ -530,7 +526,7 @@ proc/populate_gear_list() path = /obj/item/clothing/suit/armor/hos/formal cost = 2 allowed_roles = list("Head of Security") - +*/ //Engineering /datum/gear/eng_beret From 0b2c9f0fc53517c581e968397a3198fbf4b966b5 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Fri, 20 Feb 2015 22:44:39 +0000 Subject: [PATCH 4/7] Voting restrictions --- code/controllers/voting.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 7bc96b0c..23bac99c 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -312,15 +312,16 @@ datum/controller/vote proc/interface(var/client/C) if(!C) return - var/admin = 0 var/trialmin = 0 + var/modmin = 0 var/funmin = 0 if(C.holder) - admin = 1 if(C.holder.rights & R_ADMIN) trialmin = 1 else if(C.holder.rights & R_FUN) funmin = 1 + else if(C.holder.rights & R_MOD) + modmin = 1 voting |= C . = "Voting Panel" @@ -337,7 +338,7 @@ datum/controller/vote . += "
  • [choices[i]] ([votes] votes)
    • " . += "
    " - if(admin) + if(trialmin||modmin) . += "(Cancel Vote) " else . += "

    Start a vote:

    • " @@ -379,7 +380,7 @@ datum/controller/vote usr << browse(null, "window=vote") return if("cancel") - if(usr.client.holder) + if(usr.client.holder & (R_ADMIN|R_MOD)) reset() if("toggle_restart") if(usr.client.holder) From 97295fbb83f3036db488f8e273b20c3b17446759 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sat, 21 Feb 2015 03:17:37 +0000 Subject: [PATCH 5/7] -debugs --- code/game/verbs/ooc.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 76b91a15..a29ba007 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -157,9 +157,7 @@ var/global/normal_ooc_colour = "#002eb8" return if(holder) - msg_scopes("holder") if(holder.rights & R_DUTYOFF && !(holder.rights & (R_ADMIN|R_MOD|R_DEV))) - msg_scopes("holder 1") if(!looc_allowed) src << "\red LOOC is muted." return @@ -169,7 +167,6 @@ var/global/normal_ooc_colour = "#002eb8" if(prefs.muted & MUTE_OOC) src << "\red You cannot use OOC (muted)." return - msg_scopes("holder 2") if(holder.rights & R_DEV && !(holder.rights & R_ADMIN)) if(!looc_allowed && !looc_dev_allowed) src << "\red LOOC is muted for developers" @@ -201,7 +198,6 @@ var/global/normal_ooc_colour = "#002eb8" C << "LOOC: [display_name]: [msg]" for(var/client/C in admins) if(!C.holder.rights & (R_ADMIN|R_MOD|R_DEV)) - msg_scopes("holder 4") continue if(C.prefs.toggles & CHAT_LOOC) var/prefix = "(R)LOOC" From 70b5c0f315f419cfa2ad9cd130ccec1adb1ae470 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sat, 21 Feb 2015 03:40:14 +0000 Subject: [PATCH 6/7] It's not a verb it's a proc --- .../modules/admin/permissionverbs/permsission lists.dm | 2 +- code/modules/aurora/duty officer.dm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/permissionverbs/permsission lists.dm b/code/modules/admin/permissionverbs/permsission lists.dm index 252e9b90..49001093 100644 --- a/code/modules/admin/permissionverbs/permsission lists.dm +++ b/code/modules/admin/permissionverbs/permsission lists.dm @@ -395,7 +395,7 @@ var/list/admin_verbs_duty = list( /client/proc/spawn_duty_officer, /client/proc/cmd_admin_create_centcom_report, /client/proc/cmd_duty_say, - /client/verb/returntobody + /client/proc/returntobody ) /client/proc/add_admin_verbs() diff --git a/code/modules/aurora/duty officer.dm b/code/modules/aurora/duty officer.dm index 4702a0d0..9a104d65 100644 --- a/code/modules/aurora/duty officer.dm +++ b/code/modules/aurora/duty officer.dm @@ -140,10 +140,10 @@ W.registered_name = M.real_name M.equip_if_possible(W, slot_wear_id) - verbs += /client/verb/returntobody + verbs += /client/proc/returntobody break -/client/verb/returntobody() +/client/proc/returntobody() set name = "Return to mob" set desc = "The Duty is done, return to your original mob" set category = "Special Verbs" @@ -151,7 +151,7 @@ if(!check_rights(0)) return if(!mob.mind || mob.mind.special_role != "Duty Officer") - verbs -= /client/verb/returntobody + verbs -= /client/proc/returntobody return if(!holder) return @@ -164,7 +164,7 @@ if(holder.original_mob) if(holder.original_mob == M) - verbs -= /client/verb/returntobody + verbs -= /client/proc/returntobody return holder.original_mob.key = key holder.original_mob = null @@ -174,5 +174,5 @@ mob.mind.admin_mob_placeholder = null else mob.ghostize(0) - verbs -= /client/verb/returntobody + verbs -= /client/proc/returntobody del(M) \ No newline at end of file From b960ca64ab2f6a36e26a05e1a7602303b3505f59 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sat, 21 Feb 2015 04:31:01 +0000 Subject: [PATCH 7/7] Final things --- code/game/verbs/ooc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index a29ba007..3fe441f5 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -40,7 +40,7 @@ var/global/normal_ooc_colour = "#002eb8" return if(holder) - if(holder.rights & R_DUTYOFF && !(holder.rights & (R_ADMIN|R_MOD|R_DEV))) + if(holder.rights & R_DUTYOFF && !(holder.rights & (R_ADMIN|R_MOD|R_DEV|R_FUN))) if(!ooc_allowed) src << "\red OOC is globally muted" return @@ -191,7 +191,7 @@ var/global/normal_ooc_colour = "#002eb8" var/display_name = src.key if(holder) if(holder.fakekey) - if(C.holder && C.holder.rights & (R_ADMIN|R_MOD|R_DEV)) + if(C.holder && C.holder.rights & (R_ADMIN|R_MOD)) display_name = "[holder.fakekey]/([src.key])" else display_name = holder.fakekey