Skip to content

Commit

Permalink
[MIRROR] Fixes eye pulling message from cranial fissure. (#1597)
Browse files Browse the repository at this point in the history
* Fixes eye pulling message from cranial fissure. (#80935)

Fixes #80928 by swapping two strings. This also gives a new string for
bystanders when someone STARTS pulling someone's eyes, which felt like
an oversight while testing, but i can revert that last part if it is
deemed too much of a "feature"

- [x] I tested this on a localhost

Bystanders won't think that they're the culprit of terrible eye-pulling
crimes anymore
:cl:
fix: Bystanders will no longer think they've pulled out a victim's eyes
after seeing someone else do it.
qol: They will also be able to tell when someone starts pulling out a
victim's eyes.
/:cl:

* Fixes eye pulling message from cranial fissure.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: DATAxPUNGED <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Iajret <[email protected]>
  • Loading branch information
5 people authored Feb 21, 2024
1 parent 0e26bb7 commit 5495bac
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion code/datums/wounds/cranial_fissure.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@
victim.balloon_alert(user, "no eyes to take!")
return TRUE

playsound(victim, 'sound/surgery/organ2.ogg', 50, TRUE)
victim.balloon_alert(user, "pulling out eyes...")
user.visible_message(
span_boldwarning("[user] reaches inside [victim]'s skull..."),
ignored_mobs = user
)
victim.show_message(
span_userdanger("[victim] starts to pull out your eyes!"),
MSG_VISUAL,
Expand All @@ -101,9 +106,10 @@

log_combat(user, victim, "pulled out the eyes of")

playsound(victim, 'sound/surgery/organ1.ogg', 75, TRUE)
user.visible_message(
span_boldwarning("You rip out [victim]'s eyes!"),
span_boldwarning("[user] rips out [victim]'s eyes!"),
span_boldwarning("You rip out [victim]'s eyes!"),
ignored_mobs = victim,
)

Expand Down

0 comments on commit 5495bac

Please sign in to comment.