made a new burp/anti-burp chem AND new drinks

- made a new burp chem, Fizulphite
- new variables to account for "slurburping"
- new anti-burp / anti-fullness chem, Soothseltz
- two new drinks in GATO COLA machine (Fizz Wizz, Soothseltz)
- some sprites for the cans
- also removed leftover mention of dogborgs
This commit is contained in:
Sonoida
2023-03-23 00:56:59 +01:00
parent 56173e984c
commit 141a587ba6
17 changed files with 147 additions and 3 deletions
@@ -64,3 +64,4 @@
var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
var/burpyness = 0 // GS13 - dumb name, I know. Trying to keep it closely related to "drunkenness"
@@ -812,6 +812,7 @@
remove_all_embedded_objects()
set_heartattack(FALSE)
drunkenness = 0
burpyness = 0 //GS13 - lil GS13 addition
for(var/datum/mutation/human/HM in dna.mutations)
if(HM.quality != POSITIVE)
dna.remove_mutation(HM.name)
+3
View File
@@ -624,6 +624,9 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
if(slurring || drunkenness)
slurring = max(slurring-1,0,drunkenness)
if(burpslurring)
burpslurring = max(burpslurring-1,0)
if(cultslurring)
cultslurring = max(cultslurring-1, 0)
+5 -1
View File
@@ -94,6 +94,8 @@
radiation += max(effect * hit_percent, 0)
if(EFFECT_SLUR)
slurring = max(slurring,(effect * hit_percent))
if(EFFECT_BURPSLUR)
burpslurring = max(burpslurring,(effect * hit_percent)) //GS13
if(EFFECT_STUTTER)
if((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) // stun is usually associated with stutter
stuttering = max(stuttering,(effect * hit_percent))
@@ -107,7 +109,7 @@
return 1
/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax)
/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, burpslur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax)
if(blocked >= 100)
return 0
if(stun)
@@ -120,6 +122,8 @@
apply_effect(irradiate, EFFECT_IRRADIATE, blocked)
if(slur)
apply_effect(slur, EFFECT_SLUR, blocked)
if(burpslur)
apply_effect(burpslur, EFFECT_BURPSLUR, blocked) //GS13
if(stutter)
apply_effect(stutter, EFFECT_STUTTER, blocked)
if(eyeblur)
@@ -100,6 +100,7 @@
//Speech
var/stuttering = 0
var/slurring = 0
var/burpslurring = 0 //GS13
var/cultslurring = 0
var/derpspeech = 0
+3
View File
@@ -369,6 +369,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if(slurring)
message = slur(message,slurring)
if(burpslurring)
message = burpslur(message,burpslurring) //GS13
if(cultslurring)
message = cultslur(message)
+41
View File
@@ -104,6 +104,47 @@
. += "[newletter]"
return sanitize(.)
//GS13 - BURP SLURRING, USED IN SOME CHEMS OR EFFECTS
/proc/burpslur(phrase, strength = 50)
strength = min(50, strength)
phrase = html_decode(phrase)
var/leng = length(phrase)
. = ""
var/newletter = ""
var/rawchar = ""
for(var/i = 1, i <= leng, i += length(rawchar))
rawchar = newletter = phrase[i]
if(rand(1,100)<=strength * 0.5)
var/lowerletter = lowertext(newletter)
if(lowerletter == "o")
newletter = " -*BURRP*- "
else if(lowerletter == "s")
newletter = " -*URP*- "
else if(lowerletter == "a")
newletter = " -*GWUURRP*- "
else if(lowerletter == "u")
newletter = " -*BUUUURRP*- "
else if(lowerletter == "c")
newletter = " -*BURP*- "
if(rand(1,100) <= strength * 0.25)
if(newletter == " ")
newletter = "...*GWWUUARRP*..."
else if(newletter == ".")
newletter = " -*BWUUARRP*-."
switch(rand(1,100) <= strength * 0.5)
if(1)
newletter += " -*BURRP*- "
if(10)
newletter += "[newletter]"
if(20)
newletter += "[newletter][newletter]"
. += "[newletter]"
return sanitize(.)
/////////////////////////
/// Makes you talk like you got cult stunned, which is slurring but with some dark messages
/proc/cultslur(phrase) // Inflicted on victims of a stun talisman
phrase = html_decode(phrase)