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

More their

Browse Source
This commit is contained in:
Tayyyyyyy
2018-05-25 18:34:26 -07:00
parent ad23362781
commit 42f85919de
26 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/drugs.dm
+6 -6
View File
@@ -208,7 +208,7 @@
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("scream")
M.visible_message("<span class='warning'>[M] nervously scratches at their skin!</span>")
M.visible_message("<span class='warning'>[M] nervously scratches at [M.p_their()] skin!</span>")
M.Jitter(10)
M.adjustBruteLoss(5)
M.emote("twitch_s")
@@ -315,7 +315,7 @@
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] can't seem to control their legs!</span>")
M.visible_message("<span class='warning'>[M] can't seem to control [M.p_their()] legs!</span>")
M.AdjustConfused(20)
M.Weaken(4)
else if(effect <= 4)
@@ -356,7 +356,7 @@
head_organ.f_style = "Very Long Beard"
H.update_hair()
H.update_fhair()
H.visible_message("<span class='warning'>[H] has a wild look in their eyes!</span>")
H.visible_message("<span class='warning'>[H] has a wild look in [H.p_their()] eyes!</span>")
if(check < 60)
M.SetParalysis(0)
M.SetStunned(0)
@@ -368,7 +368,7 @@
M.AdjustConfused(10)
if(check < 8)
M.reagents.add_reagent(pick("methamphetamine", "crank", "neurotoxin"), rand(1,5))
M.visible_message("<span class='warning'>[M] scratches at something under their skin!</span>")
M.visible_message("<span class='warning'>[M] scratches at something under [M.p_their()] skin!</span>")
M.adjustBruteLoss(5)
else if(check < 16)
M.AdjustHallucinate(30)
@@ -427,7 +427,7 @@
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("scream")
M.visible_message("<span class='danger'>[M] tears at their own skin!</span>")
M.visible_message("<span class='danger'>[M] tears at [M.p_their()] own skin!</span>")
M.adjustBruteLoss(5)
M.reagents.add_reagent("jagged_crystals", 5)
M.emote("twitch")
@@ -541,7 +541,7 @@
var/effect = ..()
if(severity == 1)
if(effect <= 2)
M.visible_message("<span class='warning'>[M] can't seem to control their legs!</span>")
M.visible_message("<span class='warning'>[M] can't seem to control [M.p_their()] legs!</span>")
M.AdjustConfused(33)
M.Weaken(2)
else if(effect <= 4)
code/modules/reagents/chemistry/reagents/medicine.dm
+5 -5
View File
@@ -73,7 +73,7 @@
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M] staggers and drools, their eyes bloodshot!</span>")
M.visible_message("<span class='warning'>[M] staggers and drools, [M.p_their()] eyes bloodshot!</span>")
M.Dizzy(8)
M.Weaken(4)
if(effect <= 15)
@@ -277,7 +277,7 @@
if(severity == 1) //lesser
M.stuttering += 1
if(effect <= 1)
M.visible_message("<span class='warning'>[M] suddenly cluches their gut!</span>")
M.visible_message("<span class='warning'>[M] suddenly cluches [M.p_their()] gut!</span>")
M.emote("scream")
M.Stun(4)
M.Weaken(4)
@@ -293,7 +293,7 @@
M.Jitter(30)
else if(severity == 2) // greater
if(effect <= 2)
M.visible_message("<span class='warning'>[M] suddenly cluches their gut!</span>")
M.visible_message("<span class='warning'>[M] suddenly cluches [M.p_their()] gut!</span>")
M.emote("scream")
M.Stun(7)
M.Weaken(7)
@@ -446,7 +446,7 @@
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M.name] staggers and drools, their eyes bloodshot!</span>")
M.visible_message("<span class='warning'>[M.name] staggers and drools, [M.p_their()] eyes bloodshot!</span>")
M.Dizzy(2)
M.Weaken(3)
if(effect <= 15)
@@ -597,7 +597,7 @@
M.visible_message("<span class='warning'>[M] suddenly and violently vomits!</span>")
M.fakevomit(no_text = 1)
else if(effect <= 5)
M.visible_message("<span class='warning'>[M] staggers and drools, their eyes bloodshot!</span>")
M.visible_message("<span class='warning'>[M] staggers and drools, [M.p_their()] eyes bloodshot!</span>")
M.Dizzy(2)
M.Weaken(3)
if(effect <= 15)
code/modules/reagents/chemistry/reagents/toxins.dm
+1 -1
View File
@@ -1016,7 +1016,7 @@
M.Drowsy(10)
if(11)
M.Paralyse(10)
M.visible_message("<B>[M]</B> seizes up and falls limp, their eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
M.visible_message("<B>[M]</B> seizes up and falls limp, [M.p_their()] eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
if(12 to 60)
M.Paralyse(10)
if(61 to INFINITY)