Changelog + Span Fixes

This commit is contained in:
clusterfack
2015-01-18 20:25:55 -06:00
parent 496f0a6650
commit b1e2fe8ecd
14 changed files with 226 additions and 222 deletions

View File

@@ -436,7 +436,7 @@
set name = "Self Diagnosis"
if(!is_component_functioning("diagnosis unit"))
src << "\red Your self-diagnosis component isn't functioning."
src << "<span class='warning'>Your self-diagnosis component isn't functioning.</span>"
var/dat = self_diagnosis()
src << browse(dat, "window=robotdiagnosis")
@@ -461,10 +461,10 @@
var/datum/robot_component/C = components[toggle]
if(C.toggled)
C.toggled = 0
src << "\red You disable [C.name]."
src << "<span class='warning'>You disable [C.name].</span>"
else
C.toggled = 1
src << "\red You enable [C.name]."
src << "<span class='warning'>You enable [C.name].</span>"
/mob/living/silicon/robot/blob_act()
if(flags & INVULNERABLE)
@@ -594,7 +594,7 @@
if(flags & INVULNERABLE)
return
for(var/mob/M in viewers(src, null))
M.show_message(text("\red [src] has been hit by [O]"), 1)
M.show_message(text("<span class='attack'>[src] has been hit by [O]</span>"), 1)
//Foreach goto(19)
if (health > 0)
adjustBruteLoss(30)
@@ -620,7 +620,7 @@
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (M_FAT in tmob.mutations))
if(prob(20))
usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
usr << "<span class='danger'>You fail to push [tmob]'s fat ass out of the way.</span>"
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
@@ -764,7 +764,7 @@
user.drop_item()
W.loc = null
usr << "\blue You install the [W.name]."
usr << "<span class='notice'>You install the [W.name].</span>"
return
@@ -778,7 +778,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("<span class='attack'>[user] has fixed some of the dents on [src]!</span>"), 1)
else
user << "Need more welding fuel!"
return
@@ -792,7 +792,7 @@
updatehealth()
coil.use(1)
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("<span class='attack'>[user] has fixed some of the burnt wires on [src]!</span>"), 1)
else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover
if(opened)
@@ -896,7 +896,7 @@
user << "You [ locked ? "lock" : "unlock"] [src]'s interface."
updateicon()
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
@@ -947,7 +947,7 @@
if ("help")
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\blue [M] caresses [src]'s plating with its scythe like arm."), 1)
O.show_message(text("<span class='notice'>[M] caresses [src]'s plating with its scythe like arm.</span>"), 1)
if ("grab")
if (M == src)
@@ -961,7 +961,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("<span class='attack'>[] has grabbed [] passively!</span>", M, src), 1)
if ("hurt")
var/damage = rand(10, 20)
@@ -976,7 +976,7 @@
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
O.show_message(text("<span class='danger'>[] has slashed at []!</span>", M, src), 1)
if(prob(8))
flick("noise", flash)
adjustBruteLoss(damage)
@@ -985,7 +985,7 @@
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
O.show_message(text("<span class='danger'>[] took a swipe at []!</span>", M, src), 1)
if ("disarm")
if(!(lying))
@@ -996,12 +996,12 @@
playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has forced back []!</B>", M, src), 1)
O.show_message(text("<span class='danger'>[] has forced back []!</span>", M, src), 1)
else
playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] attempted to force back []!</B>", M, src), 1)
O.show_message(text("<span class='danger'>[] attempted to force back []!</span>", M, src), 1)
return
@@ -1017,7 +1017,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>The [M.name] glomps []!</B>", src), 1)
O.show_message(text("<span class='danger'>The [M.name] glomps []!</span>", src), 1)
var/damage = rand(1, 3)
@@ -1048,7 +1048,7 @@
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>The [M.name] has electrified []!</B>", src), 1)
O.show_message(text("<span class='danger'>The [M.name] has electrified []!</span>", src), 1)
flick("noise", flash)
@@ -1071,7 +1071,7 @@
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
O.show_message("<span class='danger'>[M] [M.attacktext] [src]!</span>", 1)
M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
@@ -1183,7 +1183,7 @@
/mob/living/silicon/robot/proc/installed_modules()
if(weapon_lock)
src << "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]"
src << "<span class='attack'>Weapon lock active, unable to use modules! Count:[weaponlock_time]</span>"
return
if(!module)
@@ -1331,7 +1331,7 @@
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes(0)
cleaned_human.clean_blood()
cleaned_human << "\red [src] cleans your face!"
cleaned_human << "<span class='warning'>[src] cleans your face!</span>"
return
/mob/living/silicon/robot/proc/self_destruct()