As a Vanguard Operative you are not part of security! You must not perform security duties unless absolutely nessecary. \
- Do not valid hunt using your equipment. Use common sense. Failure to follow these simple rules will result in a job ban.")
+ to_chat(M, span_redtext("As a Vanguard Operative you are not part of security! You must not perform security duties unless absolutely nessecary. \
+ Do not valid hunt using your equipment. Use common sense. Failure to follow these simple rules will result in a job ban."))
/datum/outfit/job/expeditionary_trooper
name = "Vanguard Operative"
diff --git a/modular_skyrat/modules/exp_corps/code/gear.dm b/modular_skyrat/modules/exp_corps/code/gear.dm
index 018711b5c64..8843c5e2139 100644
--- a/modular_skyrat/modules/exp_corps/code/gear.dm
+++ b/modular_skyrat/modules/exp_corps/code/gear.dm
@@ -116,7 +116,7 @@
if(!isliving(user) || !user.CanReach(parent) || user.incapacitated())
return FALSE
if(locked)
- to_chat(user, "[parent] seems to be locked!")
+ to_chat(user, span_warning("[parent] seems to be locked!"))
return
var/obj/item/knife/combat/knife_to_draw = locate() in real_location()
@@ -125,7 +125,7 @@
remove_from_storage(knife_to_draw, get_turf(user))
playsound(parent, 'modular_skyrat/modules/sec_haul/sound/holsterout.ogg', 50, TRUE, -5)
INVOKE_ASYNC(user, /mob/.proc/put_in_hands, knife_to_draw)
- user.visible_message("[user] draws [knife_to_draw] from [parent]!", "You draw [knife_to_draw] from [parent].")
+ user.visible_message(span_warning("[user] draws [knife_to_draw] from [parent]!"), span_notice("You draw [knife_to_draw] from [parent]."))
/obj/item/storage/bag/ammo/marksman/PopulateContents() //can kill most basic enemies with 5 knives, though marksmen shouldn't be soloing enemies anyways
new /obj/item/knife/combat/marksman(src)
diff --git a/modular_skyrat/modules/faction/code/id.dm b/modular_skyrat/modules/faction/code/id.dm
index e75520632b5..f41106bb7de 100644
--- a/modular_skyrat/modules/faction/code/id.dm
+++ b/modular_skyrat/modules/faction/code/id.dm
@@ -25,7 +25,7 @@
if(extra_access)
for(var/acs in extra_access)
I.access |= acs
- to_chat(user, "You upgrade [I] with extra access.")
+ to_chat(user, span_notice("You upgrade [I] with extra access."))
qdel(src)
/obj/item/card/faction_access/guest
diff --git a/modular_skyrat/modules/firefighter/code/firefighter.dm b/modular_skyrat/modules/firefighter/code/firefighter.dm
index 76c135ccfd0..e84ff153f14 100644
--- a/modular_skyrat/modules/firefighter/code/firefighter.dm
+++ b/modular_skyrat/modules/firefighter/code/firefighter.dm
@@ -46,19 +46,19 @@
/obj/item/mecha_parts/mecha_equipment/ripleyupgradef/can_attach(obj/vehicle/sealed/mecha/working/ripley/M)
if(M.type != /obj/vehicle/sealed/mecha/working/ripley)
- to_chat(loc, "This conversion kit can only be applied to APLU MK-I models.")
+ to_chat(loc, span_warning("This conversion kit can only be applied to APLU MK-I models."))
return FALSE
if(LAZYLEN(M.cargo))
- to_chat(loc, "[M]'s cargo hold must be empty before this conversion kit can be applied.")
+ to_chat(loc, span_warning("[M]'s cargo hold must be empty before this conversion kit can be applied."))
return FALSE
if(!(M.mecha_flags & ADDING_MAINT_ACCESS_POSSIBLE)) //non-removable upgrade, so lets make sure the pilot or owner has their say.
- to_chat(loc, "[M] must have maintenance protocols active in order to allow this conversion kit.")
+ to_chat(loc, span_warning("[M] must have maintenance protocols active in order to allow this conversion kit."))
return FALSE
if(LAZYLEN(M.occupants)) //We're actualy making a new mech and swapping things over, it might get weird if players are involved
- to_chat(loc, "[M] must be unoccupied before this conversion kit can be applied.")
+ to_chat(loc, span_warning("[M] must be unoccupied before this conversion kit can be applied."))
return FALSE
if(!M.cell) //Turns out things break if the cell is missing
- to_chat(loc, "The conversion process requires a cell installed.")
+ to_chat(loc, span_warning("The conversion process requires a cell installed."))
return FALSE
return TRUE
diff --git a/modular_skyrat/modules/fishing/code/fishing.dm b/modular_skyrat/modules/fishing/code/fishing.dm
index 6f7224c83f1..1944e5dc950 100644
--- a/modular_skyrat/modules/fishing/code/fishing.dm
+++ b/modular_skyrat/modules/fishing/code/fishing.dm
@@ -107,8 +107,8 @@ GLOBAL_LIST_INIT(fishing_weights, list(
skill_name = "Fishing Master"
skill_description = "Master the ability to fish."
skill_icon = "certificate"
- activate_message = "The fish and junk become far more visible beneath the surface."
- deactivate_message = "The surface begins to cloud up, making it hard to see beneath."
+ activate_message = span_notice("The fish and junk become far more visible beneath the surface.")
+ deactivate_message = span_notice("The surface begins to cloud up, making it hard to see beneath.")
/obj/item/fishing_rod
name = "fishing rod"
diff --git a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
index 12da7e656d7..a8a3ecc9e4b 100644
--- a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
+++ b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm
@@ -33,7 +33,7 @@
/area/centcom/holding/cafebuild, /area/centcom/holding/cafevox, /area/centcom/holding/cafedorms, /area/centcom/holding/cafepark, /area/centcom/holding/cafeplumbing))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, GHOSTROLE_TRAIT)
- to_chat(new_spawn,"Ghosting is free!")
+ to_chat(new_spawn,span_warning("Ghosting is free!"))
var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
D.Grant(new_spawn)
@@ -62,8 +62,8 @@
/area/centcom/holding/cafebuild, /area/centcom/holding/cafevox, /area/centcom/holding/cafedorms, /area/centcom/holding/cafepark, /area/centcom/holding/cafeplumbing))
ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, GHOSTROLE_TRAIT)
- to_chat(new_spawn,"Ghosting is free!")
- //to_chat(new_spawn,"Be warned: People who opt out of EORG will come here. Do not make the area uninhabitable and do NOT commit EORG. This is a safe-zone. If you attack people in EORG, you will be banned for griefing.")
+ to_chat(new_spawn,span_warning("Ghosting is free!"))
+ //to_chat(new_spawn,span_narsiesmall("Be warned: People who opt out of EORG will come here. Do not make the area uninhabitable and do NOT commit EORG. This is a safe-zone. If you attack people in EORG, you will be banned for griefing."))
var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
new_spawn.put_in_hand(new /obj/item/storage/box/syndie_kit/chameleon/ghostcafe, LEFT_HANDS, forced = TRUE)
new_spawn.equip_outfit_and_loadout(/datum/outfit/ghostcafe, new_spawn.client.prefs, FALSE, null)
@@ -87,10 +87,10 @@
var/mob/M = target
if(HAS_TRAIT_FROM(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT))
REMOVE_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
- to_chat(M,"You're no longer hearing deadchat.")
+ to_chat(M,span_notice("You're no longer hearing deadchat."))
else
ADD_TRAIT(M,TRAIT_SIXTHSENSE,GHOSTROLE_TRAIT)
- to_chat(M,"You're once again hearing deadchat.")
+ to_chat(M,span_notice("You're once again hearing deadchat."))
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "cafe costuming kit"
diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm
index 8b88deeb4aa..b18fc5db814 100644
--- a/modular_skyrat/modules/goofsec/code/sol_fed.dm
+++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(emergency_responders, list())
..()
/datum/antagonist/ert/request_911/greet()
- var/missiondesc = "You are the [name]."
+ var/missiondesc = span_warningplain("You are the [name].")
missiondesc += "
You are NOT a Nanotrasen Employee. You work for the Sol Federation as a [role]."
missiondesc += "
You are responding to emergency calls from the station for immediate SolFed [department] assistance!\n"
missiondesc += "
Your Mission:"
diff --git a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm
index 9a6810c58c2..33c8a4e58df 100644
--- a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm
+++ b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm
@@ -106,12 +106,12 @@
hud.maptext_x = -8
if(!pew.can_shoot())
hud.icon_state = "eammo_counter_empty"
- hud.maptext = "[batt_percent]%
[shot_cost_percent]%
"
+ hud.maptext = span_maptext("[batt_percent]%
[shot_cost_percent]%
")
return
if(batt_percent <= 25)
- hud.maptext = "[batt_percent]%
[shot_cost_percent]%
"
+ hud.maptext = span_maptext("[batt_percent]%
[shot_cost_percent]%
")
return
- hud.maptext = "[batt_percent]%
[shot_cost_percent]%
"
+ hud.maptext = span_maptext("[batt_percent]%
[shot_cost_percent]%
")
else if(istype(parent, /obj/item/weldingtool))
var/obj/item/weldingtool/welder = parent
diff --git a/modular_skyrat/modules/gunpoint/code/gunpoint.dm b/modular_skyrat/modules/gunpoint/code/gunpoint.dm
index a01c7e5e563..bcd316f894e 100644
--- a/modular_skyrat/modules/gunpoint/code/gunpoint.dm
+++ b/modular_skyrat/modules/gunpoint/code/gunpoint.dm
@@ -41,14 +41,14 @@
/mob/living/proc/CanGunpointAt(mob/living/L, notice = FALSE)
if(resting)
if(notice)
- to_chat(src, "You need to be standing to get a good aim!")
+ to_chat(src, span_warning("You need to be standing to get a good aim!"))
return FALSE
if(!(L in viewers(8, src)))
if(notice)
- to_chat(src, "Your target is out of your view!")
+ to_chat(src, span_warning("Your target is out of your view!"))
return FALSE
if(L.alpha < 70)
if(notice)
- to_chat(src, "You can't quite make out your target!")
+ to_chat(src, span_warning("You can't quite make out your target!"))
return FALSE
return TRUE
diff --git a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm
index 78f98e05c65..826bee516b6 100644
--- a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm
+++ b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm
@@ -38,7 +38,7 @@
aimed_gun = gun
source.face_atom(target)
- source.visible_message("[source.name] aims at [target.name] with the [aimed_gun.name]!")
+ source.visible_message(span_danger("[source.name] aims at [target.name] with the [aimed_gun.name]!"))
was_running = (source.m_intent == MOVE_INTENT_RUN)
if(was_running)
@@ -82,7 +82,7 @@
return
if(!allow_use && CanReact())
source.log_message("[source] shot [target] because they attacked/disarmed/pulled", LOG_ATTACK)
- to_chat(source, "You pull the trigger instinctively to [target.name] actions!")
+ to_chat(source, span_warning("You pull the trigger instinctively to [target.name] actions!"))
INVOKE_ASYNC(src, .proc/ShootTarget)
/datum/gunpoint/proc/LockOn()
@@ -93,11 +93,11 @@
locked = TRUE
log_combat(target, source, "locked onto with aiming")
playsound(get_turf(source), 'modular_skyrat/modules/gunpoint/sound/targeton.ogg', 50,1)
- to_chat(source, "You lock onto [target.name]!")
- target.visible_message("[source.name] holds [target.name] at gunpoint with the [aimed_gun.name]!", "[source.name] holds you at gunpoint with the [aimed_gun.name]!")
+ to_chat(source, span_notice("You lock onto [target.name]!"))
+ target.visible_message(span_warning("[source.name] holds [target.name] at gunpoint with the [aimed_gun.name]!"), span_userdanger("[source.name] holds you at gunpoint with the [aimed_gun.name]!"))
if(target.gunpointed.len == 1)//First case
- to_chat(target, "You'll get shot if you use radio, move or interact with items!")
- to_chat(target, "You can however take items out, toss harmless items or drop them.")
+ to_chat(target, span_danger("You'll get shot if you use radio, move or interact with items!"))
+ to_chat(target, span_notice("You can however take items out, toss harmless items or drop them."))
var/list/choice_list = ConstructChoiceList()
gunpoint_gui = show_radial_menu_gunpoint(source, target , choice_list, select_proc = CALLBACK(src, .proc/GunpointGuiReact, source), radius = 42)
if(target.gp_effect.icon_state != "locked")
@@ -132,7 +132,7 @@
source.gunpointing = null
if(locked)
QDEL_NULL(gunpoint_gui)
- target.visible_message("[source.name] no longer holds [target.name] at gunpoint.", "[source.name] no longer holds you at gunpoint.")
+ target.visible_message(span_notice("[source.name] no longer holds [target.name] at gunpoint."), span_notice("[source.name] no longer holds you at gunpoint."))
source = null
target = null
aimed_gun = null
@@ -159,7 +159,7 @@
if(!allow_radio && CanReact())
if(direct)
source.log_message("[source] shot [target] because they spoke on radio", LOG_ATTACK)
- to_chat(source, "You pull the trigger instinctively as [target.name] speaks on the radio!")
+ to_chat(source, span_warning("You pull the trigger instinctively as [target.name] speaks on the radio!"))
INVOKE_ASYNC(src, .proc/ShootTarget)
/datum/gunpoint/proc/MovedReact(datum/datum_source, atom/moved, direction, forced)
@@ -184,7 +184,7 @@
return
if(!allow_use && CanReact())
source.log_message("[source] shot [target] because they used an item", LOG_ATTACK)
- to_chat(source, "You pull the trigger instinctively as [target.name] uses an item!")
+ to_chat(source, span_warning("You pull the trigger instinctively as [target.name] uses an item!"))
ShootTarget()
/datum/gunpoint/proc/SourceMoved(datum/datum_source)
@@ -214,16 +214,16 @@
safe = FALSE
break
if(safe)
- to_chat(target, "[source.name] signals you can use radio.")
+ to_chat(target, span_notice("[source.name] signals you can use radio."))
else
- to_chat(target, "[source.name] signals you can use radio, however other people still don't")
+ to_chat(target, span_danger("[source.name] signals you can use radio, however other people still don't"))
else
var/forbid_counts = 0
for(var/datum/gunpoint/gp in target.gunpointed)
if(gp.allow_radio == FALSE)
forbid_counts += 1
if(forbid_counts == 1) //Only first one warns the victim
- to_chat(target, "[source.name] signals you can't use radio.")
+ to_chat(target, span_danger("[source.name] signals you can't use radio."))
if("use")
allow_use = !allow_use
if(allow_use)
@@ -233,16 +233,16 @@
safe = FALSE
break
if(safe)
- to_chat(target, "[source.name] signals you can interact with items.")
+ to_chat(target, span_notice("[source.name] signals you can interact with items."))
else
- to_chat(target, "[source.name] signals you can interact with items, however other people still don't")
+ to_chat(target, span_danger("[source.name] signals you can interact with items, however other people still don't"))
else
var/forbid_counts = 0
for(var/datum/gunpoint/gp in target.gunpointed)
if(gp.allow_use == FALSE)
forbid_counts += 1
if(forbid_counts == 1) //Only first one warns the victim
- to_chat(target, "[source.name] signals you can't interact with items.")
+ to_chat(target, span_danger("[source.name] signals you can't interact with items."))
if("move")
allow_move = !allow_move
if(allow_move)
@@ -252,16 +252,16 @@
safe = FALSE
break
if(safe)
- to_chat(target, "[source.name] signals you can move.")
+ to_chat(target, span_notice("[source.name] signals you can move."))
else
- to_chat(target, "[source.name] signals you can move, however other people still don't")
+ to_chat(target, span_danger("[source.name] signals you can move, however other people still don't"))
else
var/forbid_counts = 0
for(var/datum/gunpoint/gp in target.gunpointed)
if(gp.allow_move == FALSE)
forbid_counts += 1
if(forbid_counts == 1) //Only first one warns the victim
- to_chat(target, "[source.name] signals you can't move.")
+ to_chat(target, span_danger("[source.name] signals you can't move."))
var/list/new_choices = ConstructChoiceList()
gunpoint_gui.entry_animation = FALSE
gunpoint_gui.change_choices(new_choices,FALSE)
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/master.dm b/modular_skyrat/modules/gunsgalore/code/guns/master.dm
index 64b6488c676..51aa789d14c 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/master.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/master.dm
@@ -80,19 +80,19 @@
unjam_time = clamp((jam_chance*10)/(durability/10), 0, 50)
jammed = TRUE
playsound(src, 'sound/effects/stall.ogg', 60, TRUE)
- to_chat(user, "The [src] jams!")
+ to_chat(user, span_danger("The [src] jams!"))
SEND_SIGNAL(src, COMSIG_GUN_JAMMED)
else if(jammed)
to_chat(user, "You start to unjam the bolt!")
if(do_after(user, unjam_time))
jammed = FALSE
- to_chat(user, "You unjam the [src]'s bolt.")
+ to_chat(user, span_notice("You unjam the [src]'s bolt."))
playsound(src, 'sound/weapons/gun/l6/l6_rack.ogg', 60, TRUE)
/obj/item/gun/ballistic/can_trigger_gun(mob/living/user)
. = ..()
if(realistic && jammed)
- to_chat(user, "[src] is jammed!")
+ to_chat(user, span_warning("[src] is jammed!"))
return FALSE
/obj/item/gun/ballistic/shoot_live_shot(mob/living/user, pointblank, atom/pbtarget, message)
@@ -149,13 +149,13 @@
if(51 to 70)
. += "It looks very dirty."
else
- . += "It is filthy!"
+ . += span_warning("It is filthy!")
switch(FLOOR(durability, 1))
if(0 to 9)
- . += "It is falling apart!"
+ . += span_warning("It is falling apart!")
if(10 to 29)
- . += "It looks battle scarred!"
+ . += span_warning("It looks battle scarred!")
if(30 to 49)
. += "It looks well worn."
if(50 to 69)
@@ -164,9 +164,9 @@
. += "It looks factory new."
if(jammed)
- . += "It is jammed, alt+click it to unjam it!"
+ . += span_warning("It is jammed, alt+click it to unjam it!")
else if(durability < 10)
- . += "It is barely functioning!"
+ . += span_warning("It is barely functioning!")
else
. += "It is functioning normally."
@@ -181,17 +181,17 @@
if(C.amount < 5)
to_chat(user, "There's not enough [C] to clean the gun with!")
else
- to_chat(user, "You start cleaning the [src].")
+ to_chat(user, span_notice("You start cleaning the [src]."))
if(do_after(user, 20 SECONDS))
dirt_level -= 35
if(dirt_level < 0)
dirt_level = 0
C.use(5)
- to_chat(user, "You clean the [src], improving it's reliability!")
+ to_chat(user, span_notice("You clean the [src], improving it's reliability!"))
if(istype(A, /obj/item/gun_maintenance_supplies))
- to_chat(user, "You start maintaining the [src].")
+ to_chat(user, span_notice("You start maintaining the [src]."))
if(do_after(user, 10 SECONDS, target = src))
- user.visible_message("[user] finishes maintenance of [src].")
+ user.visible_message(span_notice("[user] finishes maintenance of [src]."))
dirt_level = 0
qdel(A)
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34/mg34.dm
index cd80adf267e..8f7c0c86cca 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/mg34/mg34.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34/mg34.dm
@@ -38,7 +38,7 @@
. = ..()
. += "alt + click to [cover_open ? "close" : "open"] the dust cover."
if(cover_open && magazine)
- . += "It seems like you could use an empty hand to remove the magazine."
+ . += span_notice("It seems like you could use an empty hand to remove the magazine.")
/obj/item/gun/ballistic/automatic/mg34/AltClick(mob/user)
@@ -46,7 +46,7 @@
if(!user.canUseTopic(src))
return
cover_open = !cover_open
- to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.")
+ to_chat(user, span_notice("You [cover_open ? "open" : "close"] [src]'s cover."))
playsound(src, 'sound/weapons/gun/l6/l6_door.ogg', 60, TRUE)
update_appearance()
@@ -61,7 +61,7 @@
/obj/item/gun/ballistic/automatic/mg34/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
if(cover_open)
- to_chat(user, "[src]'s cover is open! Close it before firing!")
+ to_chat(user, span_warning("[src]'s cover is open! Close it before firing!"))
return
else
. = ..()
@@ -73,13 +73,13 @@
..()
return
if (!cover_open)
- to_chat(user, "[src]'s cover is closed! Open it before trying to remove the magazine!")
+ to_chat(user, span_warning("[src]'s cover is closed! Open it before trying to remove the magazine!"))
return
..()
/obj/item/gun/ballistic/automatic/mg34/attackby(obj/item/A, mob/user, params)
if(!cover_open && istype(A, mag_type))
- to_chat(user, "[src]'s dust cover prevents a magazine from being fit.")
+ to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit."))
return
..()
diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm
index 85c9d7f8818..585c0d7feca 100644
--- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm
+++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm
@@ -164,7 +164,7 @@
if(!new_setting)
new_setting = HEV_NOTIFICATION_TEXT_AND_VOICE
- to_chat(my_suit.current_user, "[my_suit] notification mode is now [new_setting].")
+ to_chat(my_suit.current_user, span_notice("[my_suit] notification mode is now [new_setting]."))
my_suit.send_notifications = new_setting
@@ -438,7 +438,7 @@
return
current_internals_tank = current_user.get_item_by_slot(ITEM_SLOT_SUITSTORE)
ADD_TRAIT(current_internals_tank, TRAIT_NODROP, "hev_trait")
- to_chat(current_user, "You hear a click as [current_internals_tank] is secured to your suit.")
+ to_chat(current_user, span_notice("You hear a click as [current_internals_tank] is secured to your suit."))
playsound(src, 'modular_skyrat/master_files/sound/blackmesa/hev/03_atmospherics_on.ogg', 50)
send_message("...CALIBRATED", HEV_COLOR_GREEN)
send_message("CALIBRATING VITALSIGN MONITORING SYSTEMS...")
@@ -642,7 +642,7 @@
timer_id = addtimer(CALLBACK(src, .proc/finished), 4 SECONDS, TIMER_STOPPABLE)
/obj/item/clothing/suit/space/hardsuit/hev_suit/proc/finished()
- to_chat(current_user, "You feel [src] seal around your body, locking it in place!")
+ to_chat(current_user, span_notice("You feel [src] seal around your body, locking it in place!"))
ADD_TRAIT(src, TRAIT_NODROP, "hev_trait")
send_message("ALL SYSTEMS ONLINE, WELCOME [uppertext(current_user.real_name)]", HEV_COLOR_GREEN)
playsound(src, 'modular_skyrat/master_files/sound/blackmesa/hev/09_safe_day.ogg', 50)
diff --git a/modular_skyrat/modules/horrorform/code/horror_form.dm b/modular_skyrat/modules/horrorform/code/horror_form.dm
index 86afd551c0f..f8d631796be 100644
--- a/modular_skyrat/modules/horrorform/code/horror_form.dm
+++ b/modular_skyrat/modules/horrorform/code/horror_form.dm
@@ -16,14 +16,14 @@
/datum/action/changeling/horror_form/sting_action(mob/living/carbon/human/user)
if(!user || user.notransform)
return 0
- user.visible_message("[user] writhes and contorts, their body expanding to inhuman proportions!", \
- "We begin our transformation to our true form!")
+ user.visible_message(span_warning("[user] writhes and contorts, their body expanding to inhuman proportions!"), \
+ span_danger("We begin our transformation to our true form!"))
if(!do_after(user, 30, target = user, timed_action_flags = IGNORE_HELD_ITEM))
- user.visible_message("[user]'s transformation abruptly reverts itself!", \
- "Our transformation has been interrupted!")
+ user.visible_message(span_warning("[user]'s transformation abruptly reverts itself!"), \
+ span_warning("Our transformation has been interrupted!"))
return 0
- user.visible_message("[user] grows into an abomination and lets out an awful scream!", \
- "We cast off our petty shell and enter our true form!")
+ user.visible_message(span_warning("[user] grows into an abomination and lets out an awful scream!"), \
+ span_userdanger("We cast off our petty shell and enter our true form!"))
if(user.handcuffed)
var/obj/O = user.get_item_by_slot(ITEM_SLOT_HANDCUFFED)
if(istype(O))
@@ -40,7 +40,7 @@
var/obj/structure/closet/C = user.loc
if(istype(C))
if(C && user.loc == C)
- C.visible_message("[C]'s door breaks and opens!")
+ C.visible_message(span_warning("[C]'s door breaks and opens!"))
new /obj/effect/decal/cleanable/greenglow(C.drop_location())
C.welded = FALSE
C.locked = FALSE
diff --git a/modular_skyrat/modules/horrorform/code/true_changeling.dm b/modular_skyrat/modules/horrorform/code/true_changeling.dm
index 051367ad3a9..a75ab26cc0a 100644
--- a/modular_skyrat/modules/horrorform/code/true_changeling.dm
+++ b/modular_skyrat/modules/horrorform/code/true_changeling.dm
@@ -38,9 +38,9 @@
var/datum/action/innate/turn_to_human
var/datum/action/innate/devour
var/transformed_time = 0
- var/playstyle_string = "We have entered our true form! We are unbelievably powerful, and regenerate life at a steady rate. However, most of \
+ var/playstyle_string = span_infoplain("We have entered our true form! We are unbelievably powerful, and regenerate life at a steady rate. However, most of \
our abilities are useless in this form, and we must utilise the abilities that we have gained as a result of our transformation. Currently, we are incapable of returning to a human. \
- After several minutes, we will once again be able to revert into a human. Taking too much damage will cause us to reach equilibrium and our cells will combust into a shower of gore, watch out!"
+ After several minutes, we will once again be able to revert into a human. Taking too much damage will cause us to reach equilibrium and our cells will combust into a shower of gore, watch out!")
var/mob/living/carbon/human/stored_changeling = null //The changeling that transformed
var/devouring = FALSE //If the true changeling is currently devouring a human
@@ -71,7 +71,7 @@
if(stat)
return
if(act == "scream")
- message = "[src] makes a loud, bone-chilling roar!"
+ message = span_emote("[src] makes a loud, bone-chilling roar!")
act = "me"
scream(message)
return
@@ -79,7 +79,7 @@
/mob/living/simple_animal/hostile/true_changeling/proc/scream(message)
if(!message)
- message = "[src] makes a loud, bone-chilling roar!"
+ message = span_emote("[src] makes a loud, bone-chilling roar!")
var/frequency = get_rand_frequency() //so sound frequency is consistent
for(var/mob/M in range(35, src)) //You can hear the scream 7 screens away
// Double check for client
@@ -101,17 +101,17 @@
scream()
spawn_gibs()
if(stored_changeling && mind)
- visible_message("[src] lets out a furious scream as it reaches equilibrium, as it starts exploding into a shower of gore!", \
- "We lack the power to maintain our mass, we have reached critic-...")
+ visible_message(span_warning("[src] lets out a furious scream as it reaches equilibrium, as it starts exploding into a shower of gore!"), \
+ span_userdanger("We lack the power to maintain our mass, we have reached critic-..."))
anchored = TRUE
turn_to_human.Remove()
AddComponent(/datum/component/pellet_cloud, projectile_type=/obj/projectile/bullet/pellet/bone_fragment, magnitude=8)
addtimer(CALLBACK(src, .proc/real_death), rand(3 SECONDS, 6 SECONDS))
else
- visible_message("[src] lets out a waning scream as it falls, twitching, to the floor.")
+ visible_message(span_warning("[src] lets out a waning scream as it falls, twitching, to the floor."))
spawn(450)
if(src)
- visible_message("[src] stumbles upright and begins to move!")
+ visible_message(span_warning("[src] stumbles upright and begins to move!"))
revive() //Changelings can self-revive, and true changelings are no exception
scream()
@@ -120,8 +120,8 @@
spawn_gibs()
scream()
icon_state = "horror_dead"
- visible_message("[src] has surpassed equilibrium and can no longer support itself, exploding in a shower of bone and gore!", \
- "ARRRRRRGHHHH!!!")
+ visible_message(span_warning("[src] has surpassed equilibrium and can no longer support itself, exploding in a shower of bone and gore!"), \
+ span_userdanger("ARRRRRRGHHHH!!!"))
stored_changeling.loc = get_turf(src)
mind.transfer_to(stored_changeling)
stored_changeling.Paralyze(10 SECONDS) //Make them helpless for 10 seconds
@@ -177,17 +177,17 @@
/datum/action/innate/turn_to_human/Trigger()
var/mob/living/simple_animal/hostile/true_changeling/C = owner
if(!C.stored_changeling)
- to_chat(C,"We do not have a form other than this!")
+ to_chat(C,span_warning("We do not have a form other than this!"))
return FALSE
if(C.stored_changeling.stat == DEAD)
- to_chat(C,"Our human form is dead!")
+ to_chat(C,span_warning("Our human form is dead!"))
return FALSE
if(world.time - C.transformed_time < TRUE_CHANGELING_REFORM_THRESHOLD)
var/timeleft = (C.transformed_time + TRUE_CHANGELING_REFORM_THRESHOLD) - world.time
- to_chat(C,"We are still unable to change back at will! We need to wait [round(timeleft/600)+1] minutes.")
+ to_chat(C,span_warning("We are still unable to change back at will! We need to wait [round(timeleft/600)+1] minutes."))
return FALSE
- C.visible_message("[C] suddenly crunches and twists into a smaller form!", \
- "We return to our lesser form.")
+ C.visible_message(span_warning("[C] suddenly crunches and twists into a smaller form!"), \
+ span_danger("We return to our lesser form."))
C.stored_changeling.loc = get_turf(C)
C.mind.transfer_to(C.stored_changeling)
C.stored_changeling.Stun(2 SECONDS)
@@ -205,7 +205,7 @@
/datum/action/innate/devour/Trigger()
var/mob/living/simple_animal/hostile/true_changeling/T = owner
if(T.devouring)
- T << "We are already feasting on a human!"
+ T << span_warning("We are already feasting on a human!")
return FALSE
var/list/potential_targets = list()
for(var/mob/living/carbon/human/H in range(1, usr))
@@ -213,7 +213,7 @@
continue
potential_targets.Add(H)
if(!potential_targets.len)
- T << "There are no humans nearby!"
+ T << span_warning("There are no humans nearby!")
return FALSE
var/mob/living/carbon/human/lunch
if(potential_targets.len == 1)
@@ -223,20 +223,20 @@
if(!lunch && !ishuman(lunch))
return FALSE
if(lunch.getBruteLoss() + lunch.getFireLoss() >= 200) //Overall physical damage, basically
- T.visible_message("[lunch] provides no further nutrients for [T]!", \
- "[lunch] has no more useful flesh for us to consume!!")
+ T.visible_message(span_warning("[lunch] provides no further nutrients for [T]!"), \
+ span_danger("[lunch] has no more useful flesh for us to consume!!"))
return FALSE
T.devouring = TRUE
- T.visible_message("[T] begins ripping apart and feasting on [lunch]!", \
- "We begin to feast upon [lunch]...")
+ T.visible_message(span_warning("[T] begins ripping apart and feasting on [lunch]!"), \
+ span_danger("We begin to feast upon [lunch]..."))
if(!do_mob(usr, 50, target = lunch))
T.devouring = FALSE
return FALSE
T.devouring = FALSE
lunch.adjustBruteLoss(60)
- T.visible_message("[T] tears a chunk from [lunch]'s flesh!", \
- "We tear a chunk of flesh from [lunch] and devour it!")
- lunch << "[T] takes a huge bite out of you!"
+ T.visible_message(span_warning("[T] tears a chunk from [lunch]'s flesh!"), \
+ span_danger("We tear a chunk of flesh from [lunch] and devour it!"))
+ lunch << span_userdanger("[T] takes a huge bite out of you!")
lunch.spawn_gibs()
var/dismembered = FALSE
for(var/obj/item/bodypart/BP in lunch.bodyparts)
diff --git a/modular_skyrat/modules/hydra/code/neutral.dm b/modular_skyrat/modules/hydra/code/neutral.dm
index 834df46d170..87fa4061dea 100644
--- a/modular_skyrat/modules/hydra/code/neutral.dm
+++ b/modular_skyrat/modules/hydra/code/neutral.dm
@@ -3,8 +3,8 @@
desc = "You are a tri-headed creature. To use, format name like (Rucks-Sucks-Ducks)"
value = 0
mob_trait = TRAIT_HYDRA_HEADS
- gain_text = "You hear two other voices inside of your head(s)."
- lose_text = "All of your minds become singular."
+ gain_text = span_notice("You hear two other voices inside of your head(s).")
+ lose_text = span_danger("All of your minds become singular.")
medical_record_text = "There are multiple heads and personalities affixed to one body."
icon = "horse-head"
@@ -34,13 +34,13 @@
/datum/action/innate/hydrareset/Activate()
var/mob/living/carbon/human/hydra = owner
hydra.real_name = hydra.name_archive
- hydra.visible_message("[hydra.name] pushes all three heads forwards; they seem to be talking as a collective.", \
- "You are now talking as [hydra.name_archive]!", ignored_mobs=owner)
+ hydra.visible_message(span_notice("[hydra.name] pushes all three heads forwards; they seem to be talking as a collective."), \
+ span_notice("You are now talking as [hydra.name_archive]!"), ignored_mobs=owner)
/datum/action/innate/hydra/Activate() //Oops, all hydra!
var/mob/living/carbon/human/hydra = owner
var/list/names = splittext(hydra.name_archive,"-")
var/selhead = input("Who would you like to speak as?","Heads:") in names
hydra.real_name = selhead
- hydra.visible_message("[hydra.name] pulls the rest of their heads back; and puts [selhead]'s forward.", \
- "You are now talking as [selhead]!", ignored_mobs=owner)
+ hydra.visible_message(span_notice("[hydra.name] pulls the rest of their heads back; and puts [selhead]'s forward."), \
+ span_notice("You are now talking as [selhead]!"), ignored_mobs=owner)
diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
index 469c487d0fc..b15c03d27ac 100644
--- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
+++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
@@ -164,7 +164,7 @@
return
/obj/item/hypospray/mkii/afterattack(atom/target, mob/living/user, proximity)
- if((istype(target, /obj/item/reagent_containers/glass/vial)))
+ if(istype(target, /obj/item/reagent_containers/glass/vial))
insert_vial(target, user, vial)
return TRUE
@@ -202,7 +202,7 @@
return
log_attack("[user.name] ([user.ckey]) applied [src] to [injectee.name] ([injectee.ckey]), which had [contained] (COMBAT MODE: [uppertext(user.combat_mode)]) (MODE: [mode])")
if(injectee != user)
- injectee.visible_message(span_danger("[user] uses the [src] on [injectee]!"), \
+ injectee.visible_message(span_danger("[user] uses the [src] on [injectee]!"), \
span_userdanger("[user] uses the [src] on you!"))
else
injectee.log_message("applied [src] to themselves ([contained]).", LOG_ATTACK)
@@ -215,7 +215,7 @@
var/long_sound = vial.amount_per_transfer_from_this >= 15
playsound(loc, long_sound ? 'modular_skyrat/modules/hyposprays/sound/hypospray_long.ogg' : pick('modular_skyrat/modules/hyposprays/sound/hypospray.ogg','modular_skyrat/modules/hyposprays/sound/hypospray2.ogg'), 50, 1, -1)
- to_chat(user, span_notice("You [fp_verb] [vial.amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [vial.reagents.total_volume] units."))
+ to_chat(user, span_notice("You [fp_verb] [vial.amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [vial.reagents.total_volume] units."))
update_appearance()
/obj/item/hypospray/mkii/attack_self(mob/living/user)
diff --git a/modular_skyrat/modules/implants/code/augments_arms.dm b/modular_skyrat/modules/implants/code/augments_arms.dm
index 3aba408ee0c..c297d2b7a40 100644
--- a/modular_skyrat/modules/implants/code/augments_arms.dm
+++ b/modular_skyrat/modules/implants/code/augments_arms.dm
@@ -30,7 +30,7 @@
/obj/item/organ/cyberimp/arm/armblade/emag_act()
for(var/datum/weakref/created_item in items_list)
- to_chat(usr, "You unlock [src]'s integrated energy arm blade! You madman!")
+ to_chat(usr, span_notice("You unlock [src]'s integrated energy arm blade! You madman!"))
items_list += WEAKREF(new /obj/item/melee/implantarmblade/energy(src))
return TRUE
@@ -59,7 +59,7 @@
/obj/item/organ/cyberimp/arm/janitor/emag_act()
for(var/datum/weakref/created_item in items_list)
- to_chat(usr, "You unlock [src]'s integrated deluxe cleaning supplies!")
+ to_chat(usr, span_notice("You unlock [src]'s integrated deluxe cleaning supplies!"))
items_list += WEAKREF(new /obj/item/soap/syndie(src)) //We add not replace.
items_list += WEAKREF(new /obj/item/reagent_containers/spray/cyborg_lube(src))
return TRUE
@@ -71,6 +71,6 @@
/obj/item/organ/cyberimp/arm/lighter/emag_act()
for(var/datum/weakref/created_item in items_list)
- to_chat(usr, "You unlock [src]'s integrated Zippo lighter! Finally, classy smoking!")
+ to_chat(usr, span_notice("You unlock [src]'s integrated Zippo lighter! Finally, classy smoking!"))
items_list += WEAKREF(new /obj/item/lighter(src)) //Now you can choose between bad and worse!
return TRUE
diff --git a/modular_skyrat/modules/implants/code/augments_chest.dm b/modular_skyrat/modules/implants/code/augments_chest.dm
index dfe1ffb8026..e8396c3f159 100644
--- a/modular_skyrat/modules/implants/code/augments_chest.dm
+++ b/modular_skyrat/modules/implants/code/augments_chest.dm
@@ -12,7 +12,7 @@
/obj/item/organ/cyberimp/chest/scanner/ui_action_click(owner, action)
if(istype(action, /datum/action/item_action/organ_action/use))
if(organ_flags & ORGAN_FAILING)
- to_chat(owner, "Your health analyzer relays an error! It can't interface with your body in its current condition!")
+ to_chat(owner, span_warning("Your health analyzer relays an error! It can't interface with your body in its current condition!"))
return
else
healthscan(owner, owner, 1, TRUE)
diff --git a/modular_skyrat/modules/implants/code/augments_internal.dm b/modular_skyrat/modules/implants/code/augments_internal.dm
index 7ff024239f6..05bbdf884c7 100644
--- a/modular_skyrat/modules/implants/code/augments_internal.dm
+++ b/modular_skyrat/modules/implants/code/augments_internal.dm
@@ -10,7 +10,7 @@
if(H.stat == UNCONSCIOUS && cooldown==FALSE)
H.AdjustUnconscious(-100, FALSE)
H.AdjustSleeping(-100, FALSE)
- to_chat(owner, "You feel a rush of energy course through your body!")
+ to_chat(owner, span_notice("You feel a rush of energy course through your body!"))
cooldown = TRUE
addtimer(CALLBACK(src, .proc/sleepytimerend), 50)
else
@@ -18,7 +18,7 @@
/obj/item/organ/cyberimp/brain/anti_sleep/proc/sleepytimerend()
cooldown = FALSE
- to_chat(owner, "You hear a small beep in your head as your CNS Jumpstarter finishes recharging.")
+ to_chat(owner, span_notice("You hear a small beep in your head as your CNS Jumpstarter finishes recharging."))
/obj/item/organ/cyberimp/brain/anti_sleep/emp_act(severity, mob/living/carbon/human/H)
. = ..()
@@ -32,4 +32,4 @@
/obj/item/organ/cyberimp/brain/anti_sleep/proc/reboot()
organ_flags &= ~ORGAN_FAILING
- cooldown = FALSE
+ cooldown = FALSE
diff --git a/modular_skyrat/modules/inflatables/code/inflatable.dm b/modular_skyrat/modules/inflatables/code/inflatable.dm
index e7812dfcf58..a5d337e313f 100644
--- a/modular_skyrat/modules/inflatables/code/inflatable.dm
+++ b/modular_skyrat/modules/inflatables/code/inflatable.dm
@@ -8,10 +8,10 @@
/obj/item/inflatable/attack_self(mob/user)
if(locate(/obj/structure/inflatable) in user.loc)
- to_chat(user, "You cannot place inflatable walls upon eachother!")
+ to_chat(user, span_warning("You cannot place inflatable walls upon eachother!"))
return
playsound(loc, 'sound/items/zip.ogg', 75, 1)
- to_chat(user, "You inflate [src].")
+ to_chat(user, span_notice("You inflate [src]."))
if(do_mob(user, src, 10))
var/obj/structure/inflatable/R = new structuretype(user.loc)
transfer_fingerprints_to(R)
@@ -94,7 +94,7 @@
if(!istype(W))
return
if(W.sharpness)
- visible_message("[user] pierces [src] with [W]!")
+ visible_message(span_danger("[user] pierces [src] with [W]!"))
deflate(TRUE)
if(W.damtype == BRUTE || W.damtype == BURN)
..()
@@ -110,10 +110,10 @@
playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
var/obj/item/inflatable/R
if(violent)
- visible_message("[src] rapidly deflates!")
+ visible_message(span_danger("[src] rapidly deflates!"))
R = new torntype(loc)
else
- visible_message("[src] slowly deflates.")
+ visible_message(span_danger("[src] slowly deflates."))
sleep(50)
R = new itemtype(loc)
transfer_fingerprints_to(R)
@@ -216,19 +216,19 @@
var/fixedtype = /obj/item/inflatable
/obj/item/inflatable/torn/attack_self(mob/user)
- to_chat(user, "The inflatable wall is too torn to be inflated, fix it with something!")
+ to_chat(user, span_warning("The inflatable wall is too torn to be inflated, fix it with something!"))
add_fingerprint(user)
/obj/item/inflatable/torn/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/stack/sticky_tape))
var/obj/item/stack/sticky_tape/T = I
if(T.amount < 2)
- to_chat(user, "There is not enough tape!")
+ to_chat(user, span_danger("There is not enough tape!"))
return
- to_chat(user, "You begin fixing the [src]!")
+ to_chat(user, span_notice("You begin fixing the [src]!"))
playsound(user, 'modular_skyrat/modules/inflatables/sound/ducttape1.ogg', 50, 1)
if(do_mob(user, src, 20))
- to_chat(user, "You fix the [src] using the ducttape!")
+ to_chat(user, span_notice("You fix the [src] using the ducttape!"))
T.use(2)
new fixedtype(user.loc)
qdel(src)
@@ -259,7 +259,7 @@
new /obj/item/inflatable(src)
/obj/item/inflatable/suicide_act(mob/living/user)
- visible_message(user, "[user] starts shoving the [src] up his ass! It looks like hes going to pull the cord, oh shit!")
+ visible_message(user, span_danger("[user] starts shoving the [src] up his ass! It looks like hes going to pull the cord, oh shit!"))
playsound(user.loc, 'sound/machines/hiss.ogg', 75, 1)
new structuretype(user.loc)
user.gib()
diff --git a/modular_skyrat/modules/jukebox/code/dance_machine.dm b/modular_skyrat/modules/jukebox/code/dance_machine.dm
index b33cdf7dab7..005b8e6f59d 100644
--- a/modular_skyrat/modules/jukebox/code/dance_machine.dm
+++ b/modular_skyrat/modules/jukebox/code/dance_machine.dm
@@ -44,10 +44,10 @@
if(!active && !(flags_1 & NODECONSTRUCT_1))
if(O.tool_behaviour == TOOL_WRENCH)
if(!anchored && !isinspace())
- to_chat(user,"You secure [src] to the floor.")
+ to_chat(user,span_notice("You secure [src] to the floor."))
set_anchored(TRUE)
else if(anchored)
- to_chat(user,"You unsecure and disconnect [src].")
+ to_chat(user,span_notice("You unsecure and disconnect [src]."))
set_anchored(FALSE)
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
return
@@ -66,13 +66,13 @@
/obj/machinery/jukebox/ui_status(mob/user)
if(!anchored)
- to_chat(user,"This device must be anchored by a wrench!")
+ to_chat(user,span_warning("This device must be anchored by a wrench!"))
return UI_CLOSE
if(!allowed(user) && !isobserver(user))
- to_chat(user,"Error: Access Denied.")
+ to_chat(user,span_warning("Error: Access Denied."))
return UI_CLOSE
if(!SSjukeboxes.songs.len && !isobserver(user))
- to_chat(user,"Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.")
+ to_chat(user,span_warning("Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue."))
return UI_CLOSE
return ..()
@@ -112,7 +112,7 @@
return
if(!active)
if(stop > world.time)
- to_chat(usr, "Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)].")
+ to_chat(usr, span_warning("Error: The device is still resetting from the last activation, it will be ready again in [DisplayTimeText(stop-world.time)]."))
return
activate_music()
return TRUE
@@ -121,7 +121,7 @@
return TRUE
if("select_track")
if(active)
- to_chat(usr, "Error: You cannot change the song until the current one is over.")
+ to_chat(usr, span_warning("Error: You cannot change the song until the current one is over."))
return
var/list/available = list()
for(var/datum/track/S in SSjukeboxes.songs)
diff --git a/modular_skyrat/modules/layer_shift/code/mob_movement.dm b/modular_skyrat/modules/layer_shift/code/mob_movement.dm
index 6481705ad3c..9ea0c756123 100644
--- a/modular_skyrat/modules/layer_shift/code/mob_movement.dm
+++ b/modular_skyrat/modules/layer_shift/code/mob_movement.dm
@@ -8,29 +8,29 @@
set category = "IC"
if(incapacitated() || body_position == LYING_DOWN)
- to_chat(src, "You can't do that right now!")
+ to_chat(src, span_warning("You can't do that right now!"))
return
if(layer >= MOB_LAYER_SHIFT_MAX)
- to_chat(src, "You cannot increase your layer priority any further.")
+ to_chat(src, span_warning("You cannot increase your layer priority any further."))
return
layer += MOB_LAYER_SHIFT_INCREMENT
var/layer_priority = (layer - MOB_LAYER) * 100 // Just for text feedback
- to_chat(src, "Your layer priority is now [layer_priority].")
+ to_chat(src, span_notice("Your layer priority is now [layer_priority]."))
/mob/living/verb/layershift_down()
set name = "Shift Layer Downwards"
set category = "IC"
if(incapacitated() || body_position == LYING_DOWN)
- to_chat(src, "You can't do that right now!")
+ to_chat(src, span_warning("You can't do that right now!"))
return
if(layer <= MOB_LAYER_SHIFT_MIN)
- to_chat(src, "You cannot decrease your layer priority any further.")
+ to_chat(src, span_warning("You cannot decrease your layer priority any further."))
return
-
+
layer -= MOB_LAYER_SHIFT_INCREMENT
var/layer_priority = (layer - MOB_LAYER) * 100 // Just for text feedback
- to_chat(src, "Your layer priority is now [layer_priority].")
+ to_chat(src, span_notice("Your layer priority is now [layer_priority]."))
diff --git a/modular_skyrat/modules/liquids/code/drains.dm b/modular_skyrat/modules/liquids/code/drains.dm
index e59b89cda29..faaa6a9a4ab 100644
--- a/modular_skyrat/modules/liquids/code/drains.dm
+++ b/modular_skyrat/modules/liquids/code/drains.dm
@@ -28,9 +28,9 @@
return TRUE
playsound(src, 'sound/items/welder2.ogg', 50, TRUE)
- to_chat(user, "You start [welded ? "unwelding" : "welding"] [src]...")
+ to_chat(user, span_notice("You start [welded ? "unwelding" : "welding"] [src]..."))
if(I.use_tool(src, user, 20))
- to_chat(user, "You [welded ? "unweld" : "weld"] [src].")
+ to_chat(user, span_notice("You [welded ? "unweld" : "weld"] [src]."))
welded = !welded
update_icon()
if(welded)
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
index c1ee3f8de54..4a04dbbf5ff 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
@@ -379,7 +379,7 @@
if(!(C.shoes && C.shoes.clothing_flags & NOSLIP))
step(C, dir)
if(prob(60) && C.body_position != LYING_DOWN)
- to_chat(C, "The current knocks you down!")
+ to_chat(C, span_userdanger("The current knocks you down!"))
C.Paralyze(60)
else
step(AM, dir)
@@ -419,7 +419,7 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.wear_mask && C.wear_mask.flags_cover & MASKCOVERSMOUTH)
- to_chat(C, "You fall in the water!")
+ to_chat(C, span_userdanger("You fall in the water!"))
else
var/datum/reagents/tempr = take_reagents_flat(CHOKE_REAGENTS_INGEST_ON_FALL_AMOUNT)
tempr.trans_to(C, tempr.total_volume, methods = INGEST)
@@ -427,9 +427,9 @@
C.adjustOxyLoss(5)
//C.emote("cough")
INVOKE_ASYNC(C, /mob.proc/emote, "cough")
- to_chat(C, "You fall in and swallow some water!")
+ to_chat(C, span_userdanger("You fall in and swallow some water!"))
else
- to_chat(M, "You fall in the water!")
+ to_chat(M, span_userdanger("You fall in the water!"))
/obj/effect/abstract/liquid_turf/Initialize()
. = ..()
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm
index 538e10747e4..45db9b24045 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm
@@ -24,9 +24,9 @@
/obj/machinery/plumbing/liquid_input_pump/attack_hand(mob/user)
if(!anchored)
- to_chat(user, "[src] needs to be anchored first!")
+ to_chat(user, span_warning("[src] needs to be anchored first!"))
return
- to_chat(user, "You turn [src] [turned_on ? "off" : "on"].")
+ to_chat(user, span_notice("You turn [src] [turned_on ? "off" : "on"]."))
turned_on = !turned_on
/obj/machinery/plumbing/liquid_input_pump/CtrlClick(mob/living/user)
@@ -42,8 +42,8 @@
/obj/machinery/plumbing/liquid_input_pump/examine(mob/user)
. = ..()
- . += "It's currently [turned_on ? "ON" : "OFF"]."
- . += "It's height regulator [height_regulator ? "points at [height_regulator]" : "is disabled"]. (Ctrl-click to change)"
+ . += span_notice("It's currently [turned_on ? "ON" : "OFF"].")
+ . += span_notice("It's height regulator [height_regulator ? "points at [height_regulator]" : "is disabled"]. (Ctrl-click to change)")
/obj/machinery/plumbing/liquid_input_pump/Initialize(mapload, bolt)
. = ..()
@@ -118,9 +118,9 @@
/obj/machinery/plumbing/liquid_output_pump/attack_hand(mob/user)
if(!anchored)
- to_chat(user, "[src] needs to be anchored first!")
+ to_chat(user, span_warning("[src] needs to be anchored first!"))
return
- to_chat(user, "You turn [src] [turned_on ? "off" : "on"].")
+ to_chat(user, span_notice("You turn [src] [turned_on ? "off" : "on"]."))
turned_on = !turned_on
/obj/machinery/plumbing/liquid_output_pump/CtrlClick(mob/living/user)
@@ -136,8 +136,8 @@
/obj/machinery/plumbing/liquid_output_pump/examine(mob/user)
. = ..()
- . += "It's currently [turned_on ? "ON" : "OFF"]."
- . += "It's height regulator [height_regulator ? "points at [height_regulator]" : "is disabled"]. (Ctrl-click to change)"
+ . += span_notice("It's currently [turned_on ? "ON" : "OFF"].")
+ . += span_notice("It's height regulator [height_regulator ? "points at [height_regulator]" : "is disabled"]. (Ctrl-click to change)")
/obj/machinery/plumbing/liquid_output_pump/proc/can_pump()
if(!turned_on || !anchored || panel_open || !isturf(loc) || reagents.total_volume == 0)
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm
index ed1b3b2ad25..4aaacfbc153 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm
@@ -28,24 +28,24 @@
/obj/structure/liquid_pump/attack_hand(mob/user)
if(!anchored)
- to_chat(user, "[src] needs to be anchored first!")
+ to_chat(user, span_warning("[src] needs to be anchored first!"))
return
- to_chat(user, "You turn [src] [turned_on ? "off" : "on"].")
+ to_chat(user, span_notice("You turn [src] [turned_on ? "off" : "on"]."))
toggle_working()
/obj/structure/liquid_pump/AltClick(mob/living/user)
if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY, FALSE, TRUE))
return
- to_chat(user, "You flick [src]'s spewing mode [spewing_mode ? "off" : "on"].")
+ to_chat(user, span_notice("You flick [src]'s spewing mode [spewing_mode ? "off" : "on"]."))
spewing_mode = !spewing_mode
update_icon()
/obj/structure/liquid_pump/examine(mob/user)
. = ..()
- . += "It's anchor bolts are [anchored ? "down and secured" : "up"]."
- . += "It's currently [turned_on ? "ON" : "OFF"]."
- . += "It's mode currently is set to [spewing_mode ? "SPEWING" : "SIPHONING"]. (Alt-click to switch)"
- . += "The pressure gauge shows [reagents.total_volume]/[reagents.maximum_volume]."
+ . += span_notice("It's anchor bolts are [anchored ? "down and secured" : "up"].")
+ . += span_notice("It's currently [turned_on ? "ON" : "OFF"].")
+ . += span_notice("It's mode currently is set to [spewing_mode ? "SPEWING" : "SIPHONING"]. (Alt-click to switch)")
+ . += span_notice("The pressure gauge shows [reagents.total_volume]/[reagents.maximum_volume].")
/obj/structure/liquid_pump/process()
if(!isturf(loc))
diff --git a/modular_skyrat/modules/liquids/code/ocean_flora.dm b/modular_skyrat/modules/liquids/code/ocean_flora.dm
index 6610ced4b82..06ef934e792 100644
--- a/modular_skyrat/modules/liquids/code/ocean_flora.dm
+++ b/modular_skyrat/modules/liquids/code/ocean_flora.dm
@@ -63,11 +63,11 @@
playsound(src, 'sound/items/welder2.ogg', 50, TRUE)
if(first)
- to_chat(user, "You start slicing the [src]...")
+ to_chat(user, span_notice("You start slicing the [src]..."))
if(I.use_tool(src, user, 2 SECONDS))
welds_remaining--
if(welds_remaining <= 0)
- to_chat(user, "You successfully salvage [src].")
+ to_chat(user, span_notice("You successfully salvage [src]."))
new /obj/item/stack/sheet/iron(get_turf(src), rand(SCRAP_METAL_YIELD_LOW, SCRAP_METAL_YIELD_HIGH))
qdel(src)
else
diff --git a/modular_skyrat/modules/lobbyscreen/code/load_servers.dm b/modular_skyrat/modules/lobbyscreen/code/load_servers.dm
index ccd6b72a2b6..d1f627d50c7 100644
--- a/modular_skyrat/modules/lobbyscreen/code/load_servers.dm
+++ b/modular_skyrat/modules/lobbyscreen/code/load_servers.dm
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(serverswap)
return ..()
if(!fexists("config/skyrat/swap_ips.txt"))
- to_chat_immediate(world, "SERVER SWAP ERROR: swap_ips.txt does not exist, unable to set up server swapping!")
+ to_chat_immediate(world, span_boldwarning("SERVER SWAP ERROR: swap_ips.txt does not exist, unable to set up server swapping!"))
return ..()
var/list/lines = world.file2list("config/skyrat/swap_ips.txt")
diff --git a/modular_skyrat/modules/mapping/code/dungeon.dm b/modular_skyrat/modules/mapping/code/dungeon.dm
index 4a4c1802b4c..220c7e0bfa9 100644
--- a/modular_skyrat/modules/mapping/code/dungeon.dm
+++ b/modular_skyrat/modules/mapping/code/dungeon.dm
@@ -87,7 +87,7 @@
climbable = TRUE
/obj/structure/railing/stone/attackby(obj/item/wrench, mob/living/user, params)
- to_chat(user, "You frown as you realise this wall is in fact made of stone, and cannot be uprooted from the ground and dragged along with a mere wrench.")
+ to_chat(user, span_notice("You frown as you realise this wall is in fact made of stone, and cannot be uprooted from the ground and dragged along with a mere wrench."))
return
/obj/structure/railing/stone/left
@@ -122,6 +122,6 @@
/obj/machinery/button/dungeon/attackby(obj/item/W, mob/user, params)
if(W.tool_behaviour == TOOL_SCREWDRIVER)
- to_chat(user, "You prod around the rim of the bricks and try and jam it in. Looks like it isn't coming out this way.")
+ to_chat(user, span_notice("You prod around the rim of the bricks and try and jam it in. Looks like it isn't coming out this way."))
return
// Let's not open the maintenance panel of a stone brick.
diff --git a/modular_skyrat/modules/mapping/code/fluff.dm b/modular_skyrat/modules/mapping/code/fluff.dm
index 251acdc284c..41839e677c5 100644
--- a/modular_skyrat/modules/mapping/code/fluff.dm
+++ b/modular_skyrat/modules/mapping/code/fluff.dm
@@ -97,7 +97,7 @@
if(atom_integrity >= 50) //breaks it a bit earlier than it should, but still takes a few hits to kill it
return
else if(. && !QDELETED(src))
- visible_message("[src] sparks and explodes! You hear a faint, buzzy scream...","You hear a loud pop, followed by a faint, buzzy scream.")
+ visible_message(span_notice("[src] sparks and explodes! You hear a faint, buzzy scream..."), span_hear("You hear a loud pop, followed by a faint, buzzy scream."))
playsound(src.loc, 'modular_skyrat/modules/mapping/sounds/MachineDeath.ogg', 75, TRUE) //Credit to @yungfunnyman#3798 on the SR Discord
do_sparks(2, TRUE, src)
qdel(src)
diff --git a/modular_skyrat/modules/mapping/code/genpop.dm b/modular_skyrat/modules/mapping/code/genpop.dm
index 5b1d57871ce..3bf472b15f1 100644
--- a/modular_skyrat/modules/mapping/code/genpop.dm
+++ b/modular_skyrat/modules/mapping/code/genpop.dm
@@ -28,7 +28,7 @@
break
if(!prisoner_id)
- to_chat(user, "Access Denied.")
+ to_chat(user, span_danger("Access Denied."))
return FALSE
qdel(registered_id)
@@ -36,7 +36,7 @@
locked = FALSE
open(user)
desc = "It's a secure locker for prisoner effects."
- to_chat(user, "You insert your prisoner id into \the [src] and it springs open!")
+ to_chat(user, span_notice("You insert your prisoner id into \the [src] and it springs open!"))
return TRUE
diff --git a/modular_skyrat/modules/mapping/code/machinery.dm b/modular_skyrat/modules/mapping/code/machinery.dm
index d3584cc578a..34dbfeb93b1 100644
--- a/modular_skyrat/modules/mapping/code/machinery.dm
+++ b/modular_skyrat/modules/mapping/code/machinery.dm
@@ -16,8 +16,8 @@
if(flags_1 & NODECONSTRUCT_1)
return TRUE
- user.visible_message("[user] disassembles [src].",
- "You start to disassemble [src]...", "You hear clanking and banging noises.")
+ user.visible_message(span_warning("[user] disassembles [src]."),
+ span_notice("You start to disassemble [src]..."), span_hear("You hear clanking and banging noises."))
if(I.use_tool(src, user, 20, volume=50))
new /obj/item/gps/spaceruin(loc) //really the only non-aesthetic change, gives the space ruin GPS signal
qdel(src)
diff --git a/modular_skyrat/modules/mapping/code/pool.dm b/modular_skyrat/modules/mapping/code/pool.dm
index c054746391c..40ff5983d4f 100644
--- a/modular_skyrat/modules/mapping/code/pool.dm
+++ b/modular_skyrat/modules/mapping/code/pool.dm
@@ -49,7 +49,7 @@
SEND_SIGNAL(A, COMSIG_ADD_MOOD_EVENT, "hotspring", /datum/mood_event/hotspring)
/datum/mood_event/hotspring
- description = "I recently a paddle in some nice warm water! It was so refreshing!\n"
+ description = span_nicegreen("I recently had a paddle in some nice warm water! It was so refreshing!\n")
mood_change = 4
timeout = 20 MINUTES
///////////// MOOD EVENT /////////////
diff --git a/modular_skyrat/modules/materials_glass/code/glass.dm b/modular_skyrat/modules/materials_glass/code/glass.dm
index 7db139a87ab..d09adc0dcea 100644
--- a/modular_skyrat/modules/materials_glass/code/glass.dm
+++ b/modular_skyrat/modules/materials_glass/code/glass.dm
@@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
source = /datum/robot_energy_storage/glass
/obj/item/stack/sheet/glass/suicide_act(mob/living/carbon/user)
- user.visible_message("[user] begins to slice [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message(span_suicide("[user] begins to slice [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
return BRUTELOSS
/obj/item/stack/sheet/glass/fifty
@@ -67,11 +67,11 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
if (get_amount() < 1 || CC.get_amount() < 5)
- to_chat(user, "You attach wire to the [name].")
+ to_chat(user, span_notice("You attach wire to the [name]."))
var/obj/item/stack/light_w/new_tile = new(user.loc)
new_tile.add_fingerprint(user)
return
@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
if(QDELETED(src) && replace)
user.put_in_hands(RG)
else
- to_chat(user, "You need one rod and one sheet of glass to make reinforced glass!")
+ to_chat(user, span_warning("You need one rod and one sheet of glass to make reinforced glass!"))
return
return ..()
@@ -126,7 +126,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
if(QDELETED(src) && replace)
user.put_in_hands(RG)
else
- to_chat(user, "You need one rod and one sheet of plasma glass to make reinforced plasma glass!")
+ to_chat(user, span_warning("You need one rod and one sheet of plasma glass to make reinforced plasma glass!"))
return
else
return ..()
@@ -257,7 +257,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
/obj/item/shard/suicide_act(mob/user)
- user.visible_message("[user] is slitting [user.p_their()] [pick("wrists", "throat")] with the shard of glass! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message(span_suicide("[user] is slitting [user.p_their()] [pick("wrists", "throat")] with the shard of glass! It looks like [user.p_theyre()] trying to commit suicide."))
return (BRUTELOSS)
@@ -306,7 +306,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc
- to_chat(H, "[src] cuts into your hand!")
+ to_chat(H, span_warning("[src] cuts into your hand!"))
H.apply_damage(force*0.5, BRUTE, hit_hand)
/obj/item/shard/attackby(obj/item/I, mob/user, params)
@@ -315,11 +315,11 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
L.attackby(src, user)
else if(istype(I, /obj/item/stack/sheet/cloth))
var/obj/item/stack/sheet/cloth/C = I
- to_chat(user, "You begin to wrap the [C] around the [src]...")
+ to_chat(user, span_notice("You begin to wrap the [C] around the [src]..."))
if(do_after(user, 35, target = src))
var/obj/item/knife/shiv/S = new /obj/item/knife/shiv
C.use(1)
- to_chat(user, "You wrap the [C] around the [src] forming a makeshift weapon.")
+ to_chat(user, span_notice("You wrap the [C] around the [src] forming a makeshift weapon."))
remove_item_from_storage(src)
qdel(src)
user.put_in_hands(S)
@@ -337,7 +337,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
if(G.amount >= G.max_amount)
continue
G.attackby(NG, user)
- to_chat(user, "You add the newly-formed [NG.name] to the stack. It now contains [NG.amount] sheet\s.")
+ to_chat(user, span_notice("You add the newly-formed [NG.name] to the stack. It now contains [NG.amount] sheet\s."))
qdel(src)
return TRUE
diff --git a/modular_skyrat/modules/medical/code/bodypart_aid.dm b/modular_skyrat/modules/medical/code/bodypart_aid.dm
index c74874deab4..3bddf8be9b4 100644
--- a/modular_skyrat/modules/medical/code/bodypart_aid.dm
+++ b/modular_skyrat/modules/medical/code/bodypart_aid.dm
@@ -25,12 +25,12 @@
return
var/mob/living/carbon/C = usr
var/self = (C == bodypart.owner)
- C.visible_message("[C] begins removing [name] from [self ? "[bodypart.owner.p_their(TRUE)]" : "[bodypart.owner]'s" ] [bodypart.name]...", "You begin to remove [name] from [self ? "your" : "[bodypart.owner]'s"] [bodypart.name]...")
+ C.visible_message(span_notice("[C] begins removing [name] from [self ? "[bodypart.owner.p_their(TRUE)]" : "[bodypart.owner]'s" ] [bodypart.name]..."), span_notice("You begin to remove [name] from [self ? "your" : "[bodypart.owner]'s"] [bodypart.name]..."))
if(!do_after(C, (self ? SELF_AID_REMOVE_DELAY : OTHER_AID_REMOVE_DELAY), target=bodypart.owner))
return
if(QDELETED(src))
return
- C.visible_message("[C] removes [name] from [self ? "[bodypart.owner.p_their(TRUE)]" : "[bodypart.owner]'s" ] [bodypart.name].", "You remove [name] from [self ? "your" : "[bodypart.owner]'s" ] [bodypart.name].")
+ C.visible_message(span_notice("[C] removes [name] from [self ? "[bodypart.owner.p_their(TRUE)]" : "[bodypart.owner]'s" ] [bodypart.name]."), span_notice("You remove [name] from [self ? "your" : "[bodypart.owner]'s" ] [bodypart.name]."))
var/obj/item/gotten = rip_off()
if(gotten && !C.put_in_hands(gotten))
gotten.forceMove(get_turf(C))
@@ -57,7 +57,7 @@
integrity--
if(integrity <= 0)
if(bodypart.owner)
- to_chat(bodypart.owner, "The [name] on your [bodypart.name] tears and falls off!")
+ to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] tears and falls off!"))
qdel(src)
/**
@@ -218,11 +218,11 @@
if(type == GAUZE_STAIN_BLOOD && !blood_stained)
blood_stained = TRUE
if(bodypart.owner)
- to_chat(bodypart.owner, "The [name] on your [bodypart.name] [pick(list("pools", "trickles", "seeps"))] with blood.")
+ to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] [pick(list("pools", "trickles", "seeps"))] with blood."))
else if(type == GAUZE_STAIN_PUS && !pus_stained)
pus_stained = TRUE
if(bodypart.owner)
- to_chat(bodypart.owner, "The [name] on your [bodypart.name] [pick(list("pools", "trickles", "seeps"))] with pus.")
+ to_chat(bodypart.owner, span_warning("The [name] on your [bodypart.name] [pick(list("pools", "trickles", "seeps"))] with pus."))
/datum/bodypart_aid/gauze/improvised
name = "improvised gauze"
diff --git a/modular_skyrat/modules/medical/code/carbon_defense.dm b/modular_skyrat/modules/medical/code/carbon_defense.dm
index 06dcd0e45c0..6f2dcd6ccfb 100644
--- a/modular_skyrat/modules/medical/code/carbon_defense.dm
+++ b/modular_skyrat/modules/medical/code/carbon_defense.dm
@@ -3,17 +3,17 @@
return
var/starting_hand_index = active_hand_index
if(starting_hand_index == grasped_part.held_index)
- to_chat(src, "You can't grasp your [grasped_part.name] with itself!")
+ to_chat(src, span_danger("You can't grasp your [grasped_part.name] with itself!"))
return
- to_chat(src, "You try grasping at your [grasped_part.name], trying to stop the bleeding...")
+ to_chat(src, span_warning("You try grasping at your [grasped_part.name], trying to stop the bleeding..."))
if(!do_after(src, 1.5 SECONDS))
- to_chat(src, "You fail to grasp your [grasped_part.name].")
+ to_chat(src, span_danger("You fail to grasp your [grasped_part.name]."))
return
var/obj/item/self_grasp/grasp = new
if(starting_hand_index != active_hand_index || !put_in_active_hand(grasp))
- to_chat(src, "You fail to grasp your [grasped_part.name].")
+ to_chat(src, span_danger("You fail to grasp your [grasped_part.name]."))
QDEL_NULL(grasp)
return
grasp.grasp_limb(grasped_part)
diff --git a/modular_skyrat/modules/medical/code/carbon_examine.dm b/modular_skyrat/modules/medical/code/carbon_examine.dm
index bb4874e673e..14be697fbb2 100644
--- a/modular_skyrat/modules/medical/code/carbon_examine.dm
+++ b/modular_skyrat/modules/medical/code/carbon_examine.dm
@@ -1,5 +1,5 @@
/mob/living/carbon/examine_more(mob/user)
- var/msg = list("You examine [src] closer, and note the following...")
+ var/msg = list(span_notice("You examine [src] closer, and note the following..."))
var/t_His = p_their(TRUE)
var/t_He = p_they(TRUE)
var/t_Has = p_have()
diff --git a/modular_skyrat/modules/medical/code/splint.dm b/modular_skyrat/modules/medical/code/splint.dm
index f8c707fff90..f2bd28261a5 100644
--- a/modular_skyrat/modules/medical/code/splint.dm
+++ b/modular_skyrat/modules/medical/code/splint.dm
@@ -17,10 +17,10 @@
/obj/item/stack/medical/splint/try_heal(mob/living/M, mob/user, silent)
var/obj/item/bodypart/limb = M.get_bodypart(check_zone(user.zone_selected))
if(!limb)
- to_chat(user, "There's nothing there to bandage!")
+ to_chat(user, span_notice("There's nothing there to bandage!"))
return
if(!LAZYLEN(limb.wounds))
- to_chat(user, "There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo
+ to_chat(user, span_notice("There's no wounds that require bandaging on [user==M ? "your" : "[M]'s"] [limb.name]!")) // good problem to have imo
return
var/splintable_wound = FALSE
@@ -30,18 +30,18 @@
splintable_wound = TRUE
break
if(!splintable_wound)
- to_chat(user, "There's no wounds that require splinting on [user==M ? "your" : "[M]'s"] [limb.name]!") // good problem to have imo
+ to_chat(user, span_notice("There's no wounds that require splinting on [user==M ? "your" : "[M]'s"] [limb.name]!")) // good problem to have imo
return
if(limb.current_splint)
- to_chat(user, "[user==M ? "Your" : "[M]'s"] [limb.name] is already fastened in a splint!")
+ to_chat(user, span_warning("[user==M ? "Your" : "[M]'s"] [limb.name] is already fastened in a splint!"))
return
- user.visible_message("[user] begins fastening [M]'s [limb.name] with [src]...", "You begin to fasten [user == M ? "your" : "[M]'s"] [limb.name] with [src]...")
+ user.visible_message(span_warning("[user] begins fastening [M]'s [limb.name] with [src]..."), span_warning("You begin to fasten [user == M ? "your" : "[M]'s"] [limb.name] with [src]..."))
if(!do_after(user, (user == M ? self_delay : other_delay), target=M))
return
- user.visible_message("[user] applies [src] to [M]'s [limb.name].", "You splint [user == M ? "your" : "[M]'s"] [limb.name].")
+ user.visible_message(span_green("[user] applies [src] to [M]'s [limb.name]."), span_green("You splint [user == M ? "your" : "[M]'s"] [limb.name]."))
limb.apply_splint(src)
/obj/item/stack/medical/splint/twelve
diff --git a/modular_skyrat/modules/medical/code/wounds/bones.dm b/modular_skyrat/modules/medical/code/wounds/bones.dm
index 6f097302bf1..a1efcf0dff5 100644
--- a/modular_skyrat/modules/medical/code/wounds/bones.dm
+++ b/modular_skyrat/modules/medical/code/wounds/bones.dm
@@ -48,7 +48,7 @@
I = victim.get_inactive_held_item()
if(I && victim.dropItemToGround(I))
- victim.visible_message("[victim] drops [I] in shock!", "The force on your [limb.name] causes you to drop [I]!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_danger("[victim] drops [I] in shock!"), span_warning("The force on your [limb.name] causes you to drop [I]!"), vision_distance=COMBAT_MESSAGE_RANGE)
update_inefficiencies()
@@ -83,13 +83,13 @@
if(prob(severity * 3))
victim.take_bodypart_damage(rand(1, severity * 2), stamina=rand(2, severity * 2.5), wound_bonus=CANT_WOUND)
if(prob(33))
- to_chat(victim, "You feel a sharp pain in your body as your bones are reforming!")
+ to_chat(victim, span_danger("You feel a sharp pain in your body as your bones are reforming!"))
if(regen_ticks_current > regen_ticks_needed)
if(!victim || !limb)
qdel(src)
return
- to_chat(victim, "Your [limb.name] has recovered from your fracture!")
+ to_chat(victim, span_green("Your [limb.name] has recovered from your fracture!"))
remove_wound()
/// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so
@@ -103,11 +103,11 @@
if(prob((severity - 1) * 15))
// And you have a 70% or 50% chance to actually land the blow, respectively
if(prob(70 - 20 * (severity - 1)))
- to_chat(victim, "The fracture in your [limb.name] shoots with pain as you strike [target]!")
+ to_chat(victim, span_userdanger("The fracture in your [limb.name] shoots with pain as you strike [target]!"))
limb.receive_damage(brute=rand(1,5))
else
- victim.visible_message("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!", \
- "You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.name], recoiling from pain!"), \
+ span_userdanger("You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE)
INVOKE_ASYNC(victim, /mob.proc/emote, "scream")
victim.Stun(0.5 SECONDS)
limb.receive_damage(brute=rand(3,7))
@@ -128,10 +128,10 @@
if(1 to 6)
victim.bleed(blood_bled, TRUE)
if(7 to 13)
- victim.visible_message("A thin stream of blood drips from [victim]'s mouth from the blow to [victim.p_their()] chest.", "You cough up a bit of blood from the blow to your chest.", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_smalldanger("A thin stream of blood drips from [victim]'s mouth from the blow to [victim.p_their()] chest."), span_danger("You cough up a bit of blood from the blow to your chest."), vision_distance=COMBAT_MESSAGE_RANGE)
victim.bleed(blood_bled, TRUE)
if(14 to 19)
- victim.visible_message("Blood spews out of [victim]'s mouth from the blow to [victim.p_their()] chest!", "You spit out a string of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_smalldanger("Blood spews out of [victim]'s mouth from the blow to [victim.p_their()] chest!"), span_danger("You spit out a string of blood from the blow to your chest!"), vision_distance=COMBAT_MESSAGE_RANGE)
new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir)
victim.bleed(blood_bled)
if(20 to INFINITY)
@@ -225,7 +225,7 @@
/datum/wound/blunt/moderate/proc/door_crush()
SIGNAL_HANDLER
if(prob(33))
- victim.visible_message("[victim]'s dislocated [limb.name] pops back into place!", "Your dislocated [limb.name] pops back into place! Ow!")
+ victim.visible_message(span_danger("[victim]'s dislocated [limb.name] pops back into place!"), span_userdanger("Your dislocated [limb.name] pops back into place! Ow!"))
remove_wound()
/datum/wound/blunt/moderate/try_handling(mob/living/carbon/human/user)
@@ -233,12 +233,12 @@
return FALSE
if(user.grab_state == GRAB_PASSIVE)
- to_chat(user, "You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [lowertext(name)]!")
+ to_chat(user, span_warning("You must have [victim] in an aggressive grab to manipulate [victim.p_their()] [lowertext(name)]!"))
return TRUE
if(user.grab_state >= GRAB_AGGRESSIVE)
- user.visible_message("[user] begins twisting and straining [victim]'s dislocated [limb.name]!", "You begin twisting and straining [victim]'s dislocated [limb.name]...", ignored_mobs=victim)
- to_chat(victim, "[user] begins twisting and straining your dislocated [limb.name]!")
+ user.visible_message(span_danger("[user] begins twisting and straining [victim]'s dislocated [limb.name]!"), span_notice("You begin twisting and straining [victim]'s dislocated [limb.name]..."), ignored_mobs=victim)
+ to_chat(victim, span_userdanger("[user] begins twisting and straining your dislocated [limb.name]!"))
if(!user.combat_mode)
chiropractice(user)
else
@@ -253,14 +253,14 @@
return
if(prob(65))
- user.visible_message("[user] snaps [victim]'s dislocated [limb.name] back into place!", "You snap [victim]'s dislocated [limb.name] back into place!", ignored_mobs=victim)
- to_chat(victim, "[user] snaps your dislocated [limb.name] back into place!")
+ user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.name] back into place!"), span_notice("You snap [victim]'s dislocated [limb.name] back into place!"), ignored_mobs=victim)
+ to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] back into place!"))
victim.emote("scream")
limb.receive_damage(brute=20, wound_bonus=CANT_WOUND)
qdel(src)
else
- user.visible_message("[user] wrenches [victim]'s dislocated [limb.name] around painfully!", "You wrench [victim]'s dislocated [limb.name] around painfully!", ignored_mobs=victim)
- to_chat(victim, "[user] wrenches your dislocated [limb.name] around painfully!")
+ user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.name] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.name] around painfully!"), ignored_mobs=victim)
+ to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.name] around painfully!"))
limb.receive_damage(brute=10, wound_bonus=CANT_WOUND)
chiropractice(user)
@@ -272,33 +272,33 @@
return
if(prob(65))
- user.visible_message("[user] snaps [victim]'s dislocated [limb.name] with a sickening crack!", "You snap [victim]'s dislocated [limb.name] with a sickening crack!", ignored_mobs=victim)
- to_chat(victim, "[user] snaps your dislocated [limb.name] with a sickening crack!")
+ user.visible_message(span_danger("[user] snaps [victim]'s dislocated [limb.name] with a sickening crack!"), span_danger("You snap [victim]'s dislocated [limb.name] with a sickening crack!"), ignored_mobs=victim)
+ to_chat(victim, span_userdanger("[user] snaps your dislocated [limb.name] with a sickening crack!"))
victim.emote("scream")
limb.receive_damage(brute=25, wound_bonus=30)
else
- user.visible_message("[user] wrenches [victim]'s dislocated [limb.name] around painfully!", "You wrench [victim]'s dislocated [limb.name] around painfully!", ignored_mobs=victim)
- to_chat(victim, "[user] wrenches your dislocated [limb.name] around painfully!")
+ user.visible_message(span_danger("[user] wrenches [victim]'s dislocated [limb.name] around painfully!"), span_danger("You wrench [victim]'s dislocated [limb.name] around painfully!"), ignored_mobs=victim)
+ to_chat(victim, span_userdanger("[user] wrenches your dislocated [limb.name] around painfully!"))
limb.receive_damage(brute=10, wound_bonus=CANT_WOUND)
malpractice(user)
/datum/wound/blunt/moderate/treat(obj/item/I, mob/user)
if(victim == user)
- victim.visible_message("[user] begins resetting [victim.p_their()] [limb.name] with [I].", "You begin resetting your [limb.name] with [I]...")
+ victim.visible_message(span_danger("[user] begins resetting [victim.p_their()] [limb.name] with [I]."), span_warning("You begin resetting your [limb.name] with [I]..."))
else
- user.visible_message("[user] begins resetting [victim]'s [limb.name] with [I].", "You begin resetting [victim]'s [limb.name] with [I]...")
+ user.visible_message(span_danger("[user] begins resetting [victim]'s [limb.name] with [I]."), span_notice("You begin resetting [victim]'s [limb.name] with [I]..."))
if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists)))
return
if(victim == user)
limb.receive_damage(brute=15, wound_bonus=CANT_WOUND)
- victim.visible_message("[user] finishes resetting [victim.p_their()] [limb.name]!", "You reset your [limb.name]!")
+ victim.visible_message(span_danger("[user] finishes resetting [victim.p_their()] [limb.name]!"), span_userdanger("You reset your [limb.name]!"))
else
limb.receive_damage(brute=10, wound_bonus=CANT_WOUND)
- user.visible_message("[user] finishes resetting [victim]'s [limb.name]!", "You finish resetting [victim]'s [limb.name]!", victim)
- to_chat(victim, "[user] resets your [limb.name]!")
+ user.visible_message(span_danger("[user] finishes resetting [victim]'s [limb.name]!"), span_nicegreen("You finish resetting [victim]'s [limb.name]!"), victim)
+ to_chat(victim, span_userdanger("[user] resets your [limb.name]!"))
victim.emote("scream")
qdel(src)
@@ -362,10 +362,10 @@
/// if someone is using bone gel on our wound
/datum/wound/blunt/proc/gel(obj/item/stack/medical/bone_gel/I, mob/user)
if(gelled)
- to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!")
+ to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already coated with bone gel!"))
return
- user.visible_message("[user] begins hastily applying [I] to [victim]'s' [limb.name]...", "You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label...")
+ user.visible_message(span_danger("[user] begins hastily applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name], disregarding the warning label..."))
if(!do_after(user, base_treat_time * 1.5 * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists)))
return
@@ -373,8 +373,8 @@
I.use(1)
victim.emote("scream")
if(user != victim)
- user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim)
- to_chat(victim, "[user] finishes applying [I] to your [limb.name], and you can feel the bones exploding with pain as they begin melting and reforming!")
+ user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim)
+ to_chat(victim, span_userdanger("[user] finishes applying [I] to your [limb.name], and you can feel the bones exploding with pain as they begin melting and reforming!"))
else
var/painkiller_bonus = 0
if(victim.drunkenness > 10)
@@ -389,10 +389,10 @@
painkiller_bonus += 20
if(prob(25 + (20 * (severity - 2)) - painkiller_bonus)) // 25%/45% chance to fail self-applying with severe and critical wounds, modded by painkillers
- victim.visible_message("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!", "You pass out from the pain of applying [I] to your [limb.name] before you can finish!")
+ victim.visible_message(span_danger("[victim] fails to finish applying [I] to [victim.p_their()] [limb.name], passing out from the pain!"), span_notice("You pass out from the pain of applying [I] to your [limb.name] before you can finish!"))
victim.AdjustUnconscious(5 SECONDS)
return
- victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], grimacing from the pain!", "You finish applying [I] to your [limb.name], and your bones explode in pain!")
+ victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], grimacing from the pain!"), span_notice("You finish applying [I] to your [limb.name], and your bones explode in pain!"))
limb.receive_damage(25, stamina=100, wound_bonus=CANT_WOUND)
if(!gelled)
@@ -401,13 +401,13 @@
/// if someone is using surgical tape on our wound
/datum/wound/blunt/proc/tape(obj/item/stack/sticky_tape/surgical/I, mob/user)
if(!gelled)
- to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!")
+ to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] must be coated with bone gel to perform this emergency operation!"))
return
if(taped)
- to_chat(user, "[user == victim ? "Your" : "[victim]'s"] [limb.name] is already wrapped in [I.name] and reforming!")
+ to_chat(user, span_warning("[user == victim ? "Your" : "[victim]'s"] [limb.name] is already wrapped in [I.name] and reforming!"))
return
- user.visible_message("[user] begins applying [I] to [victim]'s' [limb.name]...", "You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")
+ user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.name]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]..."))
if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists)))
return
@@ -417,10 +417,10 @@
I.use(1)
if(user != victim)
- user.visible_message("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!", "You finish applying [I] to [victim]'s [limb.name]!", ignored_mobs=victim)
- to_chat(victim, "[user] finishes applying [I] to your [limb.name], you immediately begin to feel your bones start to reform!")
+ user.visible_message(span_notice("[user] finishes applying [I] to [victim]'s [limb.name], emitting a fizzing noise!"), span_notice("You finish applying [I] to [victim]'s [limb.name]!"), ignored_mobs=victim)
+ to_chat(victim, span_green("[user] finishes applying [I] to your [limb.name], you immediately begin to feel your bones start to reform!"))
else
- victim.visible_message("[victim] finishes applying [I] to [victim.p_their()] [limb.name], !", "You finish applying [I] to your [limb.name], and you immediately begin to feel your bones start to reform!")
+ victim.visible_message(span_notice("[victim] finishes applying [I] to [victim.p_their()] [limb.name], !"), span_green("You finish applying [I] to your [limb.name], and you immediately begin to feel your bones start to reform!"))
taped = TRUE
processes = TRUE
@@ -439,9 +439,9 @@
if(!gelled)
. += "Alternative Treatment: Apply bone gel directly to injured limb, then apply surgical tape to begin bone regeneration. This is both excruciatingly painful and slow, and only recommended in dire circumstances.\n"
else if(!taped)
- . += "Continue Alternative Treatment: Apply surgical tape directly to injured limb to begin bone regeneration. Note, this is both excruciatingly painful and slow, though sleep or laying down will speed recovery.\n"
+ . += span_notice("Continue Alternative Treatment: Apply surgical tape directly to injured limb to begin bone regeneration. Note, this is both excruciatingly painful and slow, though sleep or laying down will speed recovery.\n")
else
- . += "Note: Bone regeneration in effect. Bone is [round(regen_ticks_current*100/regen_ticks_needed)]% regenerated.\n"
+ . += span_notice("Note: Bone regeneration in effect. Bone is [round(regen_ticks_current*100/regen_ticks_needed)]% regenerated.\n")
if(limb.body_zone == BODY_ZONE_HEAD)
. += "Cranial Trauma Detected: Patient will suffer random bouts of [severity == WOUND_SEVERITY_SEVERE ? "mild" : "severe"] brain traumas until bone is repaired."
diff --git a/modular_skyrat/modules/medical/code/wounds/burns.dm b/modular_skyrat/modules/medical/code/wounds/burns.dm
index 762d9685d73..6e41e3b8290 100644
--- a/modular_skyrat/modules/medical/code/wounds/burns.dm
+++ b/modular_skyrat/modules/medical/code/wounds/burns.dm
@@ -37,7 +37,7 @@
if(strikes_to_lose_limb == 0) // we've already hit sepsis, nothing more to do
victim.adjustToxLoss(0.5)
if(prob(1))
- victim.visible_message("The infection on the remnants of [victim]'s [limb.name] shift and bubble nauseatingly!", "You can feel the infection on the remnants of your [limb.name] coursing through your veins!", vision_distance = COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_danger("The infection on the remnants of [victim]'s [limb.name] shift and bubble nauseatingly!"), span_warning("You can feel the infection on the remnants of your [limb.name] coursing through your veins!"), vision_distance = COMBAT_MESSAGE_RANGE)
return
if(victim.reagents)
@@ -64,7 +64,7 @@
// here's the check to see if we're cleared up
if((flesh_damage <= 0) && (infestation <= 1))
- to_chat(victim, "The burns on your [limb.name] have cleared up!")
+ to_chat(victim, span_green("The burns on your [limb.name] have cleared up!"))
qdel(src)
return
@@ -82,25 +82,25 @@
if(prob(30))
victim.adjustToxLoss(0.2)
if(prob(6))
- to_chat(victim, "The blisters on your [limb.name] ooze a strange pus...")
+ to_chat(victim, span_warning("The blisters on your [limb.name] ooze a strange pus..."))
if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL)
if(!disabling && prob(2))
- to_chat(victim, "Your [limb.name] completely locks up, as you struggle for control against the infection!")
+ to_chat(victim, span_warning("Your [limb.name] completely locks up, as you struggle for control against the infection!"))
set_disabling(TRUE)
else if(disabling && prob(8))
- to_chat(victim, "You regain sensation in your [limb.name], but it's still in terrible shape!")
+ to_chat(victim, span_notice("You regain sensation in your [limb.name], but it's still in terrible shape!"))
set_disabling(FALSE)
else if(prob(20))
victim.adjustToxLoss(0.5)
if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC)
if(!disabling && prob(3))
- to_chat(victim, "You suddenly lose all sensation of the festering infection in your [limb.name]!")
+ to_chat(victim, span_warning("You suddenly lose all sensation of the festering infection in your [limb.name]!"))
set_disabling(TRUE)
else if(disabling && prob(3))
- to_chat(victim, "You can barely feel your [limb.name] again, and you have to strain to retain motor control!")
+ to_chat(victim, span_notice("You can barely feel your [limb.name] again, and you have to strain to retain motor control!"))
set_disabling(FALSE)
else if(prob(1))
- to_chat(victim, "You contemplate life without your [limb.name]...")
+ to_chat(victim, span_warning("You contemplate life without your [limb.name]..."))
victim.adjustToxLoss(0.75)
else if(prob(4))
victim.adjustToxLoss(1)
@@ -108,13 +108,13 @@
if(prob(infestation))
switch(strikes_to_lose_limb)
if(3 to INFINITY)
- to_chat(victim, "The skin on your [limb.name] is literally dripping off, you feel awful!")
+ to_chat(victim, span_deadsay("The skin on your [limb.name] is literally dripping off, you feel awful!"))
if(2)
- to_chat(victim, "The infection in your [limb.name] is literally dripping off, you feel horrible!")
+ to_chat(victim, span_deadsay("The infection in your [limb.name] is literally dripping off, you feel horrible!"))
if(1)
- to_chat(victim, "Infection has just about completely claimed your [limb.name]!")
+ to_chat(victim, span_deadsay("Infection has just about completely claimed your [limb.name]!"))
if(0)
- to_chat(victim, "The last of the nerve endings in your [limb.name] wither away, as the infection completely paralyzes your joint connector.")
+ to_chat(victim, span_deadsay("The last of the nerve endings in your [limb.name] wither away, as the infection completely paralyzes your joint connector."))
threshold_penalty = 120 // piss easy to destroy
var/datum/brain_trauma/severe/paralysis/sepsis = new (limb.body_zone)
victim.gain_trauma(sepsis)
@@ -122,7 +122,7 @@
/datum/wound/burn/get_examine_description(mob/user)
if(strikes_to_lose_limb <= 0)
- return "[victim.p_their(TRUE)] [limb.name] has locked up completely and is non-functional."
+ return span_deadsay("[victim.p_their(TRUE)] [limb.name] has locked up completely and is non-functional.")
var/list/condition = list("[victim.p_their(TRUE)] [limb.name] [examine_desc]")
if(limb.current_gauze)
@@ -141,15 +141,13 @@
else
switch(infestation)
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
- //condition += ", with early signs of infection."
condition += ", with small spots of discoloration along the nearby veins!"
if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL)
- //condition += ", with growing clouds of infection."
condition += ", with growing clouds of infection."
if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC)
condition += ", with streaks of rotten, pulsating infection!"
if(WOUND_INFECTION_SEPTIC to INFINITY)
- return "[victim.p_their(TRUE)] [limb.name] is a mess of charred skin and infected rot!"
+ return span_deadsay("[victim.p_their(TRUE)] [limb.name] is a mess of charred skin and infected rot!")
else
condition += "!"
@@ -189,31 +187,31 @@
/// if someone is using ointment or mesh on our burns
/datum/wound/burn/proc/ointmentmesh(obj/item/stack/medical/I, mob/user)
- user.visible_message("[user] begins applying [I] to [victim]'s [limb.name]...", "You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")
+ user.visible_message(span_notice("[user] begins applying [I] to [victim]'s [limb.name]..."), span_notice("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]..."))
if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, .proc/still_exists)))
return
limb.heal_damage(I.heal_brute, I.heal_burn)
- user.visible_message("[user] applies [I] to [victim].", "You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name].")
+ user.visible_message(span_green("[user] applies [I] to [victim]."), span_green("You apply [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]."))
I.use(1)
sanitization += I.sanitization
flesh_healing += I.flesh_regeneration
if((infestation <= 0 || sanitization >= infestation) && (flesh_damage <= 0 || flesh_healing > flesh_damage))
- to_chat(user, "You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover.")
+ to_chat(user, span_notice("You've done all you can with [I], now you must wait for the flesh on [victim]'s [limb.name] to recover."))
else
try_treating(I, user)
/// Paramedic UV penlights
/datum/wound/burn/proc/uv(obj/item/flashlight/pen/paramedic/I, mob/user)
if(!COOLDOWN_FINISHED(I, uv_cooldown))
- to_chat(user, "[I] is still recharging!")
+ to_chat(user, span_notice("[I] is still recharging!"))
return
if(infestation <= 0 || infestation < sanitization)
- to_chat(user, "There's no infection to treat on [victim]'s [limb.name]!")
+ to_chat(user, span_notice("There's no infection to treat on [victim]'s [limb.name]!"))
return
- user.visible_message("[user] flashes the burns on [victim]'s [limb] with [I].", "You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I].", vision_distance=COMBAT_MESSAGE_RANGE)
+ user.visible_message(span_notice("[user] flashes the burns on [victim]'s [limb] with [I]."), span_notice("You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]."), vision_distance=COMBAT_MESSAGE_RANGE)
sanitization += I.uv_power
COOLDOWN_START(I, uv_cooldown, I.uv_cooldown_length)
@@ -223,7 +221,7 @@
else if(istype(I, /obj/item/stack/medical/mesh))
var/obj/item/stack/medical/mesh/mesh_check = I
if(!mesh_check.is_open)
- to_chat(user, "You need to open [mesh_check] first.")
+ to_chat(user, span_warning("You need to open [mesh_check] first."))
return
ointmentmesh(mesh_check, user)
else if(istype(I, /obj/item/flashlight/pen/paramedic))
@@ -235,7 +233,7 @@
if(flesh_healing > 0)
flesh_damage = max(0, flesh_damage - 0.2)
if((flesh_damage <= 0) && (infestation <= WOUND_INFECTION_MODERATE))
- to_chat(victim, "The burns on your [limb.name] have cleared up!")
+ to_chat(victim, span_green("The burns on your [limb.name] have cleared up!"))
qdel(src)
return
if(sanitization > 0)
diff --git a/modular_skyrat/modules/medical/code/wounds/muscle.dm b/modular_skyrat/modules/medical/code/wounds/muscle.dm
index 57284a8c4ab..362d52d902e 100644
--- a/modular_skyrat/modules/medical/code/wounds/muscle.dm
+++ b/modular_skyrat/modules/medical/code/wounds/muscle.dm
@@ -29,7 +29,7 @@
I = victim.get_inactive_held_item()
if(I && victim.dropItemToGround(I))
- victim.visible_message("[victim] drops [I] in shock!", "The force on your [limb.name] causes you to drop [I]!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_danger("[victim] drops [I] in shock!"), span_warning("The force on your [limb.name] causes you to drop [I]!"), vision_distance=COMBAT_MESSAGE_RANGE)
update_inefficiencies()
@@ -58,7 +58,7 @@
if(!victim || !limb)
qdel(src)
return
- to_chat(victim, "Your [limb.name] has regenerated its muscle!")
+ to_chat(victim, span_green("Your [limb.name] has regenerated its muscle!"))
remove_wound()
/// If we're a human who's punching something with a broken arm, we might hurt ourselves doing so
@@ -72,11 +72,11 @@
if(prob(severity * 15))
// And you have a 70% or 50% chance to actually land the blow, respectively
if(prob(70 - 20 * severity))
- to_chat(victim, "The damaged muscle in your [limb.name] shoots with pain as you strike [target]!")
+ to_chat(victim, span_userdanger("The damaged muscle in your [limb.name] shoots with pain as you strike [target]!"))
limb.receive_damage(brute=rand(1,5))
else
- victim.visible_message("[victim] weakly strikes [target] with [victim.p_their()] swollen [limb.name], recoiling from pain!", \
- "You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] swollen [limb.name], recoiling from pain!"), \
+ span_userdanger("You fail to strike [target] as the fracture in your [limb.name] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE)
INVOKE_ASYNC(victim, /mob.proc/emote, "scream")
victim.Stun(0.5 SECONDS)
limb.receive_damage(brute=rand(3,7))
diff --git a/modular_skyrat/modules/medical/code/wounds/pierce.dm b/modular_skyrat/modules/medical/code/wounds/pierce.dm
index 49eccc338c0..c189988af7c 100644
--- a/modular_skyrat/modules/medical/code/wounds/pierce.dm
+++ b/modular_skyrat/modules/medical/code/wounds/pierce.dm
@@ -47,14 +47,14 @@
if(1 to 6)
victim.bleed(blood_bled, TRUE)
if(7 to 13)
- victim.visible_message("Blood droplets fly from the hole in [victim]'s [limb.name].", "You cough up a bit of blood from the blow to your [limb.name].", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_smalldanger("Blood droplets fly from the hole in [victim]'s [limb.name]."), span_danger("You cough up a bit of blood from the blow to your [limb.name]."), vision_distance=COMBAT_MESSAGE_RANGE)
victim.bleed(blood_bled, TRUE)
if(14 to 19)
- victim.visible_message("A small stream of blood spurts from the hole in [victim]'s [limb.name]!", "You spit out a string of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_smalldanger("A small stream of blood spurts from the hole in [victim]'s [limb.name]!"), span_danger("You spit out a string of blood from the blow to your [limb.name]!"), vision_distance=COMBAT_MESSAGE_RANGE)
new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir)
victim.bleed(blood_bled)
if(20 to INFINITY)
- victim.visible_message("A spray of blood streams from the gash in [victim]'s [limb.name]!", "You choke up on a spray of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE)
+ victim.visible_message(span_danger("A spray of blood streams from the gash in [victim]'s [limb.name]!"), span_danger("You choke up on a spray of blood from the blow to your [limb.name]!"), vision_distance=COMBAT_MESSAGE_RANGE)
victim.bleed(blood_bled)
new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir)
victim.add_splatter_floor(get_step(victim.loc, victim.dir))
@@ -72,7 +72,7 @@
if(victim.bodytemperature < (BODYTEMP_NORMAL - 10))
blood_flow -= 0.2
if(prob(5))
- to_chat(victim, "You feel the [lowertext(name)] in your [limb.name] firming up from the cold!")
+ to_chat(victim, span_notice("You feel the [lowertext(name)] in your [limb.name] firming up from the cold!"))
if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS))
blood_flow += 0.5 // old heparin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first
@@ -109,10 +109,10 @@
/// If someone is using a suture to close this puncture
/datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user)
var/self_penalty_mult = (user == victim ? 1.4 : 1)
- user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+ user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.name] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]..."))
if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
return
- user.visible_message("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
+ user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"]."))
var/blood_sutured = I.stop_bleeding / self_penalty_mult
blood_flow -= blood_sutured
limb.heal_damage(I.heal_brute, I.heal_burn)
@@ -121,18 +121,18 @@
if(blood_flow > 0)
try_treating(I, user)
else
- to_chat(user, "You successfully close the hole in [user == victim ? "your" : "[victim]'s"] [limb.name].")
+ to_chat(user, span_green("You successfully close the hole in [user == victim ? "your" : "[victim]'s"] [limb.name]."))
/// If someone is using either a cautery tool or something with heat to cauterize this pierce
/datum/wound/pierce/proc/tool_cauterize(obj/item/I, mob/user)
var/improv_penalty_mult = (I.tool_behaviour == TOOL_CAUTERY ? 1 : 1.25) // 25% longer and less effective if you don't use a real cautery
var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself
- user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+ user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.name] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]..."))
if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
return
- user.visible_message("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].")
+ user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim]."))
limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND)
if(prob(30))
victim.emote("scream")
diff --git a/modular_skyrat/modules/medical/code/wounds/slash.dm b/modular_skyrat/modules/medical/code/wounds/slash.dm
index 6d910156f05..fd2fc453049 100644
--- a/modular_skyrat/modules/medical/code/wounds/slash.dm
+++ b/modular_skyrat/modules/medical/code/wounds/slash.dm
@@ -135,7 +135,7 @@
if(demotes_to)
replace_wound(demotes_to)
else
- to_chat(victim, "The cut on your [limb.name] has stopped bleeding!")
+ to_chat(victim, span_green("The cut on your [limb.name] has stopped bleeding!"))
qdel(src)
@@ -167,13 +167,13 @@
if(user.pulling != victim || user.zone_selected != limb.body_zone || !user.combat_mode || !isfelinid(user) || !victim.can_inject(user, TRUE))
return FALSE
if(DOING_INTERACTION_WITH_TARGET(user, victim))
- to_chat(user, "You're already interacting with [victim]!")
+ to_chat(user, span_warning("You're already interacting with [victim]!"))
return
if(user.is_mouth_covered())
- to_chat(user, "Your mouth is covered, you can't lick [victim]'s wounds!")
+ to_chat(user, span_warning("Your mouth is covered, you can't lick [victim]'s wounds!"))
return
if(!user.getorganslot(ORGAN_SLOT_TONGUE))
- to_chat(user, "You can't lick wounds without a tongue!") // f in chat
+ to_chat(user, span_warning("You can't lick wounds without a tongue!")) // f in chat
return
lick_wounds(user)
@@ -188,19 +188,19 @@
continue
user.ForceContractDisease(iter_disease)
- user.visible_message("[user] begins licking the wounds on [victim]'s [limb.name].", "You begin licking the wounds on [victim]'s [limb.name]...", ignored_mobs=victim)
- to_chat(victim, "[user] begins to lick the wounds on your [limb.name].[user] licks the wounds on [victim]'s [limb.name].", "You lick some of the wounds on [victim]'s [limb.name]", ignored_mobs=victim)
- to_chat(victim, "[user] licks the wounds on your [limb.name]! minimum_flow)
try_handling(user)
else if(demotes_to)
- to_chat(user, "You successfully lower the severity of [victim]'s cuts.")
+ to_chat(user, span_green("You successfully lower the severity of [victim]'s cuts."))
/datum/wound/slash/on_xadone(power)
. = ..()
@@ -213,7 +213,7 @@
/// If someone's putting a laser gun up to our cut to cauterize it
/datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user)
var/self_penalty_mult = (user == victim ? 1.25 : 1)
- user.visible_message("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]...", "You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]...")
+ user.visible_message(span_warning("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]..."), span_userdanger("You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.name]..."))
if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
return
var/damage = lasgun.chambered.loaded_projectile.damage
@@ -223,18 +223,18 @@
return
victim.emote("scream")
blood_flow -= damage / (5 * self_penalty_mult) // 20 / 5 = 4 bloodflow removed, p good
- victim.visible_message("The cuts on [victim]'s [limb.name] scar over!")
+ victim.visible_message(span_warning("The cuts on [victim]'s [limb.name] scar over!"))
/// If someone is using either a cautery tool or something with heat to cauterize this cut
/datum/wound/slash/proc/tool_cauterize(obj/item/I, mob/user)
var/improv_penalty_mult = (I.tool_behaviour == TOOL_CAUTERY ? 1 : 1.25) // 25% longer and less effective if you don't use a real cautery
var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself
- user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+ user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.name] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]..."))
if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
return
- user.visible_message("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].")
+ user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim]."))
limb.receive_damage(burn = 2 + severity, wound_bonus = CANT_WOUND)
if(prob(30))
victim.emote("scream")
@@ -244,16 +244,16 @@
if(blood_flow > minimum_flow)
try_treating(I, user)
else if(demotes_to)
- to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.")
+ to_chat(user, span_green("You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts."))
/// If someone is using a suture to close this cut
/datum/wound/slash/proc/suture(obj/item/stack/medical/suture/I, mob/user)
var/self_penalty_mult = (user == victim ? 1.4 : 1)
- user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
+ user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.name] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]..."))
if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
return
- user.visible_message("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
+ user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"]."))
var/blood_sutured = I.stop_bleeding / self_penalty_mult
blood_flow -= blood_sutured
limb.heal_damage(I.heal_brute, I.heal_burn)
@@ -262,7 +262,7 @@
if(blood_flow > minimum_flow)
try_treating(I, user)
else if(demotes_to)
- to_chat(user, "You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts.")
+ to_chat(user, span_green("You successfully lower the severity of [user == victim ? "your" : "[victim]'s"] cuts."))
/datum/wound/slash/moderate
diff --git a/modular_skyrat/modules/mentor/code/follow.dm b/modular_skyrat/modules/mentor/code/follow.dm
index 49760a34078..5c33da00be0 100644
--- a/modular_skyrat/modules/mentor/code/follow.dm
+++ b/modular_skyrat/modules/mentor/code/follow.dm
@@ -6,12 +6,12 @@
mentor_datum.following = M
usr.reset_perspective(M)
add_verb(src,/client/proc/mentor_unfollow)
- to_chat(usr, "Click the \"Stop Following\" button here or in the Mentor tab to stop following [key_name(M)].")
+ to_chat(usr, span_info("Click the \"Stop Following\" button here or in the Mentor tab to stop following [key_name(M)]."))
orbiting = FALSE
else
var/mob/dead/observer/O = usr
O.ManualFollow(M)
- to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is now [orbiting ? "orbiting" : "following"] [key_name(M)][key_name(M)][orbiting ? " as a ghost" : ""].")
+ to_chat(GLOB.admins, span_mentor(span_prefix("MENTOR: [key_name(usr)] is now [orbiting ? "orbiting" : "following"] [key_name(M)][key_name(M)][orbiting ? " as a ghost" : ""].")))
log_mentor("[key_name(usr)] [orbiting ? "is now orbiting" : "began following"][key_name(M)][orbiting ? " as a ghost" : ""].")
/client/proc/mentor_unfollow()
@@ -23,6 +23,6 @@
return
usr.reset_perspective()
remove_verb(src,/client/proc/mentor_unfollow)
- to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is no longer following [key_name(mentor_datum.following)].")
+ to_chat(GLOB.admins, span_mentor(span_prefix("MENTOR: [key_name(usr)] is no longer following [key_name(mentor_datum.following)].")))
log_mentor("[key_name(usr)] stopped following [key_name(mentor_datum.following)].")
mentor_datum.following = null
diff --git a/modular_skyrat/modules/mentor/code/mentorhelp.dm b/modular_skyrat/modules/mentor/code/mentorhelp.dm
index 9e1d3e8a01d..65501b6a432 100644
--- a/modular_skyrat/modules/mentor/code/mentorhelp.dm
+++ b/modular_skyrat/modules/mentor/code/mentorhelp.dm
@@ -15,7 +15,7 @@
return
var/show_char = CONFIG_GET(flag/mentors_mobname_only)
- var/mentor_msg = "MENTORHELP: [key_name_mentor(src, 1, 0, 1, show_char)]: [msg]"
+ var/mentor_msg = span_mentornotice("MENTORHELP: [key_name_mentor(src, 1, 0, 1, show_char)]: [msg]")
log_mentor("MENTORHELP: [key_name_mentor(src, 0, 0, 0, 0)]: [msg]")
for(var/it in GLOB.mentors)
@@ -23,7 +23,7 @@
SEND_SOUND(X, 'sound/items/bikehorn.ogg')
to_chat(X, mentor_msg)
- to_chat(src, "PM to-Mentors: [msg]")
+ to_chat(src, span_mentornotice("PM to-Mentors: [msg]"))
return
/proc/get_mentor_counts()
diff --git a/modular_skyrat/modules/mentor/code/mentorpm.dm b/modular_skyrat/modules/mentor/code/mentorpm.dm
index a2c12a264ce..8f6e5480cb7 100644
--- a/modular_skyrat/modules/mentor/code/mentorpm.dm
+++ b/modular_skyrat/modules/mentor/code/mentorpm.dm
@@ -3,7 +3,7 @@
set category = "Mentor"
set name = "Mentor PM"
if(!is_mentor())
- to_chat(src, "Error: Mentor-PM-Panel: Only Mentors and Admins may use this command.")
+ to_chat(src, span_danger("Error: Mentor-PM-Panel: Only Mentors and Admins may use this command."))
return
var/list/client/targets[0]
for(var/client/T)
@@ -27,12 +27,12 @@
else if(istype(whom,/client))
C = whom
if(!C)
- if(is_mentor()) to_chat(src, "Error: Mentor-PM: Client not found.")
+ if(is_mentor()) to_chat(src, span_danger("Error: Mentor-PM: Client not found."))
else mentorhelp(msg) //Mentor we are replying to left. Mentorhelp instead(check below)
return
if(is_mentor(whom))
- to_chat(GLOB.mentors, "[src] has started replying to [whom]'s mhelp.")
+ to_chat(GLOB.mentors, span_mentor("[src] has started replying to [whom]'s mhelp."))
//get message text, limit it's length.and clean/escape html
if(!msg)
@@ -40,12 +40,12 @@
if(!msg)
if (is_mentor(whom))
- to_chat(GLOB.mentors, "[src] has stopped their reply to [whom]'s mhelp.")
+ to_chat(GLOB.mentors, span_mentor(span_purple("[src] has stopped their reply to [whom]'s mhelp.")))
return
if(!C)
if(is_mentor())
- to_chat(src, "Error: Mentor-PM: Client not found.")
+ to_chat(src, span_danger("Error: Mentor-PM: Client not found."))
else
mentorhelp(msg) //Mentor we are replying to has vanished, Mentorhelp instead (how the fuck does this work?let's hope it works,shrug)
return
@@ -57,7 +57,7 @@
msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
if(!msg)
if (is_mentor(whom))
- to_chat(GLOB.mentors, "[src] has stopped their reply to [whom]'s mhelp.")
+ to_chat(GLOB.mentors, span_mentor(span_purple("[src] has stopped their reply to [whom]'s mhelp.")))
return
log_mentor("Mentor PM: [key_name(src)]->[key_name(C)]: [msg]")
@@ -66,17 +66,17 @@
var/show_char = CONFIG_GET(flag/mentors_mobname_only)
if(C.is_mentor())
if(is_mentor())//both are mentors
- to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]")
- to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]")
+ to_chat(C, span_mentor(span_purple("Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]")))
+ to_chat(src, span_mentor(span_blue("Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]")))
else //recipient is a mentor but sender is not
- to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, 0, show_char)]: [msg]")
- to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]")
+ to_chat(C, span_mentor(span_purple("Reply PM from-[key_name_mentor(src, C, 1, 0, show_char)]: [msg]")))
+ to_chat(src, span_mentor(span_pink("Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]")))
else
if(is_mentor()) //sender is a mentor but recipient is not.
- to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]")
- to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, show_char)]: [msg]")
+ to_chat(C, span_mentor(span_purple("Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]")))
+ to_chat(src, span_mentor(span_pink("Mentor PM to-[key_name_mentor(C, C, 1, 0, show_char)]: [msg]")))
//we don't use message_Mentors here because the sender/receiver might get it too
var/show_char_sender = !is_mentor() && CONFIG_GET(flag/mentors_mobname_only)
@@ -84,4 +84,4 @@
for(var/it in GLOB.mentors)
var/client/X = it
if(X.key!=key && X.key!=C.key) //check client/X is an Mentor and isn't the sender or recipient
- to_chat(X, "Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]->[key_name_mentor(C, X, 0, 0, show_char_recip)]: [msg]") //inform X
+ to_chat(X, span_mentor("Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]->[key_name_mentor(C, X, 0, 0, show_char_recip)]: [msg]")) //inform X
diff --git a/modular_skyrat/modules/mentor/code/mentorsay.dm b/modular_skyrat/modules/mentor/code/mentorsay.dm
index 8b831799ffd..77d83d3c936 100644
--- a/modular_skyrat/modules/mentor/code/mentorsay.dm
+++ b/modular_skyrat/modules/mentor/code/mentorsay.dm
@@ -13,7 +13,7 @@
log_mentor("MSAY: [key_name(src)] : [msg]")
if(check_rights_for(src, R_ADMIN,0))
- msg = "MENTOR: [key_name(src, 0, 0)]: [msg]"
+ msg = span_mentor("MENTOR: [key_name(src, 0, 0)]: [msg]")
else
- msg = "MENTOR: [key_name(src, 0, 0)]: [msg]"
+ msg = span_mentor("MENTOR: [key_name(src, 0, 0)]: [msg]")
to_chat(GLOB.admins | GLOB.mentors, msg)
diff --git a/modular_skyrat/modules/mentor/code/mentorwho.dm b/modular_skyrat/modules/mentor/code/mentorwho.dm
index 500a5587bb2..feb5d71ccdc 100644
--- a/modular_skyrat/modules/mentor/code/mentorwho.dm
+++ b/modular_skyrat/modules/mentor/code/mentorwho.dm
@@ -18,5 +18,5 @@
if(C.is_afk())
suffix += " (AFK)"
- msg += "\t[C][suffix]\n"
+ msg += span_info("plain'>\t[C][suffix]\n")
to_chat(src, msg)
diff --git a/modular_skyrat/modules/modular_items/code/miscellaneous.dm b/modular_skyrat/modules/modular_items/code/miscellaneous.dm
index bd28cf9d3e2..f839662a83f 100644
--- a/modular_skyrat/modules/modular_items/code/miscellaneous.dm
+++ b/modular_skyrat/modules/modular_items/code/miscellaneous.dm
@@ -6,7 +6,7 @@
icon_state = "vial"
/obj/item/bloodcrawlbottle/attack_self(mob/user)
- to_chat(user, "You drink the bottle's contents.")
+ to_chat(user, span_notice("You drink the bottle's contents."))
var/obj/effect/proc_holder/spell/bloodcrawl/S = new()
user.mind.AddSpell(S)
user.log_message("learned the spell bloodcrawl ([S])", LOG_ATTACK, color="orange")
@@ -22,7 +22,7 @@
perform(target)
return
revert_cast()
- to_chat(user, "There must be a nearby source of plentiful blood!")
+ to_chat(user, span_warning("There must be a nearby source of plentiful blood!"))
/obj/effect/proc_holder/spell/bloodcrawl/lesser/perform(obj/effect/decal/cleanable/target, recharge = 1, mob/living/user = usr)
if(istype(user) && user.canUseTopic(user, TRUE))
@@ -38,7 +38,7 @@
start_recharge()
return
revert_cast()
- to_chat(user, "You are unable to blood crawl!")
+ to_chat(user, span_warning("You are unable to blood crawl!"))
/obj/item/storage/box/hero/ronin
name = "Sword Saint, Wandering Vagabond - 1600's."
diff --git a/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm b/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm
index e94392426f9..5e4021b4dde 100644
--- a/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm
+++ b/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm
@@ -38,7 +38,7 @@
/datum/reagent/inverse/lidocaine/on_mob_life(mob/living/carbon/owner, delta_time, times_fired)
..()
- to_chat(owner, "Your body aches with unimaginable pain!")
+ to_chat(owner, span_userdanger("Your body aches with unimaginable pain!"))
owner.adjustOrganLoss(ORGAN_SLOT_HEART,3 * REM * delta_time, 85)
owner.adjustStaminaLoss(5 * REM * delta_time, 0)
if(prob(30))
diff --git a/modular_skyrat/modules/modular_weapons/code/rifle.dm b/modular_skyrat/modules/modular_weapons/code/rifle.dm
index a74a718d09b..6803eed701c 100644
--- a/modular_skyrat/modules/modular_weapons/code/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/rifle.dm
@@ -73,11 +73,11 @@
var/obj/item/stack/cable_coil/C = A
if(C.use(10))
slot_flags = ITEM_SLOT_BACK
- to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.")
+ to_chat(user, span_notice("You tie the lengths of cable to the shotgun, making a sling."))
slung = TRUE
update_icon()
else
- to_chat(user, "You need at least ten lengths of cable if you want to make a sling!")
+ to_chat(user, span_warning("You need at least ten lengths of cable if you want to make a sling!"))
/obj/item/gun/ballistic/rifle/ishotgun/update_icon_state()
. = ..()
diff --git a/modular_skyrat/modules/morenarcotics/code/cocaine.dm b/modular_skyrat/modules/morenarcotics/code/cocaine.dm
index 53fb8720bc4..5daca39469e 100644
--- a/modular_skyrat/modules/morenarcotics/code/cocaine.dm
+++ b/modular_skyrat/modules/morenarcotics/code/cocaine.dm
@@ -45,7 +45,7 @@
/datum/reagent/drug/cocaine/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
if(DT_PROB(2.5, delta_time))
var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.")
- to_chat(M, "[high_message]")
+ to_chat(M, span_notice("[high_message]"))
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "zoinked", /datum/mood_event/stimulant_heavy, name)
M.AdjustStun(-15 * REM * delta_time)
M.AdjustKnockdown(-15 * REM * delta_time)
@@ -59,7 +59,7 @@
. = TRUE
/datum/reagent/drug/cocaine/overdose_start(mob/living/M)
- to_chat(M, "Your heart beats is beating so fast, it hurts...")
+ to_chat(M, span_userdanger("Your heart beats is beating so fast, it hurts..."))
/datum/reagent/drug/cocaine/overdose_process(mob/living/M, delta_time, times_fired)
M.adjustToxLoss(1 * REM * delta_time, 0)
@@ -69,7 +69,7 @@
M.emote(pick("twitch","drool"))
if(!HAS_TRAIT(M, TRAIT_FLOORED))
if(DT_PROB(1.5, delta_time))
- M.visible_message("[M] collapses onto the floor!")
+ M.visible_message(span_danger("[M] collapses onto the floor!"))
M.Paralyze(135,TRUE)
M.drop_all_held_items()
..()
diff --git a/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm b/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm
index abcf3d69d6e..6292fbcfd77 100644
--- a/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm
+++ b/modular_skyrat/modules/morenarcotics/code/cocaine_item.dm
@@ -18,7 +18,7 @@
/obj/item/reagent_containers/crackbrick/attackby(obj/item/W, mob/user, params)
if(W.get_sharpness())
- user.show_message("You cut \the [src] into some rocks.", MSG_VISUAL)
+ user.show_message(span_notice("You cut \the [src] into some rocks."), MSG_VISUAL)
for(var/i = 1 to 4)
new /obj/item/reagent_containers/crack(user.loc)
qdel(src)
@@ -50,11 +50,11 @@
else if(user.is_mouth_covered(mask_only = 1))
covered = "mask"
if(covered)
- to_chat(user, "You have to remove your [covered] first!")
+ to_chat(user, span_warning("You have to remove your [covered] first!"))
return
- user.visible_message("")
+ user.visible_message(span_notice("'[user] starts snorting the [src]."))
if(do_after(user, 30))
- to_chat(user, "You finish snorting the [src].")
+ to_chat(user, span_notice("You finish snorting the [src]."))
if(reagents.total_volume)
reagents.trans_to(user, reagents.total_volume, transfered_by = user, methods = INGEST)
qdel(src)
@@ -88,9 +88,9 @@
/obj/item/reagent_containers/cocainebrick/attack_self(mob/user)
- user.visible_message("[user] starts breaking up the [src].")
+ user.visible_message(span_notice("[user] starts breaking up the [src]."))
if(do_after(user,10))
- to_chat(user, "You finish breaking up the [src].")
+ to_chat(user, span_notice("You finish breaking up the [src]."))
for(var/i = 1 to 5)
new /obj/item/reagent_containers/cocaine(user.loc)
qdel(src)
diff --git a/modular_skyrat/modules/morenarcotics/code/crackpipe.dm b/modular_skyrat/modules/morenarcotics/code/crackpipe.dm
index 347c4baa2b1..e2508089177 100644
--- a/modular_skyrat/modules/morenarcotics/code/crackpipe.dm
+++ b/modular_skyrat/modules/morenarcotics/code/crackpipe.dm
@@ -14,7 +14,7 @@
if(smoketime <= 0)
if(ismob(loc))
var/mob/living/smoking_mob = loc
- to_chat(smoking_mob, "Your [name] goes out.")
+ to_chat(smoking_mob, span_notice("Your [name] goes out."))
lit = FALSE
icon_state = icon_off
inhand_icon_state = icon_off
@@ -30,7 +30,7 @@
/obj/item/clothing/mask/cigarette/pipe/crackpipe/attackby(obj/item/used_item, mob/user, params)
if(is_type_in_list(used_item, list(/obj/item/reagent_containers/crack,/obj/item/reagent_containers/blacktar)))
- to_chat(user, "You stuff [used_item] into [src].")
+ to_chat(user, span_notice("You stuff [used_item] into [src]."))
smoketime = 2 * 60
name = "[used_item.name]-packed [initial(name)]"
if(used_item.reagents)
@@ -42,7 +42,7 @@
if(smoketime > 0)
light(lighting_text)
else
- to_chat(user, "There is nothing to smoke!")
+ to_chat(user, span_warning("There is nothing to smoke!"))
else
return ..()
diff --git a/modular_skyrat/modules/morenarcotics/code/opium.dm b/modular_skyrat/modules/morenarcotics/code/opium.dm
index e2dd6038629..700bb420616 100644
--- a/modular_skyrat/modules/morenarcotics/code/opium.dm
+++ b/modular_skyrat/modules/morenarcotics/code/opium.dm
@@ -36,7 +36,7 @@
/datum/reagent/drug/opium/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
var/high_message = pick("You feel euphoric.", "You feel on top of the world.")
if(DT_PROB(2.5, delta_time))
- to_chat(M, "[high_message]")
+ to_chat(M, span_notice("[high_message]"))
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "smacked out", /datum/mood_event/narcotic_heavy, name)
M.adjustBruteLoss(-0.1 * REM * delta_time, 0) //can be used as a (shitty) painkiller
M.adjustFireLoss(-0.1 * REM * delta_time, 0)
@@ -72,7 +72,7 @@
/datum/reagent/drug/opium/heroin/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
var/high_message = pick("You feel like nothing can stop you.", "You feel like God.")
if(DT_PROB(2.5, delta_time))
- to_chat(M, "[high_message]")
+ to_chat(M, span_notice("[high_message]"))
M.adjustBruteLoss(-0.4 * REM * delta_time, 0) //more powerful as a painkiller, possibly actually useful to medical now
M.adjustFireLoss(-0.4 * REM * delta_time, 0)
..()
@@ -91,7 +91,7 @@
/datum/reagent/drug/opium/blacktar/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
var/high_message = pick("You feel like tar.", "The blood in your veins feel like syrup.")
if(DT_PROB(2.5, delta_time))
- to_chat(M, "[high_message]")
+ to_chat(M, span_notice("[high_message]"))
M.set_drugginess(15 * REM * delta_time)
M.adjustToxLoss(0.5 * REM * delta_time, 0) //toxin damage
..()
diff --git a/modular_skyrat/modules/morenarcotics/code/pcp.dm b/modular_skyrat/modules/morenarcotics/code/pcp.dm
index 9ae3b79d2eb..4765aaef568 100644
--- a/modular_skyrat/modules/morenarcotics/code/pcp.dm
+++ b/modular_skyrat/modules/morenarcotics/code/pcp.dm
@@ -47,7 +47,7 @@
var/atom/movable/plane_master_controller/game_plane_master_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
game_plane_master_controller.add_filter("pcp_blur", 10, angular_blur_filter(0, 0, 0.7))
if(DT_PROB(2.5, delta_time))
- to_chat(M, "[high_message]")
+ to_chat(M, span_warning("[high_message]"))
M.AdjustKnockdown(-20 * REM * delta_time)
M.AdjustImmobilized(-20 * REM * delta_time)
M.adjustStaminaLoss(-10 * REM * delta_time, 0)
@@ -71,7 +71,7 @@
QDEL_NULL(pcp_rage)
if(pcp_tenacity)
QDEL_NULL(pcp_tenacity)
- L.visible_message("[L] collapses onto the floor!") //you pretty much pass out
+ L.visible_message(span_danger("[L] collapses onto the floor!")) //you pretty much pass out
L.Paralyze(pcp_lifetime,TRUE)
L.drop_all_held_items()
..()
@@ -85,7 +85,7 @@
if(DT_PROB(2.5, delta_time))
M.emote(pick("twitch","drool"))
if(DT_PROB(1.5, delta_time))
- M.visible_message("[M] flails their arms around everywhere!")
+ M.visible_message(span_danger("[M] flails their arms around everywhere!"))
M.drop_all_held_items()
..()
. = TRUE
diff --git a/modular_skyrat/modules/morenarcotics/code/quaalude.dm b/modular_skyrat/modules/morenarcotics/code/quaalude.dm
index 9212886fa50..ba953a87e83 100644
--- a/modular_skyrat/modules/morenarcotics/code/quaalude.dm
+++ b/modular_skyrat/modules/morenarcotics/code/quaalude.dm
@@ -16,7 +16,7 @@
/datum/reagent/drug/quaalude/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
var/high_message = pick("You feel relaxed.", "You feel like you're on the moon.", "You feel like you could walk 20 miles for a quaalude.")
if(DT_PROB(2.5, delta_time))
- to_chat(M, "[high_message]")
+ to_chat(M, span_notice("[high_message]"))
if(M.hud_used!=null)
var/atom/movable/plane_master_controller/game_plane_master_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
game_plane_master_controller.add_filter("quaalude_wave", 10, wave_filter(300, 300, 3, 0, WAVE_SIDEWAYS))
@@ -29,7 +29,7 @@
M.emote(pick("laugh","drool"))
if(!HAS_TRAIT(M, TRAIT_FLOORED))
if(DT_PROB(1, delta_time))
- M.visible_message("[M]'s legs become too weak to carry their own weight!")
+ M.visible_message(span_danger("[M]'s legs become too weak to carry their own weight!"))
M.Knockdown(90,TRUE)
M.drop_all_held_items()
..()
diff --git a/modular_skyrat/modules/morenarcotics/code/thc.dm b/modular_skyrat/modules/morenarcotics/code/thc.dm
index 72e383cd0f3..e731f27990b 100644
--- a/modular_skyrat/modules/morenarcotics/code/thc.dm
+++ b/modular_skyrat/modules/morenarcotics/code/thc.dm
@@ -27,7 +27,7 @@
//shit for effects
/datum/mood_event/stoned
- description = "You're totally baked right now...\n"
+ description = span_nicegreen("You're totally baked right now...\n")
mood_change = 6
timeout = 3 MINUTES
@@ -52,7 +52,7 @@
var/atom/movable/plane_master_controller/game_plane_master_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
game_plane_master_controller.add_filter("weed_blur", 10, angular_blur_filter(0, 0, 0.45))
if(DT_PROB(2.5, delta_time))
- to_chat(M, "[high_message]")
+ to_chat(M, span_notice("[high_message]"))
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "stoned", /datum/mood_event/stoned, name)
M.throw_alert("stoned", /atom/movable/screen/alert/stoned)
M.sound_environment_override = SOUND_ENVIRONMENT_DRUGGED
diff --git a/modular_skyrat/modules/morenarcotics/code/thc_item.dm b/modular_skyrat/modules/morenarcotics/code/thc_item.dm
index 7b0aef895b4..e9cc66a12d7 100644
--- a/modular_skyrat/modules/morenarcotics/code/thc_item.dm
+++ b/modular_skyrat/modules/morenarcotics/code/thc_item.dm
@@ -27,9 +27,9 @@
/obj/item/reagent_containers/hashbrick/attack_self(mob/user)
- user.visible_message("[user] starts breaking up the [src].")
+ user.visible_message(span_notice("[user] starts breaking up the [src]."))
if(do_after(user,10))
- to_chat(user, "You finish breaking up the [src].")
+ to_chat(user, span_notice("You finish breaking up the [src]."))
for(var/i = 1 to 4)
new /obj/item/reagent_containers/hash(user.loc)
qdel(src)
diff --git a/modular_skyrat/modules/morenarcotics/code/vapecarts.dm b/modular_skyrat/modules/morenarcotics/code/vapecarts.dm
index ced93697347..edf9fd37531 100644
--- a/modular_skyrat/modules/morenarcotics/code/vapecarts.dm
+++ b/modular_skyrat/modules/morenarcotics/code/vapecarts.dm
@@ -19,11 +19,11 @@
if(target_vape.screw == TRUE && !target_vape.reagents.total_volume)
src.reagents.trans_to(target_vape, src.volume, transfered_by = user)
qdel(src)
- to_chat(user, span_notice("You plug the [src.name] into the vape."))
+ to_chat(user, span_notice("You plug the [src.name] into the vape."))
else if(!target_vape.screw)
- to_chat(user, span_warning("You need to open the cap to do that!"))
+ to_chat(user, span_warning("You need to open the cap to do that!"))
else
- to_chat(user, span_warning("[target_vape] is already full!"))
+ to_chat(user, span_warning("[target_vape] is already full!"))
/obj/item/reagent_containers/vapecart/empty
name = "customizable vape cart"
@@ -34,13 +34,13 @@
/obj/item/reagent_containers/vapecart/empty/attack_self(mob/user)
if(reagents.total_volume > 0)
- to_chat(user, span_notice("You empty [src] of all reagents."))
+ to_chat(user, span_notice("You empty [src] of all reagents."))
reagents.clear_reagents()
/obj/item/reagent_containers/vapecart/empty/attackby(obj/item/attacked_item, mob/user, params)
if (istype(attacked_item, /obj/item/pen) || istype(attacked_item, /obj/item/toy/crayon))
if(!user.is_literate())
- to_chat(user, span_notice("You scribble illegibly on the label of the vape cart!