cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Balloon Alerts (#17540)

Browse Source 
* balloon alerts

* Take that one out

* fixes

* fixes 2

* Missing one

* That goes there

* ough

* ,

* .

* .

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Guti
2025-05-08 22:00:54 +02:00
committed by GitHub
co-authored by Kashargul Cameron Lennox
parent 2f46264a31
commit 78c71907e9
36 changed files with 606 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/autowhisper.dm
+5 -6
View File
@@ -12,14 +12,13 @@
var/obj/belly/b = loc
if(b.mode_flags & DM_FLAG_FORCEPSAY)
var/mes = "but you are affected by forced psay right now, so you will automatically use psay/pme instead of any other option."
to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled, [mes]" : "disabled, [mes]"]."))
to_chat(src, span_notice("autowhisper [autowhisper ? "enabled, [mes]" : "disabled, [mes]"]."))
return
else
forced_psay = autowhisper
to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled. You will now automatically psay/pme when using say/me. As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle" : "disabled"]."))
balloon_alert(src, "autowhisper [autowhisper ? "enabled, using psay/pme" : "disabled"]")
else
to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled. You will now automatically whisper/subtle when using say/me" : "disabled"]."))
balloon_alert(src, "autowhisper [autowhisper ? "enabled" : "disabled"]")
/mob/living/verb/autowhisper_mode()
set name = "Autowhisper Mode"
@@ -30,7 +29,7 @@
var/choice = tgui_input_list(src, "Select Custom Subtle Mode", "Custom Subtle Mode", list("Adjacent Turfs (Default)", "My Turf", "My Table", "Current Belly (Prey)", "Specific Belly (Pred)", "Specific Person", "Psay/Pme"))
if(!choice || choice == "Adjacent Turfs (Default)")
autowhisper_mode = null
to_chat(src, span_notice("Your subtles have returned to the default setting."))
balloon_alert(src, "subtles returned to default setting")
return
if(choice == "Psay/Pme")
if(autowhisper)
@@ -42,4 +41,4 @@
forced_psay = TRUE
to_chat(src, span_notice("As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle."))
autowhisper_mode = choice
to_chat(src, span_notice("Your subtles have been set to <b>[autowhisper_mode]</b>."))
balloon_alert(src, "subtles set to [autowhisper_mode]")
code/modules/mob/living/carbon/human/human_helpers.dm
+4 -4
View File
@@ -8,9 +8,9 @@
return 1
if(feedback)
if(status[1] == HUMAN_EATING_NO_MOUTH)
to_chat(src, "Where do you intend to put [food]? You don't have a mouth!")
balloon_alert(src, "you don't have a mouth!")
else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH)
to_chat(src, span_warning("\The [status[2]] is in the way!"))
balloon_alert(src, "\the [status[2]] is in the way!")
return 0
/mob/living/carbon/human/can_force_feed(var/feeder, var/food, var/feedback = 1)
@@ -19,9 +19,9 @@
return 1
if(feedback)
if(status[1] == HUMAN_EATING_NO_MOUTH)
to_chat(feeder, "Where do you intend to put [food]? \The [src] doesn't have a mouth!")
balloon_alert(src, "\the [src] doesn't have a mouth!")
else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH)
to_chat(feeder, span_warning("\The [status[2]] is in the way!"))
balloon_alert(feeder, "\the [status[2]] is in the way!")
return 0
/mob/living/carbon/human/proc/can_eat_status()
code/modules/mob/living/carbon/taste.dm
+3 -2
View File
@@ -1,5 +1,5 @@
/mob/living/carbon/proc/ingest(var/datum/reagents/from, var/datum/reagents/target, var/amount = 1, var/multiplier = 1, var/copy = 0) //we kind of 'sneak' a proc in here for ingesting stuff so we can play with it.
/* VOREStation Removal - Synths should be able to taste because... reasons
/* Synths should be able to taste because... reasons
if(ishuman(src))
var/mob/living/carbon/human/H = src
var/braintype = H.get_FBP_type()
@@ -15,7 +15,8 @@
text_output = "nothing"
if(text_output != last_taste_text || last_taste_time + 100 < world.time) //We dont want to spam the same message over and over again at the person. Give it a bit of a buffer.
to_chat(src, span_notice("You can taste [text_output]."))//no taste means there are too many tastes and not enough flavor.
to_chat(src, span_notice("You can taste [text_output].")) //no taste means there are too many tastes and not enough flavor.
balloon_alert(src, "you taste [text_output]...")
last_taste_time = world.time
last_taste_text = text_output