From 6f4ba5a1b88225711d2502a29af311d353a927e5 Mon Sep 17 00:00:00 2001 From: Linzolle Date: Sun, 22 Sep 2019 19:47:41 -0500 Subject: [PATCH] make it actually work lol --- code/modules/mob/mob_helpers.dm | 3 --- code/modules/surgery/surgery.dm | 11 ++++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 78b7bc81da..aeeb86ed8e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -489,10 +489,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp //Examine text for traits shared by multiple types. I wish examine was less copypasted. /mob/proc/common_trait_examine() - . = "" - if(HAS_TRAIT(src, TRAIT_DISSECTED)) - . += "This body has been dissected and analyzed. It is no longer worth experimenting on.
" var/dissectionmsg = "" if(HAS_TRAIT_FROM(src, TRAIT_DISSECTED,"Extraterrestrial Dissection")) dissectionmsg = " via Extraterrestrial Dissection. It is no longer worth experimenting on" diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 4ac1c4d246..5504d56310 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -37,7 +37,7 @@ return ..() -/datum/surgery/proc/can_start(mob/user, mob/living) //FALSE to not show in list +/datum/surgery/proc/can_start(mob/user, mob/living/patient) //FALSE to not show in list . = TRUE if(replaced_by == /datum/surgery) return FALSE @@ -65,7 +65,7 @@ return TRUE - var/turf/T = get_turf(target) + var/turf/T = get_turf(patient) var/obj/structure/table/optable/table = locate(/obj/structure/table/optable, T) if(table) if(!table.computer) @@ -143,7 +143,12 @@ /obj/item/disk/surgery/debug/Initialize() . = ..() - surgeries = subtypesof(/datum/surgery/advanced) + surgeries = list() + var/list/req_tech_surgeries = subtypesof(/datum/surgery) + for(var/i in req_tech_surgeries) + var/datum/surgery/beep = i + if(initial(beep.requires_tech)) + surgeries += beep //INFO //Check /mob/living/carbon/attackby for how surgery progresses, and also /mob/living/carbon/attack_hand.