cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] First part of a span rework (#9120)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-02 07:25:48 -07:00
committed by GitHub
parent 07c3627fbf
commit 31407a0be3
241 changed files with 1108 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/emotes/definitions/audible_slap.dm
View File

@@ -10,10 +10,10 @@
/decl/emote/audible/slap/New()
..()
emote_message_1p_target = SPAN_DANGER(emote_message_1p_target)
emote_message_1p = SPAN_DANGER(emote_message_1p)
emote_message_3p_target = SPAN_DANGER(emote_message_3p_target)
emote_message_3p = SPAN_DANGER(emote_message_3p)
emote_message_1p_target = span_danger(emote_message_1p_target)
emote_message_1p = span_danger(emote_message_1p)
emote_message_3p_target = span_danger(emote_message_3p_target)
emote_message_3p = span_danger(emote_message_3p)
/decl/emote/audible/slap/do_extra(var/atom/user, var/atom/target)
. = ..()

2
code/modules/emotes/definitions/audible_snap.dm
View File

@@ -24,6 +24,6 @@
/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
if(!can_snap(user))
to_chat(user, SPAN_WARNING("You need at least one working hand to snap your fingers."))
to_chat(user, span_warning("You need at least one working hand to snap your fingers."))
return FALSE
. = ..()

2
code/modules/emotes/definitions/human.dm
View File

@@ -15,7 +15,7 @@
/decl/emote/human/deathgasp/do_emote(mob/living/carbon/human/user)
if(istype(user) && user.species.get_death_message(user) == DEATHGASP_NO_MESSAGE)
to_chat(user, SPAN_WARNING("Your species has no deathgasp."))
to_chat(user, span_warning("Your species has no deathgasp."))
return
. = ..()

2
code/modules/emotes/definitions/visible_vomit.dm
View File

@@ -7,4 +7,4 @@
if(!M.isSynthetic())
M.vomit()
return
to_chat(src, SPAN_WARNING("You are unable to vomit."))
to_chat(src, span_warning("You are unable to vomit."))

4
code/modules/emotes/emote_define.dm
View File

@@ -85,7 +85,7 @@ var/global/list/emotes_by_key
if(ismob(user) && check_restraints)
var/mob/M = user
if(M.restrained())
to_chat(user, SPAN_WARNING("You are restrained and cannot do that."))
to_chat(user, span_warning("You are restrained and cannot do that."))
return
var/atom/target
@@ -106,7 +106,7 @@ var/global/list/emotes_by_key
target = thing
if(!target)
to_chat(user, SPAN_WARNING("You cannot see a '[extra_params]' within range."))
to_chat(user, span_warning("You cannot see a '[extra_params]' within range."))
return
var/use_1p = get_emote_message_1p(user, target, extra_params)

12
code/modules/emotes/emote_mob.dm
View File

@@ -25,7 +25,7 @@
return
if(world.time < next_emote)
to_chat(src, SPAN_WARNING("You cannot use another emote yet."))
to_chat(src, span_warning("You cannot use another emote yet."))
return
//VOREStation Addition Start
if(forced_psay)
@@ -49,7 +49,7 @@
return
if(!can_emote(m_type))
to_chat(src, SPAN_WARNING("You cannot currently [m_type == AUDIBLE_MESSAGE ? "audibly" : "visually"] emote!"))
to_chat(src, span_warning("You cannot currently [m_type == AUDIBLE_MESSAGE ? "audibly" : "visually"] emote!"))
return
if(act == "me")
@@ -83,11 +83,11 @@
var/decl/emote/use_emote = get_emote_by_key(act)
if(!istype(use_emote))
to_chat(src, SPAN_WARNING("Unknown emote '[act]'. Type <b>say *help</b> for a list of usable emotes. ([act] [message])")) //CHOMPEdit - Add full message in the event you used * instead of ! or something like that
to_chat(src, span_warning("Unknown emote '[act]'. Type <b>say *help</b> for a list of usable emotes. ([act] [message])")) //CHOMPEdit - Add full message in the event you used * instead of ! or something like that
return
if(!use_emote.mob_can_use(src))
to_chat(src, SPAN_WARNING("You cannot use the emote '[act]'. Type <b>say *help</b> for a list of usable emotes."))
to_chat(src, span_warning("You cannot use the emote '[act]'. Type <b>say *help</b> for a list of usable emotes."))
return
if(m_type != use_emote.message_type && use_emote.conscious && stat != CONSCIOUS)
@@ -130,8 +130,8 @@
// Oh shit, we got this far! Let's see... did the user attempt to use more than one token?
if(findtext(subtext, "*"))
// abort abort!
to_chat(emoter, SPAN_WARNING("You may use only one \"["*"]\" symbol in your emote."))
to_chat(emoter, SPAN_WARNING(message))
to_chat(emoter, span_warning("You may use only one \"["*"]\" symbol in your emote."))
to_chat(emoter, span_warning(message))
return
if(pretext)