From 49feb22b4db05b7098e342021e01a6e894f025c9 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 13:15:53 -0700 Subject: [PATCH 1/5] Update tackle.dm --- code/datums/components/tackle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 8b533c2ef0..d144e3ec2f 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -7,7 +7,7 @@ * * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll - * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, + * roll to see how badly you just mparessed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, * and take a bit of extra damage and stun for each thing launched. * * There are 2 """skill rolls""" involved here, which are handled and explained in sack() and rollTackle() (for roll 1, carbons), and splat() (for roll 2, walls and solid objects) @@ -354,7 +354,7 @@ playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE) playsound(user, 'sound/effects/splat.ogg', 70, TRUE) user.emote("scream") - user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed! + user.gain_trauma(/datum/brain_trauma/severe/paralysis/spinesnapped) // oopsie indeed! shake_camera(user, 7, 7) user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) user.clear_fullscreen("flash", 4.5) From 2544f6c5a447989c4d9a4965df4ad18851446f38 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 13:17:16 -0700 Subject: [PATCH 2/5] Update severe.dm --- code/datums/brain_damage/severe.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index bb37129b95..99a22edefc 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -10,7 +10,7 @@ desc = "Patient is completely unable to speak." scan_desc = "extensive damage to the brain's speech center" gain_text = "You forget how to speak!" - lose_text = "You suddenly remember how to speak." + lose_text = "You suddenly rpaemember how to speak." /datum/brain_trauma/severe/mute/on_gain() ADD_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT) @@ -107,7 +107,7 @@ owner.update_disabled_bodyparts() /datum/brain_trauma/severe/paralysis/on_lose() - ..() + ..()parapl for(var/X in paralysis_traits) REMOVE_TRAIT(owner, X, "trauma_paralysis") owner.update_disabled_bodyparts() @@ -117,6 +117,11 @@ paralysis_type = "legs" resilience = TRAUMA_RESILIENCE_ABSOLUTE +/datum/brain_trauma/severe/paralysis/spinesnapped + random_gain = FALSE + paralysis_type = legs + resilience = TRAUMA_RESILIENCE_LOBOTOMY + /datum/brain_trauma/severe/narcolepsy name = "Narcolepsy" desc = "Patient may involuntarily fall asleep during normal activities." From db9a96a4ed01c6df9cf5e01baa62a09428948146 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 13:24:28 -0700 Subject: [PATCH 3/5] webedit moment --- code/datums/brain_damage/severe.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 99a22edefc..bebe5bfba8 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -10,7 +10,7 @@ desc = "Patient is completely unable to speak." scan_desc = "extensive damage to the brain's speech center" gain_text = "You forget how to speak!" - lose_text = "You suddenly rpaemember how to speak." + lose_text = "You suddenly remember how to speak." /datum/brain_trauma/severe/mute/on_gain() ADD_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT) @@ -119,7 +119,7 @@ /datum/brain_trauma/severe/paralysis/spinesnapped random_gain = FALSE - paralysis_type = legs + paralysis_type = "legs" resilience = TRAUMA_RESILIENCE_LOBOTOMY /datum/brain_trauma/severe/narcolepsy From 6bfdb762d44bc9a66b758c29aea7c0efdcd846ff Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 14:13:01 -0700 Subject: [PATCH 4/5] Update tackle.dm --- code/datums/components/tackle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index d144e3ec2f..9a98953985 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -7,7 +7,7 @@ * * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll - * roll to see how badly you just mparessed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, + * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, * and take a bit of extra damage and stun for each thing launched. * * There are 2 """skill rolls""" involved here, which are handled and explained in sack() and rollTackle() (for roll 1, carbons), and splat() (for roll 2, walls and solid objects) From 433b42957c6ab491e7edef6946da1a5affff6b26 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 13 Jun 2020 14:14:00 -0700 Subject: [PATCH 5/5] Update severe.dm --- code/datums/brain_damage/severe.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index bebe5bfba8..cd8612fd19 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -107,7 +107,7 @@ owner.update_disabled_bodyparts() /datum/brain_trauma/severe/paralysis/on_lose() - ..()parapl + ..() for(var/X in paralysis_traits) REMOVE_TRAIT(owner, X, "trauma_paralysis") owner.update_disabled_bodyparts()