From d756a5de00ea5355f5d972823426588a3ed0b40f Mon Sep 17 00:00:00 2001 From: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sun, 26 Feb 2023 03:18:18 -0600 Subject: [PATCH 1/4] Update other_reagents.dm (#18073) --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 804ab97cc7a5..7653cca307d8 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -102,7 +102,7 @@ taste_description = "slime" /datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume) - if(islist(data) && (method == INGEST || method == INJECT)) + if(islist(data) && method == INJECT) for(var/thing in L.diseases) var/datum/disease/D = thing if(D.GetDiseaseID() in data) From 370d2480ce835b862742af1173e7309b92d73bbe Mon Sep 17 00:00:00 2001 From: SapphicOverload Date: Mon, 3 Apr 2023 20:23:18 -0400 Subject: [PATCH 2/4] cool syndicate version --- .../surgery/organs/augments_internal.dm | 24 +++++++++++++++++++ code/modules/surgery/organs/autosurgeon.dm | 2 +- code/modules/uplink/uplink_items.dm | 8 ++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index c8309b104e89..ea25c2c22dda 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -143,6 +143,30 @@ clear_stuns() organ_flags &= ~ORGAN_FAILING +/obj/item/organ/cyberimp/brain/anti_stun/syndicate + name = "syndicate CNS rebooter implant" + desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned." + syndicate_implant = TRUE + stun_cap_amount = 3 SECONDS + +/obj/item/organ/cyberimp/brain/anti_stun/syndicate/Insert() + ..() + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + H.physiology.stamina_mod *= 0.8 + H.physiology.stun_mod *= 0.8 + +/obj/item/organ/cyberimp/brain/anti_stun/syndicate/Remove(mob/living/carbon/M, special) + . = ..() + if(ishuman(M)) + var/mob/living/carbon/human/H = owner + H.physiology.stamina_mod *= 1.25 + H.physiology.stun_mod *= 1.25 + +/obj/item/organ/cyberimp/brain/anti_stun/syndicate/on_life() + ..() // makes stamina damage decay over time + owner.adjustStaminaLoss(owner.getStaminaLoss() / -10) + //[[[[MOUTH]]]] /obj/item/organ/cyberimp/mouth zone = BODY_ZONE_PRECISE_MOUTH diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index e20965ff34c8..fb71e867a8d7 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -118,7 +118,7 @@ starting_organ = /obj/item/organ/eyes/robotic/xray/syndicate /obj/item/autosurgeon/anti_stun - starting_organ = /obj/item/organ/cyberimp/brain/anti_stun + starting_organ = /obj/item/organ/cyberimp/brain/anti_stun/syndicate /obj/item/autosurgeon/reviver starting_organ = /obj/item/organ/cyberimp/chest/reviver diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index a8131bbce830..0880317c6c9c 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1954,10 +1954,12 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) player_minimum = 25 /datum/uplink_item/implants/antistun - name = "CNS Rebooter Implant" - desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon." + name = "Upgraded CNS Rebooter Implant" + desc = "This implant will help you get back up on your feet faster after being stunned. \ + This version is modified to help reduce exhaustion during combat. \ + Comes with an autosurgeon." item = /obj/item/autosurgeon/anti_stun - cost = 12 + cost = 5 surplus = 0 /datum/uplink_item/implants/freedom From 239553a2d7f628014c8141a2623a83f3a37012d5 Mon Sep 17 00:00:00 2001 From: SapphicOverload Date: Mon, 3 Apr 2023 23:11:48 -0400 Subject: [PATCH 3/4] 8tc --- code/modules/uplink/uplink_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 0880317c6c9c..121d61b161fc 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1959,7 +1959,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) This version is modified to help reduce exhaustion during combat. \ Comes with an autosurgeon." item = /obj/item/autosurgeon/anti_stun - cost = 5 + cost = 8 surplus = 0 /datum/uplink_item/implants/freedom From 088c636ad50b92be83fcb2385d150be952e235c0 Mon Sep 17 00:00:00 2001 From: SapphicOverload Date: Thu, 6 Apr 2023 23:16:22 -0400 Subject: [PATCH 4/4] what the fuck happened here --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 9f4625d1dea0..914dd2605339 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1325,6 +1325,7 @@ /datum/reagent/nitrium_high_metabolization/on_mob_end_metabolize(mob/living/L) L.remove_movespeed_modifier(type) + return ..() /datum/reagent/nitrium_high_metabolization/on_mob_life(mob/living/carbon/M) M.adjustFireLoss(2 * REM)