Macro Replacements. (#3574)

* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
This commit is contained in:
Cameron653
2017-07-19 12:47:23 -05:00
committed by Anewbe
parent a3319de4f4
commit e158fcd3cc
132 changed files with 686 additions and 684 deletions
+2 -2
View File
@@ -10,7 +10,7 @@
if(message)
client.handle_spam_prevention(MUTE_DEADCHAT)
if(src.client.prefs.muted & MUTE_DEADCHAT)
src << "\red You cannot talk in deadchat (muted)."
src << "<font color='red'>You cannot talk in deadchat (muted).</font>"
return
. = src.say_dead(message)
@@ -31,7 +31,7 @@
if(message)
client.handle_spam_prevention(MUTE_DEADCHAT)
if(src.client.prefs.muted & MUTE_DEADCHAT)
src << "\red You cannot emote in deadchat (muted)."
src << "<font color='red'>You cannot emote in deadchat (muted).</font>"
return
. = src.emote_dead(message)
+1 -1
View File
@@ -56,7 +56,7 @@ var/list/slot_equipment_priority = list( \
else
if(!disable_warning)
src << "\red You are unable to equip that." //Only print if del_on_fail is false
src << "<font color='red'>You are unable to equip that.</font>" //Only print if del_on_fail is false
return 0
equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail.
@@ -28,7 +28,7 @@
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
O.show_message(text("<font color='red'>[] has grabbed [] passively!</font>", M, src), 1)
else
var/damage = rand(1, 9)
@@ -43,17 +43,17 @@
playsound(loc, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
O.show_message(text("<font color='red'><B>[] has punched []!</B></font>", M, src), 1)
if (damage > 4.9)
Weaken(rand(10,15))
for(var/mob/O in viewers(M, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has weakened []!</B>", M, src), 1, "\red You hear someone fall.", 2)
O.show_message(text("<font color='red'><B>[] has weakened []!</B></font>", M, src), 1, "<font color='red'>You hear someone fall.</font>", 2)
adjustBruteLoss(damage)
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has attempted to punch []!</B>", M, src), 1)
O.show_message(text("<font color='red'><B>[] has attempted to punch []!</B></font>", M, src), 1)
return
@@ -15,5 +15,5 @@
src.loc = L.loc
qdel(L)
src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","\red You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.")
src.visible_message("<font color='red'>[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.</font>","<font color='red'>You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.</font>")
return "Diona"
@@ -16,7 +16,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
src << "<font color='red'>You cannot send IC messages (muted).</font>"
return
if (stat)
return
+1 -1
View File
@@ -150,7 +150,7 @@
adjustFireLoss((environment.temperature - (T0C+66))/5) // Might be too high, check in testing.
if (fire) fire.icon_state = "fire2"
if(prob(20))
src << "\red You feel a searing heat!"
src << "<font color='red'>You feel a searing heat!</font>"
else
if (fire) fire.icon_state = "fire0"
@@ -12,11 +12,11 @@
return
if(handcuffed || legcuffed)
src << "\red You cannot evolve when you are cuffed."
src << "<font color='red'>You cannot evolve when you are cuffed.</font>"
return
if(amount_grown < max_grown)
src << "\red You are not fully grown."
src << "<font color='red'>You are not fully grown.</font>"
return
// confirm_evolution() handles choices and other specific requirements.
+1 -1
View File
@@ -4,7 +4,7 @@
if(client)
if(client.prefs.muted & MUTE_IC)
src << "\red You cannot speak in IC (Muted)."
src << "<font color='red'>You cannot speak in IC (Muted).</font>"
return
message = sanitize(message)
@@ -17,7 +17,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
src << "<font color='red'>You cannot send IC messages (muted).</font>"
return
if (stat)
return
@@ -60,7 +60,7 @@
if ("help")
src << "alarm,alert,notice,flash,blink,whistle,beep,boop"
else
src << "\blue Unusable emote '[act]'. Say *help for a list."
src << "<font color='blue'>Unusable emote '[act]'. Say *help for a list.</font>"
if (message)
log_emote("[name]/[key] : [message]")
+8 -8
View File
@@ -6,9 +6,9 @@
if (radiation > 100)
radiation = 100
if(!container)//If it's not in an MMI
src << "\red You feel weak."
src << "<font color='red'>You feel weak.</font>"
else//Fluff-wise, since the brain can't detect anything itself, the MMI handles thing like that
src << "\red STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED."
src << "<font color='red'>STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.</font>"
switch(radiation)
if(1 to 49)
@@ -23,9 +23,9 @@
if(prob(5))
radiation -= 5
if(!container)
src << "\red You feel weak."
src << "<font color='red'>You feel weak.</font>"
else
src << "\red STATUS: DANGEROUS LEVELS OF RADIATION DETECTED."
src << "<font color='red'>STATUS: DANGEROUS LEVELS OF RADIATION DETECTED.</font>"
updatehealth()
if(75 to 100)
@@ -116,7 +116,7 @@
silent = 1
if(!alert)//Sounds an alarm, but only once per 'level'
emote("alarm")
src << "\red Major electrical distruption detected: System rebooting."
src << "<font color='red'>Major electrical distruption detected: System rebooting.</font>"
alert = 1
if(prob(75))
emp_damage -= 1
@@ -132,7 +132,7 @@
ear_damage = 1
if(!alert)
emote("alert")
src << "\red Primary systems are now online."
src << "<font color='red'>Primary systems are now online.</font>"
alert = 1
if(prob(50))
emp_damage -= 1
@@ -144,13 +144,13 @@
if(2 to 9)//Low level of EMP damage, has few effects(handled elsewhere)
if(!alert)
emote("notice")
src << "\red System reboot nearly complete."
src << "<font color='red'>System reboot nearly complete.</font>"
alert = 1
if(prob(25))
emp_damage -= 1
if(1)
alert = 0
src << "\red All systems restored."
src << "<font color='red'>All systems restored.</font>"
emp_damage -= 1
return 1
+11 -11
View File
@@ -80,7 +80,7 @@
M.loc = src.loc
for(var/mob/N in viewers(src, null))
if(N.client)
N.show_message(text("\red <B>[M] bursts out of [src]!</B>"), 2)
N.show_message(text("<font color='red'><B>[M] bursts out of [src]!</B></font>"), 2)
..()
/mob/living/carbon/attack_hand(mob/M as mob)
@@ -91,7 +91,7 @@
if (H.hand)
temp = H.organs_by_name["l_hand"]
if(temp && !temp.is_usable())
H << "\red You can't use your [temp.name]"
H << "<font color='red'>You can't use your [temp.name]</font>"
return
return
@@ -109,18 +109,18 @@
playsound(loc, "sparks", 50, 1, -1)
if (shock_damage > 15)
src.visible_message(
"\red [src] was shocked by \the [source]!", \
"\red <B>You feel a powerful shock course through your body!</B>", \
"\red You hear a heavy electrical crack." \
"<font color='red'>[src] was shocked by \the [source]!</font>", \
"<font color='red'><B>You feel a powerful shock course through your body!</B></font>", \
"<font color='red'>You hear a heavy electrical crack.</font>" \
)
if(stun)
Stun(10)//This should work for now, more is really silly and makes you lay there forever
Weaken(10)
else
src.visible_message(
"\red [src] was mildly shocked by \the [source].", \
"\red You feel a mild shock course through your body.", \
"\red You hear a light zapping." \
"<font color='red'>[src] was mildly shocked by \the [source].</font>", \
"<font color='red'>You feel a mild shock course through your body.</font>", \
"<font color='red'>You hear a light zapping.</font>" \
)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -161,8 +161,8 @@
if(src == M && istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
src.visible_message( \
text("\blue [src] examines [].",src.gender==MALE?"himself":"herself"), \
"\blue You check yourself for injuries." \
text("<font color='blue'>[src] examines [].</font>",src.gender==MALE?"himself":"herself"), \
"<font color='blue'>You check yourself for injuries.</font>" \
)
for(var/obj/item/organ/external/org in H.organs)
@@ -421,7 +421,7 @@
set category = "IC"
if(usr.sleeping)
usr << "\red You are already sleeping"
usr << "<font color='red'>You are already sleeping</font>"
return
if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
usr.sleeping = 20 //Short nap
@@ -134,7 +134,7 @@
if (src.client)
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
src << "<font color='red'>You cannot send IC messages (muted).</font>"
return
if (stat)
return
@@ -678,7 +678,7 @@
twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping"
else
src << "\blue Unusable emote '[act]'. Say *help for a list."
src << "<font color='blue'>Unusable emote '[act]'. Say *help for a list.</font>"
if (message)
log_emote("[name]/[key] : [message]")
+11 -11
View File
@@ -417,7 +417,7 @@
U.handle_regular_hud_updates()
if(!modified)
usr << "\red Unable to locate a data core entry for this person."
usr << "<font color='red'>Unable to locate a data core entry for this person.</font>"
if (href_list["secrecord"])
if(hasHUD(usr,"security"))
@@ -447,7 +447,7 @@
read = 1
if(!read)
usr << "\red Unable to locate a data core entry for this person."
usr << "<font color='red'>Unable to locate a data core entry for this person.</font>"
if (href_list["secrecordComment"])
if(hasHUD(usr,"security"))
@@ -477,7 +477,7 @@
usr << "<a href='?src=\ref[src];secrecordadd=`'>\[Add comment\]</a>"
if(!read)
usr << "\red Unable to locate a data core entry for this person."
usr << "<font color='red'>Unable to locate a data core entry for this person.</font>"
if (href_list["secrecordadd"])
if(hasHUD(usr,"security"))
@@ -545,7 +545,7 @@
U.handle_regular_hud_updates()
if(!modified)
usr << "\red Unable to locate a data core entry for this person."
usr << "<font color='red'>Unable to locate a data core entry for this person.</font>"
if (href_list["medrecord"])
if(hasHUD(usr,"medical"))
@@ -576,7 +576,7 @@
read = 1
if(!read)
usr << "\red Unable to locate a data core entry for this person."
usr << "<font color='red'>Unable to locate a data core entry for this person.</font>"
if (href_list["medrecordComment"])
if(hasHUD(usr,"medical"))
@@ -606,7 +606,7 @@
usr << "<a href='?src=\ref[src];medrecordadd=`'>\[Add comment\]</a>"
if(!read)
usr << "\red Unable to locate a data core entry for this person."
usr << "<font color='red'>Unable to locate a data core entry for this person.</font>"
if (href_list["medrecordadd"])
if(hasHUD(usr,"medical"))
@@ -758,7 +758,7 @@
/mob/living/carbon/human/proc/play_xylophone()
if(!src.xylophone)
visible_message("\red \The [src] begins playing \his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.")
visible_message("<font color='red'>\The [src] begins playing \his ribcage like a xylophone. It's quite spooky.</font>","<font color='blue'>You begin to play a spooky refrain on your ribcage.</font>","<font color='red'>You hear a spooky xylophone melody.</font>")
var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
playsound(loc, song, 50, 1, -1)
xylophone = 1
@@ -849,7 +849,7 @@
regenerate_icons()
check_dna()
visible_message("\blue \The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
visible_message("<font color='blue'>\The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!</font>", "<font color='blue'>You change your appearance!</font>", "<font color='red'>Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!</font>")
/mob/living/carbon/human/proc/remotesay()
set name = "Project mind"
@@ -872,10 +872,10 @@
var/say = sanitize(input("What do you wish to say"))
if(mRemotetalk in target.mutations)
target.show_message("\blue You hear [src.real_name]'s voice: [say]")
target.show_message("<font color='blue'> You hear [src.real_name]'s voice: [say]</font>")
else
target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
usr.show_message("\blue You project your mind into [target.real_name]: [say]")
target.show_message("<font color='blue'> You hear a voice that seems to echo around the room: [say]</font>")
usr.show_message("<font color='blue'> You project your mind into [target.real_name]: [say]</font>")
log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]")
for(var/mob/observer/dead/G in world)
G.show_message("<i>Telepathic message from <b>[src]</b> to <b>[target]</b>: [say]</i>")
@@ -15,7 +15,7 @@
if(H.hand)
temp = H.organs_by_name["l_hand"]
if(!temp || !temp.is_usable())
H << "\red You can't use your hand."
H << "<font color='red'>You can't use your hand.</font>"
return
H.break_cloak()
..()
@@ -27,7 +27,7 @@
if(!hit_zone)
H.do_attack_animation(src)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("\red <B>[H] reaches for [src], but misses!</B>")
visible_message("<font color='red'><B>[H] reaches for [src], but misses!</B></font>")
return 0
if(H != src && check_shields(0, null, H, H.zone_sel.selecting, H.name))
@@ -39,7 +39,7 @@
var/damage = rand(0, 9)
if(!damage)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("\red <B>[H] has attempted to punch [src]!</B>")
visible_message("<font color='red'><B>[H] has attempted to punch [src]!</B></font>")
return 0
var/obj/item/organ/external/affecting = get_organ(ran_zone(H.zone_sel.selecting))
var/armor_block = run_armor_check(affecting, "melee")
@@ -50,14 +50,14 @@
playsound(loc, "punch", 25, 1, -1)
visible_message("\red <B>[H] has punched [src]!</B>")
visible_message("<font color='red'><B>[H] has punched [src]!</B></font>")
if(armor_soak >= damage)
return
apply_damage(damage, HALLOSS, affecting, armor_block, armor_soak)
if(damage >= 9)
visible_message("\red <B>[H] has weakened [src]!</B>")
visible_message("<font color='red'><B>[H] has weakened [src]!</B></font>")
apply_effect(4, WEAKEN, armor_block)
return
@@ -311,7 +311,7 @@
return
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("\red <B>[M] attempted to disarm [src]!</B>")
visible_message("<font color='red'> <B>[M] attempted to disarm [src]!</B></font>")
return
/mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
@@ -47,7 +47,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] [failed ? "tried to tackle" : "has tackled"] down []!</B>", src, T), 1)
O.show_message(text("<font color='red'><B>[] [failed ? "tried to tackle" : "has tackled"] down []!</font></B>", src, T), 1)
/mob/living/carbon/human/proc/commune()
set category = "Abilities"
@@ -77,12 +77,12 @@
log_say("[key_name(src)] communed to [key_name(M)]: [text]")
M << "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"
M << "<font color='blue'>Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]</font>"
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.species.name == src.species.name)
return
H << "\red Your nose begins to bleed..."
H << "<font color='red'>Your nose begins to bleed...</font>"
H.drip(1)
/mob/living/carbon/human/proc/regurgitate()
@@ -95,7 +95,7 @@
if(M in stomach_contents)
stomach_contents.Remove(M)
M.loc = loc
src.visible_message("\red <B>[src] hurls out the contents of their stomach!</B>")
src.visible_message("<font color='red'><B>[src] hurls out the contents of their stomach!</B></font>")
return
/mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview())
@@ -19,7 +19,7 @@ This saves us from having to call add_fingerprint() any time something is put in
else
update_inv_r_hand(0)
else
H << "\red You are unable to equip that."
H << "<font color='red'>You are unable to equip that.</font>"
/mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1)
for (var/slot in slots)
@@ -293,7 +293,7 @@ This saves us from having to call add_fingerprint() any time something is put in
var/obj/item/clothing/under/uniform = src.w_uniform
uniform.attackby(W,src)
else
src << "\red You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..."
src << "<font color='red'>You are trying to eqip this item to an unsupported inventory slot. How the heck did you manage that? Stop it...</font>"
return
if((W == src.l_hand) && (slot != slot_l_hand))
+1 -1
View File
@@ -158,7 +158,7 @@
if (disabilities & EPILEPSY)
if ((prob(1) && paralysis < 1))
src << "\red You have a seizure!"
src << "<font color='red'>You have a seizure!</font>"
for(var/mob/O in viewers(src, null))
if(O == src)
continue
@@ -16,7 +16,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
src << "\red You cannot send IC messages (muted)."
src << "<font color='red'>You cannot send IC messages (muted).</font>"
return
if (stat)
return
+5 -5
View File
@@ -99,7 +99,7 @@
var/obj/item/device/assembly/signaler/signaler = get_active_hand()
if(signaler.deadman && prob(80))
log_and_message_admins("has triggered a signaler deadman's switch")
src.visible_message("\red [src] triggers their deadman's switch!")
src.visible_message("<font color='red'>[src] triggers their deadman's switch!</font>")
signaler.signal()
//Armor
@@ -119,7 +119,7 @@
//Stun Beams
if(P.taser_effect)
stun_effect_act(0, P.agony, def_zone, P)
src <<"\red You have been hit by [P]!"
src <<"<font color='red'>You have been hit by [P]!</font>"
if(!P.nodamage)
apply_damage(P.damage, P.damage_type, def_zone, absorb, soaked, 0, P, sharp=proj_sharp, edge=proj_edge)
qdel(P)
@@ -218,10 +218,10 @@
miss_chance = max(15*(distance-2), 0)
if (prob(miss_chance))
visible_message("\blue \The [O] misses [src] narrowly!")
visible_message("<font color='blue'>\The [O] misses [src] narrowly!</font>")
return
src.visible_message("\red [src] has been hit by [O].")
src.visible_message("<font color='red'>[src] has been hit by [O].</font>")
var/armor = run_armor_check(null, "melee")
var/soaked = get_armor_soak(null, "melee")
@@ -249,7 +249,7 @@
if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED)
var/dir = get_dir(O.throw_source, src)
visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!")
visible_message("<font color='red'>[src] staggers under the impact!</font>","<font color='red'>You stagger under the impact!</font>")
src.throw_at(get_edge_target_turf(src,dir),1,momentum)
if(!O || !src) return
+8 -8
View File
@@ -445,7 +445,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name()))
ai_actual_track(target)
else
src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
src << "<font color='red'>System error. Cannot locate [html_decode(href_list["trackname"])].</font>"
return
return
@@ -517,7 +517,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
if(network in C.network)
eyeobj.setLoc(get_turf(C))
break
src << "\blue Switched to [network] camera network."
src << "<font color='blue'>Switched to [network] camera network.</font>"
//End of code by Mord_Sith
/mob/living/silicon/ai/proc/ai_statuschange()
@@ -695,19 +695,19 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
else if(istype(W, /obj/item/weapon/wrench))
if(anchored)
user.visible_message("\blue \The [user] starts to unbolt \the [src] from the plating...")
user.visible_message("<font color='blue'>\The [user] starts to unbolt \the [src] from the plating...</font>")
if(!do_after(user,40))
user.visible_message("\blue \The [user] decides not to unbolt \the [src].")
user.visible_message("<font color='blue'>\The [user] decides not to unbolt \the [src].</font>")
return
user.visible_message("\blue \The [user] finishes unfastening \the [src]!")
user.visible_message("<font color='blue'>\The [user] finishes unfastening \the [src]!</font>")
anchored = 0
return
else
user.visible_message("\blue \The [user] starts to bolt \the [src] to the plating...")
user.visible_message("<font color='blue'>\The [user] starts to bolt \the [src] to the plating...</font>")
if(!do_after(user,40))
user.visible_message("\blue \The [user] decides not to bolt \the [src].")
user.visible_message("<font color='blue'>\The [user] decides not to bolt \the [src].</font>")
return
user.visible_message("\blue \The [user] finishes fastening down \the [src]!")
user.visible_message("<font color='blue'>\The [user] finishes fastening down \the [src]!</font>")
anchored = 1
return
else
+1 -1
View File
@@ -7,7 +7,7 @@
if(get_dist(src, src.cable) > 1)
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
M.show_message("<font color='red'>The data cable rapidly retracts back into its spool.</font>", 3, "<font color='red'>You hear a click and the sound of wire spooling rapidly.</font>", 2)
qdel(src.cable)
handle_regular_hud_updates()
+2 -2
View File
@@ -151,7 +151,7 @@
if(prob(20))
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
M.show_message("<font color='red'>A shower of sparks spray from [src]'s inner workings.</font>", 3, "<font color='red'>You hear and smell the ozone hiss of electrical sparks being expelled violently.</font>", 2)
return src.death(0)
switch(pick(1,2,3))
@@ -226,7 +226,7 @@
cameralist[C.network] = C.network
src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist
src << "\blue Switched to [src.network] camera network."
src << "<font color='blue'>Switched to [src.network] camera network.</font>"
//End of code by Mord_Sith
*/
@@ -21,13 +21,13 @@
/obj/item/device/robotanalyzer/proc/do_scan(mob/living/M as mob, mob/living/user as mob)
if((CLUMSY in user.mutations) && prob(50))
user << text("\red You try to analyze the floor's vitals!")
user << text("<font color='red'>You try to analyze the floor's vitals!</font>")
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1)
user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1)
user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
user.show_message("\blue Body Temperature: ???", 1)
O.show_message(text("<font color='red'>[user] has analyzed the floor's vitals!</font>"), 1)
user.show_message(text("<font color='blue'>Analyzing Results for The floor:\n\t Overall Status: Healthy</font>"), 1)
user.show_message(text("<font color='blue'>\t Damage Specifics: [0]-[0]-[0]-[0]</font>"), 1)
user.show_message("<font color='blue'>Key: Suffocation/Toxin/Burns/Brute</font>", 1)
user.show_message("<font color='blue'>Body Temperature: ???</font>", 1)
return
var/scan_type
@@ -36,7 +36,7 @@
else if(istype(M, /mob/living/carbon/human))
scan_type = "prosthetics"
else
user << "\red You can't analyze non-robotic things!"
user << "<font color='red'>You can't analyze non-robotic things!</font>"
return
user.visible_message("<span class='notice'>\The [user] has analyzed [M]'s components.</span>","<span class='notice'>You have analyzed [M]'s components.</span>")
@@ -44,17 +44,17 @@
if("robot")
var/BU = M.getFireLoss() > 50 ? "<b>[M.getFireLoss()]</b>" : M.getFireLoss()
var/BR = M.getBruteLoss() > 50 ? "<b>[M.getBruteLoss()]</b>" : M.getBruteLoss()
user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]")
user.show_message("<font color='blue'>Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]</font>")
user.show_message("\t Key: <font color='#FFA500'>Electronics</font>/<font color='red'>Brute</font>", 1)
user.show_message("\t Damage Specifics: <font color='#FFA500'>[BU]</font> - <font color='red'>[BR]</font>")
if(M.tod && M.stat == DEAD)
user.show_message("\blue Time of Disable: [M.tod]")
user.show_message("<font color='blue'>Time of Disable: [M.tod]</font>")
var/mob/living/silicon/robot/H = M
var/list/damaged = H.get_damaged_components(1,1,1)
user.show_message("\blue Localized Damage:",1)
user.show_message("<font color='blue'>Localized Damage:</font>",1)
if(length(damaged)>0)
for(var/datum/robot_component/org in damaged)
user.show_message(text("\blue \t []: [][] - [] - [] - []", \
user.show_message(text("<font color='blue'>\t []: [][] - [] - [] - []</font>", \
capitalize(org.name), \
(org.installed == -1) ? "<font color='red'><b>DESTROYED</b></font> " :"",\
(org.electronics_damage > 0) ? "<font color='#FFA500'>[org.electronics_damage]</font>" :0, \
@@ -62,10 +62,10 @@
(org.toggled) ? "Toggled ON" : "<font color='red'>Toggled OFF</font>",\
(org.powered) ? "Power ON" : "<font color='red'>Power OFF</font>"),1)
else
user.show_message("\blue \t Components are OK.",1)
user.show_message("<font color='blue'>\t Components are OK.</font>",1)
if(H.emagged && prob(5))
user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1)
user.show_message("\blue Operating Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
user.show_message("<font color='red'>\t ERROR: INTERNAL SYSTEMS COMPROMISED</font>",1)
user.show_message("<font color='blue'>Operating Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)</font>", 1)
if("prosthetics")
@@ -56,7 +56,7 @@
src.has_power = 1
else
if (src.has_power)
src << "\red You are now running on emergency backup power."
src << "<font color='red'>You are now running on emergency backup power.</font>"
src.has_power = 0
if(lights_on) // Light is on but there is no power!
lights_on = 0
+11 -11
View File
@@ -247,7 +247,7 @@
var/list/modules = list()
modules.Add(robot_module_types)
if((crisis && security_level == SEC_LEVEL_RED) || crisis_override) //Leaving this in until it's balanced appropriately.
src << "\red Crisis mode active. Combat module available."
src << "<font color='red'>Crisis mode active. Combat module available.</font>"
modules+="Combat"
modtype = input("Please, select a module!", "Robot module", null, null) as null|anything in modules
@@ -354,11 +354,11 @@
set name = "Self Diagnosis"
if(!is_component_functioning("diagnosis unit"))
src << "\red Your self-diagnosis component isn't functioning."
src << "<font color='red'>Your self-diagnosis component isn't functioning.</font>"
var/datum/robot_component/CO = get_component("diagnosis unit")
if (!cell_use_power(CO.active_usage))
src << "\red Low Power."
src << "<font color='red'>Low Power.</font>"
var/dat = self_diagnosis()
src << browse(dat, "window=robotdiagnosis")
@@ -382,10 +382,10 @@
var/datum/robot_component/C = components[toggle]
if(C.toggled)
C.toggled = 0
src << "\red You disable [C.name]."
src << "<font color='red'>You disable [C.name].</font>"
else
C.toggled = 1
src << "\red You enable [C.name]."
src << "<font color='red'>You enable [C.name].</font>"
// this function displays jetpack pressure in the stat panel
/mob/living/silicon/robot/proc/show_jetpack_pressure()
@@ -451,7 +451,7 @@
C.brute_damage = WC.brute
C.electronics_damage = WC.burn
usr << "\blue You install the [W.name]."
usr << "<font color='blue'>You install the [W.name].</font>"
return
@@ -470,7 +470,7 @@
updatehealth()
add_fingerprint(user)
for(var/mob/O in viewers(user, null))
O.show_message(text("\red [user] has fixed some of the dents on [src]!"), 1)
O.show_message(text("<font color='red'>[user] has fixed some of the dents on [src]!</font>"), 1)
else
user << "Need more welding fuel!"
return
@@ -485,7 +485,7 @@
adjustFireLoss(-30)
updatehealth()
for(var/mob/O in viewers(user, null))
O.show_message(text("\red [user] has fixed some of the burnt wires on [src]!"), 1)
O.show_message(text("<font color='red'>[user] has fixed some of the burnt wires on [src]!</font>"), 1)
else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover
if(opened)
@@ -599,7 +599,7 @@
user << "You [ locked ? "lock" : "unlock"] [src]'s interface."
updateicon()
else
user << "\red Access denied."
user << "<font color='red'>Access denied.</font>"
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
@@ -713,7 +713,7 @@
/mob/living/silicon/robot/proc/installed_modules()
if(weapon_lock)
src << "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]"
src << "<font color='red'>Weapon lock active, unable to use modules! Count:[weaponlock_time]</font>"
return
if(!module)
@@ -860,7 +860,7 @@
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes(0)
cleaned_human.clean_blood(1)
cleaned_human << "\red [src] cleans your face!"
cleaned_human << "<font color='red'>[src] cleans your face!</font>"
return
/mob/living/silicon/robot/proc/self_destruct()
@@ -78,11 +78,11 @@
cell.charge -= cost
if(cell.charge <= 0)
cell.charge = 0
src << "\red Your shield has overloaded!"
src << "<font color='red'>Your shield has overloaded!</font>"
else
brute -= absorb_brute
burn -= absorb_burn
src << "\red Your shield absorbs some of the impact!"
src << "<font color='red'>Your shield absorbs some of the impact!</font>"
if(!emp)
var/datum/robot_component/armour/A = get_armour()
@@ -124,11 +124,11 @@
cell.charge -= cost
if(cell.charge <= 0)
cell.charge = 0
src << "\red Your shield has overloaded!"
src << "<font color='red'>Your shield has overloaded!</font>"
else
brute -= absorb_brute
burn -= absorb_burn
src << "\red Your shield absorbs some of the impact!"
src << "<font color='red'>Your shield absorbs some of the impact!</font>"
var/datum/robot_component/armour/A = get_armour()
if(A)
@@ -78,7 +78,7 @@
//repair a bit of damage
if(prob(1))
src.visible_message("\red \icon[src] [src] shudders and shakes as some of it's damaged systems come back online.")
src.visible_message("<font color='red'>\icon[src] [src] shudders and shakes as some of it's damaged systems come back online.</font>")
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -93,10 +93,10 @@
//sometimes our targetting sensors malfunction, and we attack anyone nearby
if(prob(disabled ? 0 : 1))
if(hostile)
src.visible_message("\blue \icon[src] [src] retracts several targetting vanes, and dulls it's running lights.")
src.visible_message("<font color='blue'>\icon[src] [src] retracts several targetting vanes, and dulls it's running lights.</font>")
hostile = 0
else
src.visible_message("\red \icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.")
src.visible_message("<font color='red'>\icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.</font>")
hostile = 1
if(health / getMaxHealth() > 0.9)
@@ -117,17 +117,17 @@
exploding = 0
if(!disabled)
if(prob(50))
src.visible_message("\blue \icon[src] [src] suddenly shuts down!")
src.visible_message("<font color='blue'>\icon[src] [src] suddenly shuts down!</font>")
else
src.visible_message("\blue \icon[src] [src] suddenly lies still and quiet.")
src.visible_message("<font color='blue'>\icon[src] [src] suddenly lies still and quiet.</font>")
disabled = rand(150, 600)
walk(src,0)
if(exploding && prob(20))
if(prob(50))
src.visible_message("\red \icon[src] [src] begins to spark and shake violenty!")
src.visible_message("<font color='red'>\icon[src] [src] begins to spark and shake violenty!</font>")
else
src.visible_message("\red \icon[src] [src] sparks and shakes like it's about to explode!")
src.visible_message("<font color='red'>\icon[src] [src] sparks and shakes like it's about to explode!</font>")
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -80,12 +80,12 @@
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("\red <B>The [src] warps in!</B>")
visible_message("<font color='red'><B>The [src] warps in!</font></B>")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
warpbots()
icon_state = "def_radar"
visible_message("\red The [src] turns on!")
visible_message("<font color='red'>The [src] turns on!</font>")
while(bot_amt > 0)
bot_amt--
switch(bot_type)
@@ -52,7 +52,7 @@
..()
for(var/mob/M in viewers(src, null))
if((M.client && !( M.blinded )))
M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
M.show_message("<font color='red'>[src] lets out a contented sigh as their form unwinds.</font>")
ghostize()
qdel(src)
@@ -103,7 +103,7 @@
if(!stat)
for(var/mob/M in viewers(user, null))
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] baps [name] on the nose with the rolled up [O]")
M.show_message("<font color='blue'>[user] baps [name] on the nose with the rolled up [O]</font>")
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2))
set_dir(i)
@@ -146,7 +146,7 @@
//pupplies cannot wear anything.
/mob/living/simple_animal/corgi/puppy/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
usr << "\red You can't fit this on [src]"
usr << "<font color='red'>You can't fit this on [src]</font>"
return
..()
@@ -169,7 +169,7 @@
//Lisa already has a cute bow!
/mob/living/simple_animal/corgi/Lisa/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
usr << "\red [src] already has a cute bow!"
usr << "<font color='red'>[src] already has a cute bow!</font>"
return
..()
@@ -75,9 +75,9 @@
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
user << "\red The [O] is full."
user << "<font color='red'>The [O] is full.</font>"
if(!transfered)
user << "\red The udder is dry. Wait a bit longer..."
user << "<font color='red'>The udder is dry. Wait a bit longer...</font>"
else
..()
//cow
@@ -120,9 +120,9 @@
user.visible_message("<span class='notice'>[user] milks [src] using \the [O].</span>")
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
user << "\red The [O] is full."
user << "<font color='red'>The [O] is full.</font>"
if(!transfered)
user << "\red The udder is dry. Wait a bit longer..."
user << "<font color='red'>The udder is dry. Wait a bit longer...</font>"
else
..()
@@ -247,12 +247,12 @@ var/global/chicken_count = 0
var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
if(G.seed && G.seed.kitchen_tag == "wheat")
if(!stat && eggsleft < 8)
user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
user.visible_message("<font color='blue'>[user] feeds [O] to [name]! It clucks happily.</font>","<font color='blue'>You feed [O] to [name]! It clucks happily.</font>")
user.drop_item()
qdel(O)
eggsleft += rand(1, 4)
else
user << "\blue [name] doesn't seem hungry!"
user << "<font color='blue'>[name] doesn't seem hungry!</font>"
else
user << "[name] doesn't seem interested in that."
else
@@ -159,19 +159,19 @@
if(copytext(possible_phrase,1,3) in department_radio_keys)
possible_phrase = copytext(possible_phrase,3,length(possible_phrase))
else
usr << "\red There is nothing to remove from its [remove_from]."
usr << "<font color='red'>There is nothing to remove from its [remove_from].</font>"
return
//Adding things to inventory
else if(href_list["add_inv"])
var/add_to = href_list["add_inv"]
if(!usr.get_active_hand())
usr << "\red You have nothing in your hand to put on its [add_to]."
usr << "<font color='red'>You have nothing in your hand to put on its [add_to].</font>"
return
switch(add_to)
if("ears")
if(ears)
usr << "\red It's already wearing something."
usr << "<font color='red'>It's already wearing something.</font>"
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -179,7 +179,7 @@
return
if( !istype(item_to_add, /obj/item/device/radio/headset) )
usr << "\red This object won't fit."
usr << "<font color='red'>This object won't fit.</font>"
return
var/obj/item/device/radio/headset/headset_to_add = item_to_add
@@ -411,7 +411,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.forceMove(src)
visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs the [held_item]!", "<font color='blue'>You grab the [held_item]!</font>", "You hear the sounds of wings flapping furiously.")
parrot_interest = null
parrot_state = PARROT_SWOOP | PARROT_RETURN
@@ -571,7 +571,7 @@
return -1
if(held_item)
src << "\red You are already holding the [held_item]"
src << "<font color='red'>You are already holding the [held_item]</font>"
return 1
for(var/obj/item/I in view(1,src))
@@ -584,10 +584,10 @@
held_item = I
I.forceMove(src)
visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs the [held_item]!", "<font color='blue'>You grab the [held_item]!</font>", "You hear the sounds of wings flapping furiously.")
return held_item
src << "\red There is nothing of interest to take."
src << "<font color='red'>There is nothing of interest to take.</font>"
return 0
/mob/living/simple_animal/parrot/proc/steal_from_mob()
@@ -599,7 +599,7 @@
return -1
if(held_item)
src << "\red You are already holding the [held_item]"
src << "<font color='red'>You are already holding the [held_item]</font>"
return 1
var/obj/item/stolen_item = null
@@ -615,10 +615,10 @@
C.remove_from_mob(stolen_item)
held_item = stolen_item
stolen_item.forceMove(src)
visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
visible_message("[src] grabs the [held_item] out of [C]'s hand!", "<font color='blue'>You snag the [held_item] out of [C]'s hand!</font>", "You hear the sounds of wings flapping furiously.")
return held_item
src << "\red There is nothing of interest to take."
src << "<font color='red'>There is nothing of interest to take.</font>"
return 0
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -642,7 +642,7 @@
return -1
if(!held_item)
usr << "\red You have nothing to drop!"
usr << "<font color='red'>You have nothing to drop!</font>"
return 0
if(!drop_gently)
@@ -675,7 +675,7 @@
src.forceMove(AM.loc)
icon_state = "parrot_sit"
return
src << "\red There is no perch nearby to sit on."
src << "<font color='red'>There is no perch nearby to sit on.</font>"
return
/*
@@ -219,7 +219,7 @@
return
if(!held_item)
usr << "\red You have nothing to drop!"
usr << "<font color='red'>You have nothing to drop!</font>"
return 0
if(istype(held_item, /obj/item/weapon/grenade))
@@ -11,7 +11,7 @@
src << "You cannot leave your host in your current state."
if(docile)
src << "\blue You are feeling far too docile to do that."
src << "<font color='blue'>You are feeling far too docile to do that.</font>"
return
if(!host || !src) return
@@ -144,7 +144,7 @@
src << "You cannot do that in your current state."
if(docile)
src << "\blue You are feeling far too docile to do that."
src << "<font color='blue'>You are feeling far too docile to do that.</font>"
return
@@ -212,7 +212,7 @@
src << "You cannot secrete chemicals in your current state."
if(docile)
src << "\blue You are feeling far too docile to do that."
src << "<font color='blue'>You are feeling far too docile to do that.</font>"
return
if(chemicals < 50)
@@ -223,7 +223,7 @@
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
src << "\red <B>You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream.</B>"
src << "<font color='red'><B>You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream.</B></font>"
host.reagents.add_reagent(chem, 10)
chemicals -= 50
@@ -261,8 +261,8 @@
src << "You cannot infest someone who is already infested!"
return
src << "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread."
M << "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing."
src << "<font color='red'>You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.</font>"
M << "<font color='red'>You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.</font>"
M.Weaken(10)
used_dominate = world.time
@@ -281,7 +281,7 @@
return
if(docile)
src << "\blue You are feeling far too docile to do that."
src << "<font color='blue'>You are feeling far too docile to do that.</font>"
return
src << "You begin delicately adjusting your connection to the host brain..."
@@ -292,8 +292,8 @@
return
else
src << "\red <B>You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.</B>"
host << "\red <B>You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.</B>"
src << "<font color='red'><B>You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.</B></font>"
host << "<font color='red'><B>You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.</B></font>"
host.add_language("Cortical Link")
// host -> brain
@@ -14,7 +14,7 @@
if (src.client)
if(client.prefs.muted & MUTE_IC)
src << "\red You cannot speak in IC (muted)."
src << "<font color='red'>You cannot speak in IC (muted).</font>"
return
if (copytext(message, 1, 2) == "*")
@@ -96,7 +96,7 @@
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
if(!Proj) return
if(prob(35))
visible_message("\red <B>[src] blocks [Proj] with its shield!</B>")
visible_message("<font color='red'><B>[src] blocks [Proj] with its shield!</B></font>")
if(Proj.firer)
react_to_attack(Proj.firer)
return
+6 -6
View File
@@ -321,9 +321,9 @@
if (flavor_text && flavor_text != "")
var/msg = replacetext(flavor_text, "\n", " ")
if(lentext(msg) <= 40)
return "\blue [msg]"
return "<font color='blue'>[msg]</font>"
else
return "\blue [copytext_preserve_html(msg, 1, 37)]... <a href='byond://?src=\ref[src];flavor_more=1'>More...</a>"
return "<font color='blue'>[copytext_preserve_html(msg, 1, 37)]... <a href='byond://?src=\ref[src];flavor_more=1'>More...</font></a>"
/*
/mob/verb/help()
@@ -350,7 +350,7 @@
if(istype(src,/mob/observer/dead))
var/mob/observer/dead/G = src
if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
usr << "\blue <B>Upon using the antagHUD you forfeighted the ability to join the round.</B>"
usr << "<font color='blue'><B>Upon using the antagHUD you forfeighted the ability to join the round.</B></font>"
return
var/deathtimeminutes = round(deathtime / 600)
var/pluralcheck = "minute"
@@ -371,7 +371,7 @@
log_game("[usr.name]/[usr.key] used abandon mob.")
usr << "\blue <B>Make sure to play a different character, and please roleplay correctly!</B>"
usr << "<font color='blue'><B>Make sure to play a different character, and please roleplay correctly!</B></font>"
if(!client)
log_game("[usr.key] AM failed due to disconnect.")
@@ -432,7 +432,7 @@
if(client.holder && (client.holder.rights & R_ADMIN))
is_admin = 1
else if(stat != DEAD || istype(src, /mob/new_player))
usr << "\blue You must be observing to use this!"
usr << "<font color='blue'>You must be observing to use this!</font>"
return
if(is_admin && stat == DEAD)
@@ -616,7 +616,7 @@
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(H.pull_damage())
src << "\red <B>Pulling \the [H] in their current condition would probably be a bad idea.</B>"
src << "<font color='red'><B>Pulling \the [H] in their current condition would probably be a bad idea.</B></font>"
//Attempted fix for people flying away through space when cuffed and dragged.
if(ismob(AM))
+7 -7
View File
@@ -55,17 +55,17 @@
var/mob/living/carbon/C = usr
C.toggle_throw_mode()
else
usr << "\red This mob type cannot throw items."
usr << "<font color='red'>This mob type cannot throw items.</font>"
return
if(NORTHWEST)
if(iscarbon(usr))
var/mob/living/carbon/C = usr
if(!C.get_active_hand())
usr << "\red You have nothing to drop in your hand."
usr << "<font color='red'>You have nothing to drop in your hand.</font>"
return
drop_item()
else
usr << "\red This mob type cannot drop items."
usr << "<font color='red'>This mob type cannot drop items.</font>"
return
//This gets called when you press the delete button.
@@ -73,7 +73,7 @@
set hidden = 1
if(!usr.pulling)
usr << "\blue You are not pulling anything."
usr << "<font color='blue'>You are not pulling anything.</font>"
return
usr.stop_pulling()
@@ -255,13 +255,13 @@
for(var/mob/M in range(mob, 1))
if(M.pulling == mob)
if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M))
src << "\blue You're restrained! You can't move!"
src << "<font color='blue'>You're restrained! You can't move!</font>"
return 0
else
M.stop_pulling()
if(mob.pinned.len)
src << "\blue You're pinned to a wall by [mob.pinned[1]]!"
src << "<font color='blue'>You're pinned to a wall by [mob.pinned[1]]!</font>"
return 0
move_delay = world.time//set move delay
@@ -470,7 +470,7 @@
//Check to see if we slipped
if(prob(Process_Spaceslipping(5)) && !buckled)
src << "\blue <B>You slipped!</B>"
src << "<font color='blue'><B>You slipped!</B></font>"
src.inertia_dir = src.last_move
step(src, src.inertia_dir)
return 0
@@ -5,7 +5,7 @@
/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies)
if(istype(src,/mob/new_player))
usr << "\red cannot convert players who have not entered yet."
usr << "<font color='red'>cannot convert players who have not entered yet.</font>"
return
if(!new_type)
@@ -19,7 +19,7 @@
return
if( new_type == /mob/new_player )
usr << "\red cannot convert into a new_player mob type."
usr << "<font color='red'>cannot convert into a new_player mob type.</font>"
return
var/mob/M
+2 -2
View File
@@ -154,7 +154,7 @@
if(href_list["late_join"])
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "\red The round is either not ready, or has already finished..."
usr << "<font color='red'>The round is either not ready, or has already finished...</font>"
return
LateChoices()
@@ -318,7 +318,7 @@
if (src != usr)
return 0
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "\red The round is either not ready, or has already finished..."
usr << "<font color='red'>The round is either not ready, or has already finished...</font>"
return 0
if(!config.enter_allowed)
usr << "<span class='notice'>There is an administrative lock on entering the game!</span>"
+13 -13
View File
@@ -103,7 +103,7 @@
break
if(!found)
usr << "\red Poll question details not found."
usr << "<font color='red'>Poll question details not found.</font>"
return
switch(polltype)
@@ -360,7 +360,7 @@
break
if(!validpoll)
usr << "\red Poll is not valid."
usr << "<font color='red'>Poll is not valid.</font>"
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
@@ -373,7 +373,7 @@
break
if(!validoption)
usr << "\red Poll option is not valid."
usr << "<font color='red'>Poll option is not valid.</font>"
return
var/alreadyvoted = 0
@@ -387,11 +387,11 @@
break
if(!multichoice && alreadyvoted)
usr << "\red You already voted in this poll."
usr << "<font color='red'>You already voted in this poll.</font>"
return
if(multichoice && (alreadyvoted >= multiplechoiceoptions))
usr << "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error."
usr << "<font color='red'>You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.</font>"
return
var/adminrank = "Player"
@@ -402,7 +402,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
usr << "\blue Vote successful."
usr << "<font color='blue'>Vote successful.</font>"
usr << browse(null,"window=playerpoll")
@@ -427,7 +427,7 @@
break
if(!validpoll)
usr << "\red Poll is not valid."
usr << "<font color='red'>Poll is not valid.</font>"
return
var/alreadyvoted = 0
@@ -440,7 +440,7 @@
break
if(alreadyvoted)
usr << "\red You already sent your feedback for this poll."
usr << "<font color='red'>You already sent your feedback for this poll.</font>"
return
var/adminrank = "Player"
@@ -460,7 +460,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
usr << "\blue Feedback logging successful."
usr << "<font color='blue'>Feedback logging successful.</font>"
usr << browse(null,"window=playerpoll")
@@ -485,7 +485,7 @@
break
if(!validpoll)
usr << "\red Poll is not valid."
usr << "<font color='red'>Poll is not valid.</font>"
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM erro_poll_option WHERE id = [optionid] AND pollid = [pollid]")
@@ -498,7 +498,7 @@
break
if(!validoption)
usr << "\red Poll option is not valid."
usr << "<font color='red'>Poll option is not valid.</font>"
return
var/alreadyvoted = 0
@@ -511,7 +511,7 @@
break
if(alreadyvoted)
usr << "\red You already voted in this poll."
usr << "<font color='red'>You already voted in this poll.</font>"
return
var/adminrank = "Player"
@@ -522,5 +522,5 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
insert_query.Execute()
usr << "\blue Vote successful."
usr << "<font color='blue'>Vote successful.</font>"
usr << browse(null,"window=playerpoll")
+1 -1
View File
@@ -19,7 +19,7 @@
set category = "IC"
if(say_disabled) //This is here to try to identify lag problems
usr << "\red Speech is currently admin-disabled."
usr << "<font color='red'>Speech is currently admin-disabled.</font>"
return
message = sanitize(message)
+2 -2
View File
@@ -222,7 +222,7 @@
var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes
if(!safe_animal(mobpath))
usr << "\red Sorry but this mob type is currently unavailable."
usr << "<font color='red'>Sorry but this mob type is currently unavailable.</font>"
return
if(transforming)
@@ -256,7 +256,7 @@
var/mobpath = input("Which type of mob should [src] turn into?", "Choose a type") in mobtypes
if(!safe_animal(mobpath))
usr << "\red Sorry but this mob type is currently unavailable."
usr << "<font color='red'>Sorry but this mob type is currently unavailable.</font>"
return
var/mob/new_mob = new mobpath(src.loc)