From c1187d194266c7a4945900b7008c5b839eedce2c Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 17 Jun 2022 20:01:03 -0400 Subject: [PATCH 1/4] Various Fixes --- .../structures/crates_lockers/crates.dm | 4 ++- code/modules/admin/admin_verbs.dm | 28 ++++++++++++++++++- code/modules/admin/topic.dm | 2 +- code/modules/tgui/modules/rcon.dm | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 45cb599429..330c4e4046 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -90,7 +90,9 @@ src.set_dir(turn(src.dir, 90)) /obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(opened) + if(W.is_wrench() && istype(src,/obj/structure/closet/crate/bin)) + return ..() + else if(opened) if(isrobot(user)) return if(W.loc != user) // This should stop mounted modules ending up outside the module. diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 3207e293a5..8ac3aa411a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -35,11 +35,24 @@ set category = "Admin" set name = "Aghost" if(!holder) return + + var/build_mode + if(src.buildmode) + build_mode = tgui_alert(src, "You appear to be currently in buildmode. Do you want to re-enter buildmode after aghosting?", "Buildmode", list("Yes", "No")) + if(build_mode != "Yes") + to_chat(src, "Will not re-enter buildmode after switch.") + if(istype(mob,/mob/observer/dead)) //re-enter var/mob/observer/dead/ghost = mob if(ghost.can_reenter_corpse) - ghost.reenter_corpse() + if(build_mode) + togglebuildmode(mob) + ghost.reenter_corpse() + if(build_mode == "Yes") + togglebuildmode(mob) + else + ghost.reenter_corpse() else to_chat(ghost, "Error: Aghost: Can't reenter corpse.") return @@ -51,9 +64,22 @@ else //ghostize var/mob/body = mob +<<<<<<< HEAD var/mob/observer/dead/ghost = body.ghostize(1) ghost.admin_ghosted = 1 log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. +======= + var/mob/observer/dead/ghost + if(build_mode) + togglebuildmode(body) + ghost = body.ghostize(1) + ghost.admin_ghosted = 1 + if(build_mode == "Yes") + togglebuildmode(ghost) + else + ghost = body.ghostize(1) + ghost.admin_ghosted = 1 +>>>>>>> 2c7c9c3fec... Merge pull request #13094 from ItsSelis/rcon-fix if(body) body.teleop = ghost if(!body.key) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 157cc8c25c..a81353c1d3 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -151,7 +151,7 @@ switch(new_rank) if(null,"") return if("*New Rank*") - new_rank = input(usr, "Please input a new rank", "New custom rank", null, null) as null|text + new_rank = input(usr, "Please input a new rank", "New custom rank") as null|text if(config.admin_legacy_system) new_rank = ckeyEx(new_rank) if(!new_rank) diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm index 624b353c4b..0a29153d76 100644 --- a/code/modules/tgui/modules/rcon.dm +++ b/code/modules/tgui/modules/rcon.dm @@ -40,7 +40,7 @@ smes_data["RCON_tag"] = SMES.RCon_tag smeslist.Add(list(smes_data)) - data["pages"] = number_pages + data["pages"] = number_pages + 1 data["current_page"] = current_page data["smes_info"] = sortByKey(smeslist, "RCON_tag") From d8d0af1e83f90962b90df57a457bf21d398f5f48 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 22 Jun 2022 19:42:55 -0400 Subject: [PATCH 2/4] powder that makes you say yes --- code/modules/admin/admin_verbs.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 8ac3aa411a..42e15662cb 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -64,11 +64,9 @@ else //ghostize var/mob/body = mob -<<<<<<< HEAD var/mob/observer/dead/ghost = body.ghostize(1) ghost.admin_ghosted = 1 log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. -======= var/mob/observer/dead/ghost if(build_mode) togglebuildmode(body) @@ -79,7 +77,6 @@ else ghost = body.ghostize(1) ghost.admin_ghosted = 1 ->>>>>>> 2c7c9c3fec... Merge pull request #13094 from ItsSelis/rcon-fix if(body) body.teleop = ghost if(!body.key) @@ -564,4 +561,4 @@ T.spell_list += new S feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].") - message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1) \ No newline at end of file + message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1) From f0cab18ac0240eacc1e9b80c09ced4dc48740d0d Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 22 Jun 2022 19:43:44 -0400 Subject: [PATCH 3/4] powder that makes you say yes --- code/modules/admin/admin_verbs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 42e15662cb..a7a6e1a320 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -67,7 +67,6 @@ var/mob/observer/dead/ghost = body.ghostize(1) ghost.admin_ghosted = 1 log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. - var/mob/observer/dead/ghost if(build_mode) togglebuildmode(body) ghost = body.ghostize(1) From 74ea61bda1af9bbbe4657ea8649f222d7d56771f Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 22 Jun 2022 19:58:33 -0400 Subject: [PATCH 4/4] powder that makes you say yes --- code/modules/admin/admin_verbs.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a7a6e1a320..7966ec2939 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -64,18 +64,18 @@ else //ghostize var/mob/body = mob - var/mob/observer/dead/ghost = body.ghostize(1) - ghost.admin_ghosted = 1 - log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. + var/mob/observer/dead/ghost if(build_mode) togglebuildmode(body) ghost = body.ghostize(1) ghost.admin_ghosted = 1 + log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. if(build_mode == "Yes") togglebuildmode(ghost) else ghost = body.ghostize(1) ghost.admin_ghosted = 1 + log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging. if(body) body.teleop = ghost if(!body.key)