From c2f8e1242e3faa8f1f5e3bf779051b0d2869cf49 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 13 Jun 2015 08:44:58 +0200 Subject: [PATCH 1/6] Expands admin jump permissions, cuts down on superfluous feedback. --- code/modules/admin/verbs/adminjump.dm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index e84543e88f4..e579ca15444 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -8,8 +8,7 @@ set name = "Jump to Area" set desc = "Area to jump to" set category = "Admin" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if(config.allow_admin_jump) @@ -25,8 +24,7 @@ /client/proc/jumptoturf(var/turf/T in world) set name = "Jump to Turf" set category = "Admin" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if(config.allow_admin_jump) log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]") @@ -42,8 +40,7 @@ set category = "Admin" set name = "Jump to Mob" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if(config.allow_admin_jump) @@ -65,8 +62,7 @@ set category = "Admin" set name = "Jump to Coordinate" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if (config.allow_admin_jump) @@ -86,8 +82,7 @@ set category = "Admin" set name = "Jump to Key" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if(config.allow_admin_jump) @@ -111,8 +106,7 @@ set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if(config.allow_admin_jump) log_admin("[key_name(usr)] teleported [key_name(M)]") @@ -128,8 +122,7 @@ set name = "Get Key" set desc = "Key to teleport" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return if(config.allow_admin_jump) @@ -155,8 +148,7 @@ /client/proc/sendmob(var/mob/M in sortmobs()) set category = "Admin" set name = "Send Mob" - if(!check_rights(R_ADMIN)) - usr << "Only administrators may use this command." + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) return var/area/A = input(usr, "Pick an area.", "Pick an area") in return_sorted_areas() if(A) From d989df7e8cf1fbdf39621ebd0783e1d60cb3a492 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 13 Jun 2015 09:53:32 +0200 Subject: [PATCH 2/6] Adds the Jump-To-X verbs to the list of debug verbs. --- code/modules/admin/admin_verbs.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f20b04de8a2..6d8abad3cb8 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -163,6 +163,9 @@ var/list/admin_verbs_debug = list( /client/proc/toggledebuglogs, /client/proc/SDQL_query, /client/proc/SDQL2_query, + /client/proc/Jump, + /client/proc/jumptomob, + /client/proc/jumptocoord ) var/list/admin_verbs_paranoid_debug = list( From 9613fae16a348b25ed3d413fbc5e7919ef38d262 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 13 Jun 2015 13:43:51 +0100 Subject: [PATCH 3/6] Wizard suits will now be refitted automatically for non-human wizards --- code/game/gamemodes/wizard/spellbook.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 9b81c622678..23ed522c3e6 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -179,9 +179,13 @@ if("armor") feedback_add_details("wizard_spell_learned","HS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/clothing/shoes/sandal(get_turf(H)) //In case they've lost them. - new /obj/item/clothing/gloves/purple(get_turf(H))//To complete the outfit - new /obj/item/clothing/suit/space/void/wizard(get_turf(H)) - new /obj/item/clothing/head/helmet/space/void/wizard(get_turf(H)) + var/obj/item/clothing/gloves = new /obj/item/clothing/gloves/purple(get_turf(H))//To complete the outfit + var/obj/item/clothing/suit = new /obj/item/clothing/suit/space/void/wizard(get_turf(H)) + var/obj/item/clothing/helmet = new /obj/item/clothing/head/helmet/space/void/wizard(get_turf(H)) + if(H.species.name != "Human") // if they're non-human, refit their suit so they can actually wear it + for(var/obj/item/clothing/C in list(gloves, suit, helmet)) + C.refit_for_species(H.species.name) + C.desc += "\nIt appears to be fitted for [H.species.name]." temp = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." max_uses-- if("staffanimation") From aa3c68d3c2a257eacd744f51a8a5fc5748f5ab81 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 13 Jun 2015 14:12:59 +0100 Subject: [PATCH 4/6] Renames Track-With-Camera to Follow-With-Camera Title. This means both AIs and ghosts can get space-completion for following a specific mob from 'fol', rather than AIs needing 'tra' and ghosts needing 'fol'. --- code/game/machinery/camera/tracking.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 1b3619b5a4a..ca3f0e794f6 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -132,11 +132,11 @@ /mob/living/silicon/ai/proc/ai_camera_track(var/target_name in trackable_mobs()) set category = "AI Commands" - set name = "Track With Camera" + set name = "Follow With Camera" set desc = "Select who you would like to track." if(src.stat == 2) - src << "You can't track with camera because you are dead!" + src << "You can't follow [target_name] with cameras because you are dead!" return if(!target_name) src.cameraFollow = null From 8d0c7039dfef7e7d9d8307f6f293d5e2930efdcd Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 13 Jun 2015 16:43:23 +0100 Subject: [PATCH 5/6] Changes to dsay - Adds dsay to list of +DEBUG verbs - Changes dsay to use holder rank rather than trying to guess from rights --- code/modules/admin/admin_verbs.dm | 3 ++- code/modules/admin/verbs/deadsay.dm | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 6d8abad3cb8..a07b05dec2b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -165,7 +165,8 @@ var/list/admin_verbs_debug = list( /client/proc/SDQL2_query, /client/proc/Jump, /client/proc/jumptomob, - /client/proc/jumptocoord + /client/proc/jumptocoord, + /client/proc/dsay ) var/list/admin_verbs_paranoid_debug = list( diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index bb66843c163..1a68f3016bf 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -18,16 +18,7 @@ if (src.handle_spam_prevention(msg,MUTE_DEADCHAT)) return - var/stafftype = null - - if (src.holder.rights & R_MOD) - stafftype = "MOD" - - if (src.holder.rights & R_MENTOR) - stafftype = "MENTOR" - - if (src.holder.rights & R_ADMIN) - stafftype = "ADMIN" + var/stafftype = uppertext(holder.rank) msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN)) log_admin("[key_name(src)] : [msg]") From 17a84d9dd313531effab748b8d904fcd0c81420b Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 13 Jun 2015 13:33:21 -0400 Subject: [PATCH 6/6] Hotfix for #9235 Hotfix for master --- code/ZAS/Controller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ZAS/Controller.dm b/code/ZAS/Controller.dm index d8cb87a7407..e70de85d1c2 100644 --- a/code/ZAS/Controller.dm +++ b/code/ZAS/Controller.dm @@ -282,7 +282,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun var/space = !istype(B) if(direct && !space) - if(equivalent_pressure(A.zone,B.zone) || current_cycle == 0) + if(min(A.zone.contents.len, B.zone.contents.len) <= 10 || equivalent_pressure(A.zone,B.zone) || current_cycle == 0) merge(A.zone,B.zone) return