mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 13:10:02 +01:00
[MIRROR] blind people know when things happen to them [MDB IGNORE] (#15427)
* blind people know when things happen to them * Update strippable.dm Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
co-authored by
Mooshimi
Gandalf
parent
b4cd83d4ac
commit
bc36a7f6af
@@ -335,8 +335,10 @@
|
||||
attack_message_spectator = "[user] [message_verb_continuous] [src][message_hit_area] with [I]!"
|
||||
attack_message_victim = "[user] [message_verb_continuous] you[message_hit_area] with [I]!"
|
||||
if(user == src)
|
||||
attack_message_victim = "You [message_verb_simple] yourself[message_hit_area] with [I]"
|
||||
attack_message_victim = "You [message_verb_simple] yourself[message_hit_area] with [I]."
|
||||
visible_message(span_danger("[attack_message_spectator]"),\
|
||||
span_userdanger("[attack_message_victim]"), null, COMBAT_MESSAGE_RANGE, user)
|
||||
if(is_blind())
|
||||
to_chat(src, span_danger("Someone hits you[message_hit_area]!"))
|
||||
to_chat(user, span_danger("[attack_message_attacker]"))
|
||||
return 1
|
||||
|
||||
@@ -379,11 +379,15 @@ Behavior that's still missing from this component that original food items had t
|
||||
span_danger("[feeder] attempts to [eater.get_bodypart(BODY_ZONE_HEAD) ? "feed [eater] [parent]." : "stuff [parent] down [eater]'s throat hole! Gross."]"),
|
||||
span_userdanger("[feeder] attempts to [eater.get_bodypart(BODY_ZONE_HEAD) ? "feed you [parent]." : "stuff [parent] down your throat hole! Gross."]")
|
||||
)
|
||||
if(eater.is_blind())
|
||||
to_chat(eater, span_userdanger("You feel someone trying to feed you something!"))
|
||||
else
|
||||
eater.visible_message(
|
||||
span_danger("[feeder] cannot force any more of [parent] down [eater]'s [eater.get_bodypart(BODY_ZONE_HEAD) ? "throat!" : "throat hole! Eugh."]"),
|
||||
span_userdanger("[feeder] cannot force any more of [parent] down your [eater.get_bodypart(BODY_ZONE_HEAD) ? "throat!" : "throat hole! Eugh."]")
|
||||
)
|
||||
if(eater.is_blind())
|
||||
to_chat(eater, span_userdanger("You're too full to eat what's being fed to you!"))
|
||||
return
|
||||
if(!do_mob(feeder, eater, time = time_to_eat)) //Wait 3-ish seconds before you can feed
|
||||
return
|
||||
@@ -394,6 +398,8 @@ Behavior that's still missing from this component that original food items had t
|
||||
span_danger("[feeder] forces [eater] to eat [parent]!"),
|
||||
span_userdanger("[feeder] forces you to eat [parent]!")
|
||||
)
|
||||
if(eater.is_blind())
|
||||
to_chat(eater, span_userdanger("You're forced to eat something!"))
|
||||
|
||||
TakeBite(eater, feeder)
|
||||
|
||||
|
||||
@@ -98,6 +98,7 @@
|
||||
span_userdanger("[user] tries to put [equipping] on you."),
|
||||
ignored_mobs = user,
|
||||
)
|
||||
|
||||
else
|
||||
source.visible_message(
|
||||
span_notice("[user] tries to put [equipping] on [source]."),
|
||||
@@ -112,6 +113,9 @@
|
||||
var/list/new_entry = list(list(user.name, "tried equipping you with [equipping]", world.time))
|
||||
LAZYADD(victim_human.afk_thefts, new_entry)
|
||||
|
||||
else if(victim_human.is_blind())
|
||||
to_chat(source, span_userdanger("You feel someone trying to put something on you."))
|
||||
|
||||
to_chat(user, span_notice("You try to put [equipping] on [source]..."))
|
||||
|
||||
user.log_message("is putting [equipping] on [key_name(source)]", LOG_ATTACK, color="red")
|
||||
@@ -159,6 +163,7 @@
|
||||
source.visible_message(
|
||||
span_warning("[user] tries to remove [source]'s [item.name]."),
|
||||
span_userdanger("[user] tries to remove your [item.name]."),
|
||||
blind_message = span_hear("You hear rustling."),
|
||||
ignored_mobs = user,
|
||||
)
|
||||
//SKYRAT EDIT CHANGE END
|
||||
@@ -175,6 +180,9 @@
|
||||
var/list/new_entry = list(list(user.name, "tried unequipping your [item.name]", world.time))
|
||||
LAZYADD(victim_human.afk_thefts, new_entry)
|
||||
|
||||
else if(victim_human.is_blind())
|
||||
to_chat(source, span_userdanger("You feel someone fumble with your belongings."))
|
||||
|
||||
return TRUE
|
||||
|
||||
/// The proc that unequips the item from the source. This should not yield.
|
||||
|
||||
@@ -318,6 +318,8 @@
|
||||
playsound(src, hitsound, volume, TRUE, -1)
|
||||
L.visible_message(span_danger("[L] is hit by \a [src][organ_hit_text]!"), \
|
||||
span_userdanger("You're hit by \a [src][organ_hit_text]!"), null, COMBAT_MESSAGE_RANGE)
|
||||
if(L.is_blind())
|
||||
to_chat(L, span_userdanger("You feel something hit you[organ_hit_text]!"))
|
||||
L.on_hit(src)
|
||||
|
||||
var/reagent_note
|
||||
|
||||
Reference in New Issue
Block a user