From 3563fef4c05a14c425b16d4422ab256868c2d401 Mon Sep 17 00:00:00 2001 From: Useroth Date: Fri, 26 Apr 2019 16:47:31 +0200 Subject: [PATCH 1/9] Makes adrenals work pretty much like they used to pre combat rework. --- code/game/objects/items/implants/implant_misc.dm | 6 +++++- .../ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 24ee6d0966..d1d8bc5cb4 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -37,7 +37,11 @@ imp_in.SetStun(0) imp_in.SetKnockdown(0) imp_in.SetUnconscious(0) - imp_in.adjustStaminaLoss(-75) + imp_in.adjustStaminaLoss(-200) + imp_in.updatehealth() + imp_in.update_stamina() + imp_in.stuttering = 0 + imp_in.resting = 0 imp_in.lying = 0 imp_in.update_canmove() diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index ff1f620a3a..c9e2678985 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -4,11 +4,21 @@ if(!ninjacost(0,N_ADRENALINE)) var/mob/living/carbon/human/H = affecting - H.SetUnconscious(0) H.SetStun(0) H.SetKnockdown(0) - H.adjustStaminaLoss(-75) + H.SetUnconscious(0) + H.adjustStaminaLoss(-200) + H.updatehealth() + H.update_stamina() H.stuttering = 0 + H.resting = 0 + H.lying = 0 + H.update_canmove() + + H.reagents.add_reagent("synaptizine", 10) + H.reagents.add_reagent("omnizine", 10) + H.reagents.add_reagent("stimulants", 10) + H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost") a_boost-- to_chat(H, "There are [a_boost] adrenaline boosts remaining.") From 9c17845e0f7490857a14b18160ff9df6abbd73d0 Mon Sep 17 00:00:00 2001 From: Useroth Date: Fri, 26 Apr 2019 21:34:50 +0200 Subject: [PATCH 2/9] Buffed changeling adrenals too. --- code/game/objects/items/implants/implant_misc.dm | 1 + code/modules/antagonists/changeling/powers/adrenaline.dm | 8 +++++++- code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 1 + .../reagents/chemistry/reagents/medicine_reagents.dm | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index d1d8bc5cb4..3fd417680f 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -34,6 +34,7 @@ . = ..() uses-- to_chat(imp_in, "You feel a sudden surge of energy!") + imp_in.SetSleeping(0) imp_in.SetStun(0) imp_in.SetKnockdown(0) imp_in.SetUnconscious(0) diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index ede14a23c9..24b67ac5a4 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -19,6 +19,12 @@ user.SetKnockdown(0) user.reagents.add_reagent("changelingadrenaline", 10) user.reagents.add_reagent("changelinghaste", 2) //For a really quick burst of speed - user.adjustStaminaLoss(-75) + user.adjustStaminaLoss(-200) + user.updatehealth() + user.update_stamina() + user.stuttering = 0 + user.resting = 0 + user.lying = 0 + user.update_canmove() return TRUE diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index c9e2678985..e712c5200b 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -4,6 +4,7 @@ if(!ninjacost(0,N_ADRENALINE)) var/mob/living/carbon/human/H = affecting + H.SetSleeping(0) H.SetStun(0) H.SetKnockdown(0) H.SetUnconscious(0) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 3970e8157b..8bbde96fd5 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1165,7 +1165,7 @@ id = "changelingadrenaline" description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed." color = "#C8A5DC" - overdose_threshold = 30 + overdose_threshold = 20 /datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob) M.AdjustUnconscious(-20, 0) From c1ffffa4f122b58bec84a45a03c331ea49f4f98b Mon Sep 17 00:00:00 2001 From: Useroth Date: Sat, 27 Apr 2019 13:50:23 +0200 Subject: [PATCH 3/9] Adjustments. --- code/game/objects/items/implants/implant_misc.dm | 4 +--- code/modules/antagonists/changeling/powers/adrenaline.dm | 4 +--- code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 6 ++---- .../reagents/chemistry/reagents/medicine_reagents.dm | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 3fd417680f..5e6e80c785 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -38,9 +38,7 @@ imp_in.SetStun(0) imp_in.SetKnockdown(0) imp_in.SetUnconscious(0) - imp_in.adjustStaminaLoss(-200) - imp_in.updatehealth() - imp_in.update_stamina() + imp_in.adjustStaminaLoss(-150) imp_in.stuttering = 0 imp_in.resting = 0 imp_in.lying = 0 diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index 24b67ac5a4..5b125cacd2 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -19,9 +19,7 @@ user.SetKnockdown(0) user.reagents.add_reagent("changelingadrenaline", 10) user.reagents.add_reagent("changelinghaste", 2) //For a really quick burst of speed - user.adjustStaminaLoss(-200) - user.updatehealth() - user.update_stamina() + user.adjustStaminaLoss(-150) user.stuttering = 0 user.resting = 0 user.lying = 0 diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index e712c5200b..0579417d35 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -8,12 +8,10 @@ H.SetStun(0) H.SetKnockdown(0) H.SetUnconscious(0) - H.adjustStaminaLoss(-200) - H.updatehealth() - H.update_stamina() + H.adjustStaminaLoss(-150) H.stuttering = 0 - H.resting = 0 H.lying = 0 + H.resting = 0 H.update_canmove() H.reagents.add_reagent("synaptizine", 10) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 8bbde96fd5..3970e8157b 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1165,7 +1165,7 @@ id = "changelingadrenaline" description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed." color = "#C8A5DC" - overdose_threshold = 20 + overdose_threshold = 30 /datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob) M.AdjustUnconscious(-20, 0) From 41a8177f34d8c102a8fd40173ce363b88afb9095 Mon Sep 17 00:00:00 2001 From: Useroth Date: Sat, 27 Apr 2019 13:53:04 +0200 Subject: [PATCH 4/9] Adjustments v2. --- code/game/objects/items/implants/implant_misc.dm | 1 - code/modules/antagonists/changeling/powers/adrenaline.dm | 1 - code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 1 - 3 files changed, 3 deletions(-) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 5e6e80c785..d600ccf879 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -41,7 +41,6 @@ imp_in.adjustStaminaLoss(-150) imp_in.stuttering = 0 imp_in.resting = 0 - imp_in.lying = 0 imp_in.update_canmove() imp_in.reagents.add_reagent("synaptizine", 10) diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index 5b125cacd2..a015158fcf 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -22,7 +22,6 @@ user.adjustStaminaLoss(-150) user.stuttering = 0 user.resting = 0 - user.lying = 0 user.update_canmove() return TRUE diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index 0579417d35..02e11ca8b3 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -10,7 +10,6 @@ H.SetUnconscious(0) H.adjustStaminaLoss(-150) H.stuttering = 0 - H.lying = 0 H.resting = 0 H.update_canmove() From 56b2e7150c6379df06e376a9af245cbc8cf3586c Mon Sep 17 00:00:00 2001 From: Useroth Date: Sun, 28 Apr 2019 06:21:03 +0200 Subject: [PATCH 5/9] Back to the point of entry. --- code/game/objects/items/implants/implant.dm | 2 +- code/game/objects/items/implants/implant_misc.dm | 4 ++++ code/modules/antagonists/changeling/powers/adrenaline.dm | 6 +++++- code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 4 ++++ tgstation.dme | 1 - 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm index 482cfb0d8e..5cb59d7087 100644 --- a/code/game/objects/items/implants/implant.dm +++ b/code/game/objects/items/implants/implant.dm @@ -4,7 +4,7 @@ icon_state = "generic" //Shows up as the action button icon actions_types = list(/datum/action/item_action/hands_free/activate) var/activated = TRUE //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants - var/mob/living/imp_in = null + var/mob/living/carbon/imp_in = null //It's not like simplemobs or silicons can use implants anyway. item_color = "b" var/allow_multiple = FALSE var/uses = -1 diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index d600ccf879..45f2c9d42d 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -40,12 +40,16 @@ imp_in.SetUnconscious(0) imp_in.adjustStaminaLoss(-150) imp_in.stuttering = 0 + imp_in.updatehealth() + imp_in.update_stamina() imp_in.resting = 0 + imp_in.lying = 0 imp_in.update_canmove() imp_in.reagents.add_reagent("synaptizine", 10) imp_in.reagents.add_reagent("omnizine", 10) imp_in.reagents.add_reagent("stimulants", 10) + if(!uses) qdel(src) diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index a015158fcf..2d34115575 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -11,7 +11,7 @@ action_background_icon_state = "bg_ling" //Recover from stuns. -/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user) +/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/carbon/user) to_chat(user, "Energy rushes through us.[user.lying ? " We arise." : ""]") user.SetSleeping(0) user.SetUnconscious(0) @@ -21,7 +21,11 @@ user.reagents.add_reagent("changelinghaste", 2) //For a really quick burst of speed user.adjustStaminaLoss(-150) user.stuttering = 0 + user.updatehealth() + user.update_stamina() user.resting = 0 + user.lying = 0 user.update_canmove() + return TRUE diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index 02e11ca8b3..d7a04d175d 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -10,7 +10,10 @@ H.SetUnconscious(0) H.adjustStaminaLoss(-150) H.stuttering = 0 + H.updatehealth() + H.update_stamina() H.resting = 0 + H.lying = 0 H.update_canmove() H.reagents.add_reagent("synaptizine", 10) @@ -18,6 +21,7 @@ H.reagents.add_reagent("stimulants", 10) H.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost") + a_boost-- to_chat(H, "There are [a_boost] adrenaline boosts remaining.") s_coold = 3 diff --git a/tgstation.dme b/tgstation.dme index 5b4c4eabe5..dab8da2846 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -9,7 +9,6 @@ // END_FILE_DIR // BEGIN_PREFERENCES -#define DEBUG // END_PREFERENCES // BEGIN_INCLUDE From 8ab82e0853510b04f27b0f6bad3c7c6a1459de7b Mon Sep 17 00:00:00 2001 From: Useroth Date: Sun, 28 Apr 2019 06:23:36 +0200 Subject: [PATCH 6/9] Fixed two leftovers from a feature that I will do in another PR. --- code/game/objects/items/implants/implant.dm | 2 +- code/modules/antagonists/changeling/powers/adrenaline.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm index 5cb59d7087..482cfb0d8e 100644 --- a/code/game/objects/items/implants/implant.dm +++ b/code/game/objects/items/implants/implant.dm @@ -4,7 +4,7 @@ icon_state = "generic" //Shows up as the action button icon actions_types = list(/datum/action/item_action/hands_free/activate) var/activated = TRUE //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants - var/mob/living/carbon/imp_in = null //It's not like simplemobs or silicons can use implants anyway. + var/mob/living/imp_in = null item_color = "b" var/allow_multiple = FALSE var/uses = -1 diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index 2d34115575..1d6788d1b4 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -11,7 +11,7 @@ action_background_icon_state = "bg_ling" //Recover from stuns. -/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/carbon/user) +/obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user) to_chat(user, "Energy rushes through us.[user.lying ? " We arise." : ""]") user.SetSleeping(0) user.SetUnconscious(0) From a6b47e223c06802f8b7dd5a06af8697c0be884e9 Mon Sep 17 00:00:00 2001 From: Useroth Date: Sun, 28 Apr 2019 06:24:32 +0200 Subject: [PATCH 7/9] Also fixed one oopsie that I forgot about. --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index dab8da2846..5b4c4eabe5 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -9,6 +9,7 @@ // END_FILE_DIR // BEGIN_PREFERENCES +#define DEBUG // END_PREFERENCES // BEGIN_INCLUDE From 5d8cf0cabecd911a6cae727180d527c5cf5dc8de Mon Sep 17 00:00:00 2001 From: Useroth Date: Sun, 28 Apr 2019 16:13:07 +0200 Subject: [PATCH 8/9] Let's give adrenals the one more small touch of love. --- code/game/objects/items/implants/implant_misc.dm | 1 + code/modules/antagonists/changeling/powers/adrenaline.dm | 1 + code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm | 1 + 3 files changed, 3 insertions(+) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 45f2c9d42d..6db3699beb 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -46,6 +46,7 @@ imp_in.lying = 0 imp_in.update_canmove() + imp_in.reagents.add_reagent("inaprovaline", 3) //let's give another chance to dumb fucks who forget to breathe imp_in.reagents.add_reagent("synaptizine", 10) imp_in.reagents.add_reagent("omnizine", 10) imp_in.reagents.add_reagent("stimulants", 10) diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index 1d6788d1b4..9dbe706ed2 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -19,6 +19,7 @@ user.SetKnockdown(0) user.reagents.add_reagent("changelingadrenaline", 10) user.reagents.add_reagent("changelinghaste", 2) //For a really quick burst of speed + user.reagents.add_reagent("inaprovaline", 3) //let's give another chance to dumb fucks who forget to breathe user.adjustStaminaLoss(-150) user.stuttering = 0 user.updatehealth() diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm index d7a04d175d..5c19a67284 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_adrenaline.dm @@ -16,6 +16,7 @@ H.lying = 0 H.update_canmove() + H.reagents.add_reagent("inaprovaline", 3) //let's give another chance to dumb fucks who forget to breathe H.reagents.add_reagent("synaptizine", 10) H.reagents.add_reagent("omnizine", 10) H.reagents.add_reagent("stimulants", 10) From a0d948497b5f118c9243352d905738621e92284b Mon Sep 17 00:00:00 2001 From: Useroth Date: Thu, 9 May 2019 13:28:04 +0200 Subject: [PATCH 9/9] Totally forgotten the abductor adrenals. --- .../antagonists/abductor/equipment/abduction_gear.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 3fa1020000..b9f3d85856 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -108,10 +108,20 @@ to_chat(loc, "Combat injection is still recharging.") return var/mob/living/carbon/human/M = loc - M.adjustStaminaLoss(-75) + M.SetSleeping(0) M.SetUnconscious(0) M.SetStun(0) M.SetKnockdown(0) + M.reagents.add_reagent("inaprovaline", 3) + M.reagents.add_reagent("synaptizine", 10) + M.reagents.add_reagent("stimulants", 10) + M.adjustStaminaLoss(-150) + M.stuttering = 0 + M.updatehealth() + M.update_stamina() + M.resting = 0 + M.lying = 0 + M.update_canmove() combat_cooldown = 0 START_PROCESSING(SSobj, src)