From bcc351ed6f190bd2fd12c0a0c5807c903816a12e Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:29:32 -0500 Subject: [PATCH] misc fixes my beloved (#23327) --- code/datums/outfits/outfit_debug.dm | 32 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index 25656e06584..28460989c29 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -26,9 +26,9 @@ toggle_helmet = TRUE cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/surgery/advanced, + /obj/item/organ/internal/cyberimp/arm/surgery/debug, /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, - /obj/item/organ/internal/cyberimp/arm/janitorial/advanced + /obj/item/organ/internal/cyberimp/arm/janitorial/debug ) @@ -144,20 +144,34 @@ righthand_file = 'icons/mob/inhands/items_righthand.dmi' w_class = WEIGHT_CLASS_SMALL var/datum/species/selected_species - var/valid_species = list() + var/activate_mind = FALSE + +/obj/item/debug/human_spawner/examine(mob/user) + . = ..() + . += "Alt-Click to toggle mind-activation on spawning." /obj/item/debug/human_spawner/afterattack(atom/target, mob/user, proximity) ..() - if(isturf(target)) - var/mob/living/carbon/human/H = new /mob/living/carbon/human(target) - if(selected_species) - H.setup_dna(selected_species.type) + if(!isturf(target)) + return + var/mob/living/carbon/human/H = new /mob/living/carbon/human(target) + if(selected_species) + H.setup_dna(selected_species.type) + if(activate_mind) + H.mind_initialize() /obj/item/debug/human_spawner/attack_self(mob/user) ..() var/choice = input("Select a species", "Human Spawner", null) in GLOB.all_species selected_species = GLOB.all_species[choice] +/obj/item/debug/human_spawner/AltClick(mob/user) + . = ..() + if(!Adjacent(user)) + return + activate_mind = !activate_mind + to_chat(user, "Any humans spawned will [activate_mind ? "" : "not "]spawn with an initialized mind.") + /obj/item/rcd/combat/admin name = "AVD-CNED RCD" max_matter = INFINITY @@ -185,7 +199,7 @@ to_chat(user, "[src] is now set to toolspeed [toolspeed]") playsound(src, 'sound/effects/pop.ogg', 50, 0) //Change the mode -/obj/item/organ/internal/cyberimp/arm/surgery/advanced +/obj/item/organ/internal/cyberimp/arm/surgery/debug name = "AVD-CNED surgical toolset implant" contents = newlist( /obj/item/scalpel/laser/manager/debug, @@ -197,7 +211,7 @@ /obj/item/bodyanalyzer/debug ) -/obj/item/organ/internal/cyberimp/arm/janitorial/advanced +/obj/item/organ/internal/cyberimp/arm/janitorial/debug name = "AVD-CNED janitorial toolset implant... is that a... tazer?" desc = "A set of advanced janitorial tools hidden behind a concealed panel on the user's arm with a tazer? What the fuck." parent_organ = "l_arm" // left arm by default cuz im lazy