From f25e808deffc4036af09e5ecd8e8890ba7f03ced Mon Sep 17 00:00:00 2001 From: PatchouliKnowledge Date: Sun, 2 Aug 2015 21:30:11 +0300 Subject: [PATCH 1/4] Fixes appendicitis magically self-curing --- code/datums/diseases/appendicitis.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 11a68034d8b..9efd44821eb 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -14,9 +14,11 @@ visibility_flags = HIDDEN_PANDEMIC required_organs = list(/obj/item/organ/limb/chest) - /datum/disease/appendicitis/stage_act() - ..() + stage = min(stage, max_stages) + + if(prob(stage_prob)) + stage = min(stage + 1,max_stages) switch(stage) if(1) From aabf11bd411178737018681051e256c750da2cf3 Mon Sep 17 00:00:00 2001 From: PatchouliKnowledge Date: Sun, 2 Aug 2015 22:05:45 +0300 Subject: [PATCH 2/4] The one digit fix --- code/datums/diseases/_disease.dm | 2 +- code/datums/diseases/appendicitis.dm | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 519ee6a946e..954446639f3 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -6,7 +6,7 @@ //Disease Flags #define CURABLE 1 #define CAN_CARRY 2 -#define CAN_RESIST 3 +#define CAN_RESIST 4 //Spread Flags #define SPECIAL 1 diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 9efd44821eb..1ec29b7ef41 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -15,11 +15,7 @@ required_organs = list(/obj/item/organ/limb/chest) /datum/disease/appendicitis/stage_act() - stage = min(stage, max_stages) - - if(prob(stage_prob)) - stage = min(stage + 1,max_stages) - + ..() switch(stage) if(1) if(prob(5)) From 056c018b80630ba7d235205ec32bb5a80732e372 Mon Sep 17 00:00:00 2001 From: PatchouliKnowledge Date: Mon, 3 Aug 2015 15:13:00 +0300 Subject: [PATCH 3/4] Preventative appendectomy prevents appendicitis --- code/datums/diseases/appendicitis.dm | 2 +- code/modules/events/spontaneous_appendicitis.dm | 2 +- code/modules/surgery/appendectomy.dm | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 1ec29b7ef41..288c580559b 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -12,7 +12,7 @@ disease_flags = CAN_CARRY|CAN_RESIST spread_flags = NON_CONTAGIOUS visibility_flags = HIDDEN_PANDEMIC - required_organs = list(/obj/item/organ/limb/chest) + required_organs = list(/obj/item/organ/appendix) /datum/disease/appendicitis/stage_act() ..() diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 6219d1fda69..11e8d74923e 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -14,5 +14,5 @@ continue var/datum/disease/D = new /datum/disease/appendicitis - H.AddDisease(D) + H.ForceContractDisease(D) break \ No newline at end of file diff --git a/code/modules/surgery/appendectomy.dm b/code/modules/surgery/appendectomy.dm index 0ba1db2da7c..5e16f64a0c4 100644 --- a/code/modules/surgery/appendectomy.dm +++ b/code/modules/surgery/appendectomy.dm @@ -26,6 +26,7 @@ target.internal_organs -= A for(var/datum/disease/appendicitis in target.viruses) appendicitis.cure() + target.resistances += /datum/disease/appendicitis else user << "You can't find an appendix in [target]!" return 1 \ No newline at end of file From de8c10e6c7c1a4e82d96468bc2cff820ab068836 Mon Sep 17 00:00:00 2001 From: PatchouliKnowledge Date: Wed, 5 Aug 2015 01:08:52 +0300 Subject: [PATCH 4/4] Merge conflicts pls go --- code/datums/diseases/appendicitis.dm | 4 ++-- code/modules/surgery/appendectomy.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 288c580559b..cf71a660a34 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -12,7 +12,7 @@ disease_flags = CAN_CARRY|CAN_RESIST spread_flags = NON_CONTAGIOUS visibility_flags = HIDDEN_PANDEMIC - required_organs = list(/obj/item/organ/appendix) + required_organs = list(/obj/item/organ/internal/appendix) /datum/disease/appendicitis/stage_act() ..() @@ -21,7 +21,7 @@ if(prob(5)) affected_mob.emote("cough") if(2) - var/obj/item/organ/appendix/A = affected_mob.getorgan(/obj/item/organ/appendix) + var/obj/item/organ/internal/appendix/A = affected_mob.getorgan(/obj/item/organ/internal/appendix) if(A) A.inflamed = 1 A.update_icon() diff --git a/code/modules/surgery/appendectomy.dm b/code/modules/surgery/appendectomy.dm index 5e16f64a0c4..380e5173551 100644 --- a/code/modules/surgery/appendectomy.dm +++ b/code/modules/surgery/appendectomy.dm @@ -2,15 +2,15 @@ name = "appendectomy" steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/extract_appendix, /datum/surgery_step/close) species = list(/mob/living/carbon/human, /mob/living/carbon/monkey) - location = "groin" - requires_organic_chest = 1 + possible_locs = list("groin") //extract appendix /datum/surgery_step/extract_appendix + name = "extract appendix" accept_hand = 1 time = 64 - var/obj/item/organ/appendix/A = null + var/obj/item/organ/internal/appendix/A = null /datum/surgery_step/extract_appendix/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) A = locate() in target.internal_organs @@ -23,7 +23,7 @@ if(A) user.visible_message("[user] successfully removes [target]'s appendix!", "You successfully removes [target]'s appendix.") A.loc = get_turf(target) - target.internal_organs -= A + A.Remove(target) for(var/datum/disease/appendicitis in target.viruses) appendicitis.cure() target.resistances += /datum/disease/appendicitis