From 0fc841f0f99efb1aac18230d1e2aa25b7edcc4df Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 3 Feb 2016 00:40:10 -0500 Subject: [PATCH] can i sleep uyet --- code/_onclick/item_attack.dm | 2 ++ code/modules/projectiles/guns/mounted.dm | 4 ++-- code/modules/surgery/helpers.dm | 4 ++-- code/modules/surgery/limb_reattach.dm | 9 --------- code/modules/surgery/organs/organ_internal.dm | 5 +++-- code/modules/surgery/organs_internal.dm | 3 +-- 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index ee2d7c56cf7..b766acb1300 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -38,6 +38,8 @@ if(!attempt_initiate_surgery(src, M, user)) return 0 if(is_sharp(src)) + if( isslime(M) && !attempt_initiate_surgery(src, M, user)) + return 0 if(!attempt_initiate_surgery(src, M, user)) return 0 return diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm index d8060391cf5..5183998cdc1 100644 --- a/code/modules/projectiles/guns/mounted.dm +++ b/code/modules/projectiles/guns/mounted.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/gun/advtaser/mounted +/obj/item/weapon/gun/energy/advtaser/mounted name = "mounted taser" desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots." icon_state = "armcannonstun" @@ -11,7 +11,7 @@ w_class = 5.0 can_flashlight = 0 -/obj/item/weapon/gun/energy/gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow... +/obj/item/weapon/gun/energy/advtaser/mounted/dropped()//if somebody manages to drop this somehow... src.loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases. /obj/item/weapon/gun/energy/laser/mounted diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index b5aeb2a61e2..f8fad583f34 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -8,7 +8,7 @@ H = M affecting = H.get_organ(check_zone(selected_zone)) - if(can_operate(H) || isslime(M) ||isalien(M)) //if they're prone or a slime + if(isslime(M) ||isalien(M) ||can_operate(H)) //if they're prone or a slime var/datum/surgery/current_surgery for(var/datum/surgery/S in M.surgeries) @@ -56,7 +56,7 @@ "You prepare to operate on [M]'s [parse_zone(selected_zone)].") else if(!current_surgery.step_in_progress) - if(current_surgery.status == 0 || current_surgery.status == 1 ) + if(current_surgery.status == 1 ) M.surgeries -= current_surgery user << "You stop the surgery." qdel(current_surgery) diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 797c4172fa6..883d090b6b5 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -13,8 +13,6 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) - if(!affected) - return 0 if(affected && (affected.status && ORGAN_DESTROYED)) return 0 if(affected.is_stump()) @@ -32,9 +30,6 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) - - if(!affected) - return 1 if(affected && (affected.status && ORGAN_DESTROYED)) return 1 if(affected.is_stump()) @@ -51,10 +46,6 @@ if(ishuman(target)) var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) - - - if(!affected) - return 1 if(affected && (affected.status && ORGAN_DESTROYED)) return 1 if(affected.is_stump()) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 9dbbbb6216f..66e4c56ec1d 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -350,17 +350,18 @@ M.mutations.Add(CLUMSY) M.dna.SetSEState(COMICBLOCK,1,1) - //genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED) + genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED) /obj/item/organ/internal/honktumor/remove(mob/living/carbon/M, special = 0) M.mutations.Remove(CLUMSY) M.mutations.Remove(COMICBLOCK) - //genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED) + genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED) /obj/item/organ/internal/honktumor/on_life() if(!owner) return + world << "[lasthonk]" if(lasthonk == 0) lasthonk = world.time if(lasthonk > world.time + 600|| lasthonk == 0) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 0e53b278795..9eee3833c8f 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -12,8 +12,7 @@ /datum/surgery/organ_manipulation/boneless possible_locs = list("chest","head","groin", "eyes", "mouth") steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/internal/manipulate_organs,/datum/surgery_step/generic/cauterize) - allowed_mob = list(/mob/living/carbon/human/diona,/mob/living/carbon/human/slime) - disallowed_mob = list(/mob/living/carbon/human) + allowed_mob = list(/mob/living/carbon/human/diona) /datum/surgery/organ_manipulation/alien name = "alien organ manipulation"