cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

*collapse emote now does knockdown instead of paralyzing (#21958)

Browse Source 
* bam

* balance changes

* 4 seconds -> 10 seconds

* henri review

* same crit changes, whoops...
This commit is contained in:
Contrabang
2023-09-19 14:46:43 -04:00
committed by GitHub
parent 3a8c920a5a
commit 70b3652dc4
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/critical.dm
+3 -3
View File
@@ -60,7 +60,7 @@
if(prob(5))
to_chat(affected_mob, "<span class='danger'>You feel absolutely terrible!</span>")
if(prob(5))
affected_mob.emote("faint", "collapse", "groan")
affected_mob.emote("faint", "faint", "groan") // this is bugged, but out of scope, someone fix it :)
if(3)
if(prob(1) && prob(10))
to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
@@ -71,7 +71,7 @@
if(prob(5))
to_chat(affected_mob, "<span class='danger'>You feel horrible!</span>")
if(prob(5))
affected_mob.emote(pick("faint", "collapse", "groan"))
affected_mob.emote(pick("faint", "faint", "groan"))
if(prob(7))
to_chat(affected_mob, "<span class='danger'>You can't breathe!</span>")
affected_mob.AdjustLoseBreath(2 SECONDS)
@@ -125,7 +125,7 @@
to_chat(affected_mob, "<span class='danger'>Your heart stops beating!</span>")
affected_mob.AdjustLoseBreath(6 SECONDS)
if(prob(5))
affected_mob.emote(pick("faint", "collapse", "groan"))
affected_mob.emote(pick("faint", "faint", "groan"))
if(3)
affected_mob.adjustOxyLoss(1)
if(prob(8))
code/modules/mob/living/living_emote.dm
+1 -1
View File
@@ -51,7 +51,7 @@
. = ..()
if(. && isliving(user))
var/mob/living/L = user
L.Paralyse(4 SECONDS)
L.KnockDown(10 SECONDS)
/datum/emote/living/dance
key = "dance"
code/modules/reagents/chemistry/reagents/food_reagents.dm
+1 -1
View File
@@ -111,7 +111,7 @@
/datum/reagent/consumable/sugar/overdose_start(mob/living/M)
to_chat(M, "<span class='danger'>You pass out from hyperglycemic shock!</span>")
M.emote("collapse")
M.emote("faint")
..()
/datum/reagent/consumable/sugar/overdose_process(mob/living/M, severity)
code/modules/reagents/chemistry/reagents/toxins.dm
+2 -2
View File
@@ -1000,7 +1000,7 @@
M.Stun(2 SECONDS)
M.emote(pick("twitch","twitch","drool","shake","tremble"))
if(prob(5))
M.emote("collapse")
M.emote("faint")
if(prob(5))
M.Weaken(6 SECONDS)
M.visible_message("<span class='warning'>[M] has a seizure!</span>")
@@ -1011,7 +1011,7 @@
M.AdjustLoseBreath(2 SECONDS)
if(61 to INFINITY)
if(prob(15))
M.emote(pick("gasp", "choke", "cough","twitch", "shake", "tremble","quiver","drool", "twitch","collapse"))
M.emote(pick("gasp", "choke", "cough", "twitch", "shake", "tremble", "quiver", "drool", "twitch", "faint"))
M.LoseBreath(10 SECONDS)
update_flags |= M.adjustToxLoss(1, FALSE)
update_flags |= M.adjustBrainLoss(1, FALSE)