From f4bef53633f5e6d64e15af5fcf607c03f4287757 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 25 Nov 2020 23:41:18 +0100 Subject: [PATCH 01/15] only care about robots if oxydam --- code/modules/mob/living/simple_animal/bot/medbot.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index fb5a889d89..a0cb2c74e4 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -575,16 +575,16 @@ return TRUE //They're injured enough for it! - if((!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) + if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) return TRUE //If they're already medicated don't bother! if((!C.reagents.has_reagent(treatment_oxy_avoid)) && (C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy))) return TRUE - if((!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) + if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) return TRUE var/treatment_toxavoid = get_avoidchem_toxin(C) - if(((isnull(treatment_toxavoid) || !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C)))) + if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && ((isnull(treatment_toxavoid) || !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C)))) return TRUE if(treat_virus && !C.reagents.has_reagent(treatment_virus_avoid) && !C.reagents.has_reagent(treatment_virus)) From b487c7cb574a0a423c4d37b3faf2949dff072496 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 25 Nov 2020 23:53:33 +0100 Subject: [PATCH 02/15] actually --- code/modules/mob/living/simple_animal/bot/medbot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index a0cb2c74e4..c7c5f83597 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -575,13 +575,13 @@ return TRUE //They're injured enough for it! - if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) + if((!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) return TRUE //If they're already medicated don't bother! if((!C.reagents.has_reagent(treatment_oxy_avoid)) && (C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy))) return TRUE - if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) + if((!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) return TRUE var/treatment_toxavoid = get_avoidchem_toxin(C) if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && ((isnull(treatment_toxavoid) || !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C)))) From 67303ce7be9c79175f9c69fd4dd5265e27ff8e95 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Thu, 26 Nov 2020 00:19:47 +0100 Subject: [PATCH 03/15] Update medbot.dm --- code/modules/mob/living/simple_animal/bot/medbot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index c7c5f83597..d601fbabec 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -575,13 +575,13 @@ return TRUE //They're injured enough for it! - if((!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) + if(C.get_damaged_bodyparts(TRUE, FALSE, status = list(BODYPART_ORGANIC)) && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) return TRUE //If they're already medicated don't bother! if((!C.reagents.has_reagent(treatment_oxy_avoid)) && (C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy))) return TRUE - if((!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) + if(C.get_damaged_bodyparts(FALSE, TRUE, status = list(BODYPART_ORGANIC)) && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) return TRUE var/treatment_toxavoid = get_avoidchem_toxin(C) if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && ((isnull(treatment_toxavoid) || !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C)))) From 566d74bd77b9967c2d36d70eb5cd5b0be31cb564 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Thu, 26 Nov 2020 16:12:08 +0100 Subject: [PATCH 04/15] E --- code/modules/mob/living/carbon/damage_procs.dm | 2 +- code/modules/mob/living/simple_animal/bot/medbot.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index c0d7f89f59..a866049d65 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -175,7 +175,7 @@ var/list/obj/item/bodypart/parts = list() for(var/X in bodyparts) var/obj/item/bodypart/BP = X - if(status && !status[BP.status]) + if(status && !status.Find(BP.status)) continue if((brute && BP.brute_dam) || (burn && BP.burn_dam) || (stamina && BP.stamina_dam)) parts += BP diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index d601fbabec..f0bd1043b5 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -575,13 +575,13 @@ return TRUE //They're injured enough for it! - if(C.get_damaged_bodyparts(TRUE, FALSE, status = list(BODYPART_ORGANIC)) && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) + if(C.get_damaged_bodyparts(TRUE, FALSE, status = list(BODYPART_ORGANIC))?.len && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) return TRUE //If they're already medicated don't bother! if((!C.reagents.has_reagent(treatment_oxy_avoid)) && (C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy))) return TRUE - if(C.get_damaged_bodyparts(FALSE, TRUE, status = list(BODYPART_ORGANIC)) && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) + if(C.get_damaged_bodyparts(FALSE, TRUE, status = list(BODYPART_ORGANIC))?.len && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) return TRUE var/treatment_toxavoid = get_avoidchem_toxin(C) if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && ((isnull(treatment_toxavoid) || !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C)))) From 21734b5d638a9b1917a24dafa0df6358cd8e0350 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Thu, 26 Nov 2020 23:04:39 +0100 Subject: [PATCH 05/15] there we go --- code/modules/mob/living/simple_animal/bot/medbot.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index f0bd1043b5..25f6509ad0 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -574,14 +574,17 @@ if(!C.reagents.has_reagent(R.type)) return TRUE + var/list/brute_damaged_bodyparts = C.get_damaged_bodyparts(TRUE, FALSE, status = list(BODYPART_ORGANIC)) + var/list/burn_damaged_bodyparts = C.get_damaged_bodyparts(FALSE, TRUE, status = list(BODYPART_ORGANIC)) + //They're injured enough for it! - if(C.get_damaged_bodyparts(TRUE, FALSE, status = list(BODYPART_ORGANIC))?.len && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) + if(brute_damaged_bodyparts.len && (!C.reagents.has_reagent(treatment_brute_avoid)) && (C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute))) return TRUE //If they're already medicated don't bother! if((!C.reagents.has_reagent(treatment_oxy_avoid)) && (C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy))) return TRUE - if(C.get_damaged_bodyparts(FALSE, TRUE, status = list(BODYPART_ORGANIC))?.len && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) + if(burn_damaged_bodyparts.len && (!C.reagents.has_reagent(treatment_fire_avoid)) && (C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire))) return TRUE var/treatment_toxavoid = get_avoidchem_toxin(C) if(!HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) && ((isnull(treatment_toxavoid) || !C.reagents.has_reagent(treatment_toxavoid))) && (C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(get_healchem_toxin(C)))) From b721cf31285d63979f0b7d8e587ea14f69b2b639 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 3 Dec 2020 05:41:56 -0700 Subject: [PATCH 06/15] Update preferences.dm --- code/modules/client/preferences.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 80f3a8365c..16d6ca351d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/path var/vr_path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used - var/max_save_slots = 16 + var/max_save_slots = 24 //non-preference stuff var/muted = 0 @@ -210,7 +210,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) load_path(C.ckey) unlock_content = C.IsByondMember() if(unlock_content) - max_save_slots = 24 + max_save_slots = 32 var/loaded_preferences_successfully = load_preferences() if(loaded_preferences_successfully) if(load_character()) From f0c1890a657bc0e247d4603bf752e22c3bfeec2e Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 5 Dec 2020 02:48:33 +0100 Subject: [PATCH 07/15] fix --- code/modules/mob/living/living.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2accfe7d0d..d7cded7ccc 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -307,7 +307,9 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) if((zone_selected == BODY_ZONE_PRECISE_GROIN) && has_tail() && M.has_tail()) - visible_message("[src] coils [p_their()] tail with [AM], pulling [M.p_them()] along!", "[src] has entwined [p_their()] tail with yours, pulling you along!") + visible_message("[src] coils [p_their()] tail with [M]'s, pulling [M.p_them()] along!", "You entwine your tail with [M]'s, pulling [M.p_them()] along!", ignored_mobs = M) + M.show_message("[src] has entwined [p_their()] tail with yours, pulling you along!", MSG_VISUAL, "You feel something coiling around your tail, pulling you along!") + else visible_message("[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by [M.p_their()] hands":" passively"]!", "You have grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by [M.p_their()] hands":" passively"]!", target = M, From 0c4e9ca1c598f5a3d7f6ca9e4a0b7beeadccc273 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 5 Dec 2020 02:56:03 +0100 Subject: [PATCH 08/15] better phrasing --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d7cded7ccc..78de091923 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -307,7 +307,7 @@ log_combat(src, M, "grabbed", addition="passive grab") if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER))) if((zone_selected == BODY_ZONE_PRECISE_GROIN) && has_tail() && M.has_tail()) - visible_message("[src] coils [p_their()] tail with [M]'s, pulling [M.p_them()] along!", "You entwine your tail with [M]'s, pulling [M.p_them()] along!", ignored_mobs = M) + visible_message("[src] coils [p_their()] tail with [M]'s, pulling [M.p_them()] along!", "You entwine tails with [M], pulling [M.p_them()] along!", ignored_mobs = M) M.show_message("[src] has entwined [p_their()] tail with yours, pulling you along!", MSG_VISUAL, "You feel something coiling around your tail, pulling you along!") else From 8cf6f116097ec2f5f26c500f15434e6b3992e657 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 6 Dec 2020 00:13:01 -0600 Subject: [PATCH 09/15] Automatic changelog generation for PR #13733 [ci skip] --- html/changelogs/AutoChangeLog-pr-13733.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13733.yml diff --git a/html/changelogs/AutoChangeLog-pr-13733.yml b/html/changelogs/AutoChangeLog-pr-13733.yml new file mode 100644 index 0000000000..a10719fdc6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13733.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Fixes the tail entwine messages displaying incorrectly." From 86b9161fc958f35746668cab2967766818b16041 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 6 Dec 2020 00:36:31 -0600 Subject: [PATCH 10/15] Automatic changelog generation for PR #13711 [ci skip] --- html/changelogs/AutoChangeLog-pr-13711.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13711.yml diff --git a/html/changelogs/AutoChangeLog-pr-13711.yml b/html/changelogs/AutoChangeLog-pr-13711.yml new file mode 100644 index 0000000000..e6fde23e8c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13711.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - tweak: "Medibots now ignore people they cannot help due to their biology." + - bugfix: "get_damaged_bodyparts() is no longer broken." From dd4f60a24bc074f0fcd01a8effe0c8d1901e07f0 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 6 Dec 2020 17:37:46 +0100 Subject: [PATCH 11/15] *snap --- .../abductor/equipment/abduction_surgery.dm | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm index a99e9eee67..9205198c4f 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm @@ -2,22 +2,27 @@ name = "experimental organ replacement" steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/extract_organ, /datum/surgery_step/gland_insert) possible_locs = list(BODY_ZONE_CHEST) - ignore_clothes = 1 + ignore_clothes = TRUE /datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target) if(!ishuman(user)) - return 0 + return FALSE var/mob/living/carbon/human/H = user if(H.dna.species.id == "abductor") - return 1 + return TRUE for(var/obj/item/implant/abductor/A in H.implants) - return 1 - return 0 + return TRUE + return FALSE + +/datum/surgery/organ_extraction/mechanic + name = "Prosthesis experimental organ replacement" + requires_bodypart_type = BODYPART_ROBOTIC + steps = list(/datum/surgery_step/mechanic_open, /datum/surgery_step/open_hatch, /datum/surgery_step/mechanic_unwrench, /datum/surgery_step/prepare_electronics, /datum/surgery_step/extract_organ, /datum/surgery_step/gland_insert) /datum/surgery_step/extract_organ name = "remove heart" - accept_hand = 1 + accept_hand = TRUE time = 32 var/obj/item/organ/IC = null var/list/organ_types = list(/obj/item/organ/heart) @@ -34,10 +39,10 @@ user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].") user.put_in_hands(IC) IC.Remove() - return 1 + return TRUE else to_chat(user, "You don't find anything in [target]'s [target_zone]!") - return 1 + return TRUE /datum/surgery_step/gland_insert name = "insert gland" @@ -52,4 +57,4 @@ user.temporarilyRemoveItemFromInventory(tool, TRUE) var/obj/item/organ/heart/gland/gland = tool gland.Insert(target, 2) - return 1 + return TRUE From be5bccd8475746a4bdc9a096b317104ade28cd5e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 7 Dec 2020 17:18:38 -0600 Subject: [PATCH 12/15] Automatic changelog generation for PR #13736 [ci skip] --- html/changelogs/AutoChangeLog-pr-13736.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13736.yml diff --git a/html/changelogs/AutoChangeLog-pr-13736.yml b/html/changelogs/AutoChangeLog-pr-13736.yml new file mode 100644 index 0000000000..dfa5e7cb66 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13736.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - tweak: "Abductors now can use experimental organ replacement surgery on robots / synthetics." From 86661a4fe019feda89ea36fbefd4c6166bc22e7c Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 8 Dec 2020 16:30:09 +0100 Subject: [PATCH 13/15] aaaaaaaaaaaaaa --- code/game/machinery/cryopod.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index a2a395c51c..7172a71849 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -361,8 +361,12 @@ // them win or lose based on cryo is silly so we remove the objective. if(istype(O,/datum/objective/mutiny) && O.target == mob_occupant.mind) qdel(O) - else if(O.target && istype(O.target, /datum/mind) && !O.check_midround_completion()) - if(O.target == mob_occupant.mind && O.owner?.current) + else if(O.target && istype(O.target, /datum/mind)) + if(O.target != mob_occupant.mind) + continue + if(!O.check_midround_completion()) + continue + if(O.owner && O.owner.current) to_chat(O.owner.current, "
You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!") O.target = null spawn(10) //This should ideally fire after the occupant is deleted. From 69a1d6e60304e57cc441279f2cb53065abd23f35 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 8 Dec 2020 16:32:34 +0100 Subject: [PATCH 14/15] oop --- code/game/machinery/cryopod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 7172a71849..5bc0ed20b0 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -364,7 +364,7 @@ else if(O.target && istype(O.target, /datum/mind)) if(O.target != mob_occupant.mind) continue - if(!O.check_midround_completion()) + if(O.check_midround_completion()) continue if(O.owner && O.owner.current) to_chat(O.owner.current, "
You get the feeling your target is no longer within reach. Time for Plan [pick("A","B","C","D","X","Y","Z")]. Objectives updated!") From a2834b8ebcd37c313f5bb13b01e13fcae214b7f1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 8 Dec 2020 11:51:37 -0600 Subject: [PATCH 15/15] Automatic changelog generation for PR #13741 [ci skip] --- html/changelogs/AutoChangeLog-pr-13741.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13741.yml diff --git a/html/changelogs/AutoChangeLog-pr-13741.yml b/html/changelogs/AutoChangeLog-pr-13741.yml new file mode 100644 index 0000000000..c49015ab28 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13741.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Objectives are no longer very broken."