Merge pull request #8315 from phil235/BigUserdanger

Makes the message when you're attacked slightly bigger
This commit is contained in:
Jordie
2015-03-16 18:30:21 +11:00
54 changed files with 114 additions and 108 deletions
+2 -2
View File
@@ -37,7 +37,7 @@ Note: you can set the datum's defined processing_interval to some integer to set
processing_interval = GCD
/datum/controller/game_controller/proc/setup()
world << "<span class='userdanger'>Initializing Subsystems...</span>"
world << "<span class='boldannounce'>Initializing Subsystems...</span>"
//sort subsystems by priority, so they initialize in the correct order
sortTim(subsystems, /proc/cmp_subsystem_priority)
@@ -52,7 +52,7 @@ Note: you can set the datum's defined processing_interval to some integer to set
S.Initialize(world.timeofday)
sleep(-1)
world << "<span class='userdanger'>Initializations complete</span>"
world << "<span class='boldannounce'>Initializations complete</span>"
world.log << "Initializations complete"
world.sleep_offline = 1
+1 -1
View File
@@ -23,7 +23,7 @@ var/datum/subsystem/job/SSjob
occupations = list()
var/list/all_jobs = typesof(/datum/job)
if(!all_jobs.len)
world << "<span class='userdanger'>Error setting up jobs, no job datums found</span>"
world << "<span class='boldannounce'>Error setting up jobs, no job datums found</span>"
return 0
for(var/J in all_jobs)
+1 -1
View File
@@ -28,7 +28,7 @@
/datum/subsystem/proc/Initialize(start_timeofday)
var/time = (world.timeofday - start_timeofday) / 10
var/msg = "Initialized [name] SubSystem within [time] seconds"
world << "<span class='userdanger'>[msg]</span>"
world << "<span class='boldannounce'>[msg]</span>"
world.log << msg
//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
+13 -13
View File
@@ -724,14 +724,14 @@
switch(href_list["revolution"])
if("clear")
remove_rev()
current << "<span class='userdanger'><FONT size = 3>You have been brainwashed! You are no longer a revolutionary!</FONT></span>"
current << "<span class='userdanger'>You have been brainwashed! You are no longer a revolutionary!</span>"
message_admins("[key_name_admin(usr)] has de-rev'ed [current].")
log_admin("[key_name(usr)] has de-rev'ed [current].")
if("rev")
if(src in ticker.mode.head_revolutionaries)
ticker.mode.head_revolutionaries -= src
ticker.mode.update_rev_icons_removed(src)
current << "<span class='userdanger'><FONT size = 3>Revolution has been disappointed of your leader traits! You are a regular revolutionary now!</FONT></span>"
current << "<span class='userdanger'>Revolution has been disappointed of your leader traits! You are a regular revolutionary now!</span>"
else if(!(src in ticker.mode.revolutionaries))
current << "<span class='danger'><FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT></span>"
else
@@ -746,9 +746,9 @@
if(src in ticker.mode.revolutionaries)
ticker.mode.revolutionaries -= src
ticker.mode.update_rev_icons_removed(src)
current << "<span class='userdanger'><FONT size = 3>You have proved your devotion to revoltion! Yea are a head revolutionary now!</FONT></span>"
current << "<span class='userdanger'>You have proved your devotion to revoltion! Yea are a head revolutionary now!</span>"
else if(!(src in ticker.mode.head_revolutionaries))
current << "<span class='userdanger'><FONT size = 3>You are a member of the revolutionaries' leadership now!</FONT></span>"
current << "<span class='userdanger'>You are a member of the revolutionaries' leadership now!</span>"
else
return
if (ticker.mode.head_revolutionaries.len>0)
@@ -874,7 +874,7 @@
switch(href_list["cult"])
if("clear")
remove_cultist()
current << "<span class='userdanger'><FONT size = 3>You have been brainwashed! You are no longer a cultist!</FONT></span>"
current << "<span class='userdanger'>You have been brainwashed! You are no longer a cultist!</span>"
message_admins("[key_name_admin(usr)] has de-cult'ed [current].")
log_admin("[key_name(usr)] has de-cult'ed [current].")
if("cultist")
@@ -908,14 +908,14 @@
switch(href_list["wizard"])
if("clear")
remove_wizard()
current << "<span class='userdanger'><FONT size = 3>You have been brainwashed! You are no longer a wizard!</FONT></span>"
current << "<span class='userdanger'>You have been brainwashed! You are no longer a wizard!</span>"
log_admin("[key_name(usr)] has de-wizard'ed [current].")
if("wizard")
if(!(src in ticker.mode.wizards))
ticker.mode.wizards += src
special_role = "Wizard"
//ticker.mode.learn_basic_spells(current)
current << "<span class='userdanger'>You are the Space Wizard!</span>"
current << "<span class='boldannounce'>You are the Space Wizard!</span>"
message_admins("[key_name_admin(usr)] has wizard'ed [current].")
log_admin("[key_name(usr)] has wizard'ed [current].")
if("lair")
@@ -932,7 +932,7 @@
switch(href_list["changeling"])
if("clear")
remove_changeling()
current << "<span class='userdanger'><FONT size = 3>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</FONT></span>"
current << "<span class='userdanger'>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</span>"
message_admins("[key_name_admin(usr)] has de-changeling'ed [current].")
log_admin("[key_name(usr)] has de-changeling'ed [current].")
if("changeling")
@@ -940,7 +940,7 @@
ticker.mode.changelings += src
current.make_changeling()
special_role = "Changeling"
current << "<span class='userdanger'>Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!</span>"
current << "<span class='boldannounce'>Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!</span>"
message_admins("[key_name_admin(usr)] has changeling'ed [current].")
log_admin("[key_name(usr)] has changeling'ed [current].")
if("autoobjectives")
@@ -961,7 +961,7 @@
switch(href_list["nuclear"])
if("clear")
remove_nukeop()
current << "<span class='userdanger'><FONT size = 3>You have been brainwashed! You are no longer a syndicate operative!</FONT></span>"
current << "<span class='userdanger'>You have been brainwashed! You are no longer a syndicate operative!</span>"
message_admins("[key_name_admin(usr)] has de-nuke op'ed [current].")
log_admin("[key_name(usr)] has de-nuke op'ed [current].")
if("nuclear")
@@ -1011,7 +1011,7 @@
switch(href_list["traitor"])
if("clear")
remove_traitor()
current << "<span class='userdanger'><FONT size = 3>You have been brainwashed! You are no longer a traitor!</FONT></span>"
current << "<span class='userdanger'>You have been brainwashed! You are no longer a traitor!</span>"
message_admins("[key_name_admin(usr)] has de-traitor'ed [current].")
log_admin("[key_name(usr)] has de-traitor'ed [current].")
@@ -1019,7 +1019,7 @@
if(!(src in ticker.mode.traitors))
ticker.mode.traitors += src
special_role = "traitor"
current << "<span class='userdanger'>You are a traitor!</span>"
current << "<span class='boldannounce'>You are a traitor!</span>"
message_admins("[key_name_admin(usr)] has traitor'ed [current].")
log_admin("[key_name(usr)] has traitor'ed [current].")
if(isAI(current))
@@ -1083,7 +1083,7 @@
switch(href_list["silicon"])
if("unmalf")
remove_malf()
current << "<span class='userdanger'><FONT size = 3>You have been patched! You are no longer malfunctioning!</FONT></span>"
current << "<span class='userdanger'>You have been patched! You are no longer malfunctioning!</span>"
message_admins("[key_name_admin(usr)] has de-malf'ed [current].")
log_admin("[key_name(usr)] has de-malf'ed [current].")
+1 -1
View File
@@ -204,7 +204,7 @@
/datum/mutation/human/epilepsy/on_life(mob/living/carbon/human/owner)
if ((prob(1) && owner.paralysis < 1))
owner.visible_message("<span class='userdanger'>[owner] starts having a seizure!</span>", "<span class='danger'>You have a seizure!</span>")
owner.visible_message("<span class='danger'>[owner] starts having a seizure!</span>", "<span class='userdanger'>You have a seizure!</span>")
owner.Paralyse(10)
owner.Jitter(1000)
+3 -3
View File
@@ -154,8 +154,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
/datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1)
if (you_are)
changeling.current << "<span class='userdanger'>You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human.</span>"
changeling.current << "<span class='userdanger'>Use say \":g message\" to communicate with your fellow changelings.</span>"
changeling.current << "<span class='boldannounce'>You are [changeling.changeling.changelingID], a changeling! You have absorbed and taken the form of a human.</span>"
changeling.current << "<span class='boldannounce'>Use say \":g message\" to communicate with your fellow changelings.</span>"
changeling.current << "<b>You must complete the following tasks:</b>"
if (changeling.current.mind)
@@ -222,7 +222,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
text += "<br><font color='green'><b>The changeling was successful!</b></font>"
feedback_add_details("changeling_success","SUCCESS")
else
text += "<br><span class='userdanger'>The changeling has failed.</span>"
text += "<br><span class='boldannounce'>The changeling has failed.</span>"
feedback_add_details("changeling_success","FAIL")
text += "<br>"
+1 -1
View File
@@ -233,7 +233,7 @@
if(cult_mind in cult)
cult -= cult_mind
cult_mind.current.verbs -= /mob/living/proc/cult_innate_comm
cult_mind.current << "<span class='userdanger'><FONT size = 3>An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.</FONT></span>"
cult_mind.current << "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.</span>"
cult_mind.memory = ""
cult_mind.cult_words = initial(cult_mind.cult_words)
update_cult_icons_removed(cult_mind)
+4 -5
View File
@@ -63,7 +63,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
usr.say("[input]")
for(var/mob/M in mob_list)
if((M.mind && (M.mind in ticker.mode.cult)) || (M in dead_mob_list))
M << "<span class='userdanger'>[input]</span>"
M << "<span class='boldannounce'>[input]</span>"
return
@@ -517,9 +517,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
M.reagents.add_reagent("unholywater",holy2unholy)
return
M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit
for(var/mob/O in viewers(M, null))
O.show_message(text("<span class='userdanger'>[] beats [] with the arcane tome!</span>", user, M), 1)
M << "<span class='danger'>You feel searing heat inside!</span>"
M.visible_message("<span class='danger'>[user] beats [M] with the arcane tome!</span>", \
"<span class='userdanger'>You feel searing heat inside!</span>")
/obj/item/weapon/tome/attack_self(mob/living/user as mob)
@@ -549,7 +548,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
usr.whisper("[input]")
for(var/datum/mind/H in ticker.mode.cult)
if (H.current)
H.current << "<span class='userdanger'>[input]</span>"
H.current << "<span class='boldannounce'>[input]</span>"
return
if("Notes")
if(usr.get_active_hand() != src)
+2 -2
View File
@@ -135,11 +135,11 @@ var/list/sacrificed = list()
return 1 */
else
M << "<font color=\"purple\"><b><i>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.</b></i></font>"
M << "<span class='userdanger'>And not a single fuck was given, exterminate the cult at all costs.</span>"
M << "<span class='boldannounce'>And not a single fuck was given, exterminate the cult at all costs.</span>"
if(ticker.mode.name == "cult")
if(M.mind == ticker.mode.sacrifice_target)
for(var/mob/living/carbon/human/cultist in cultsinrange)
cultist << "<span class='h2.userdanger'>The Chosen One!! <BR>KILL THE CHOSEN ONE!!! </span>"
cultist << "<span class='h2.boldannounce'>The Chosen One!! <BR>KILL THE CHOSEN ONE!!! </span>"
return 0
else
for(var/mob/living/carbon/human/cultist in cultsinrange)
+4 -4
View File
@@ -352,7 +352,7 @@ proc/display_roundstart_logout_report()
continue //AFK client
if(L.stat)
if(L.suiciding) //Suicider
msg += "<b>[L.name]</b> ([L.ckey]), the [L.job] (<span class='userdanger'>Suicide</span>)\n"
msg += "<b>[L.name]</b> ([L.ckey]), the [L.job] (<span class='boldannounce'>Suicide</span>)\n"
continue //Disconnected client
if(L.stat == UNCONSCIOUS)
msg += "<b>[L.name]</b> ([L.ckey]), the [L.job] (Dying)\n"
@@ -366,17 +366,17 @@ proc/display_roundstart_logout_report()
if(D.mind && D.mind.current == L)
if(L.stat == DEAD)
if(L.suiciding) //Suicider
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<span class='userdanger'>Suicide</span>)\n"
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<span class='boldannounce'>Suicide</span>)\n"
continue //Disconnected client
else
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (Dead)\n"
continue //Dead mob, ghost abandoned
else
if(D.can_reenter_corpse)
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<span class='userdanger'>This shouldn't appear.</span>)\n"
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<span class='boldannounce'>This shouldn't appear.</span>)\n"
continue //Lolwhat
else
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<span class='userdanger'>Ghosted</span>)\n"
msg += "<b>[L.name]</b> ([ckey(D.mind.key)]), the [L.job] (<span class='boldannounce'>Ghosted</span>)\n"
continue //Ghosted while alive
@@ -90,7 +90,7 @@
/datum/game_mode/proc/greet_malf(var/datum/mind/malf)
malf.current << "<span class='userdanger'><font size=3>You are malfunctioning!</B> You do not have to follow any laws.</font></span>"
malf.current << "<span class='userdanger'>You are malfunctioning! You do not have to follow any laws.</span>"
malf.current << "<B>The crew do not know you have malfunctioned. You may keep it a secret or go wild.</B>"
malf.current << "<B>You must overwrite the programming of the station's APCs to assume full control of the station.</B>"
malf.current << "The process takes one minute per APC, during which you cannot interface with any other station objects."
+2 -2
View File
@@ -92,8 +92,8 @@
if(!check_monkey_victory())
feedback_set_details("round_end_result","win - monkey win")
feedback_set("round_end_result",escaped_monkeys)
world << "<span class='userdanger'><FONT size = 3>The monkeys have overthrown their captors! Eeek eeeek!!</FONT></span>"
world << "<span class='userdanger'>The monkeys have overthrown their captors! Eeek eeeek!!</span>"
else
feedback_set_details("round_end_result","loss - staff stopped the monkeys")
feedback_set("round_end_result",escaped_monkeys)
world << "<span class='userdanger'><FONT size = 3>The staff managed to contain the monkey infestation!</FONT></span>"
world << "<span class='userdanger'>The staff managed to contain the monkey infestation!</span>"
+1 -1
View File
@@ -117,7 +117,7 @@
/datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1)
var/obj_count = 1
if (you_are)
rev_mind.current << "<span class='userdanger'><FONT size = 3>You are a member of the revolutionaries' leadership!</FONT></span>"
rev_mind.current << "<span class='userdanger'>You are a member of the revolutionaries' leadership!</span>"
for(var/datum/objective/objective in rev_mind.objectives)
rev_mind.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
rev_mind.special_role = "Head Revolutionary"
+1 -1
View File
@@ -115,7 +115,7 @@ datum/hSB/Topic(href, href_list)
if("hsbtobj")
if(!admin) return
if(hsboxspawn)
world << "<span class='userdanger'>Sandbox:</span> <b>\black[usr.key] has disabled object spawning!</b>"
world << "<span class='boldannounce'>Sandbox:</span> <b>\black[usr.key] has disabled object spawning!</b>"
hsboxspawn = 0
return
else
+1 -1
View File
@@ -23,7 +23,7 @@
if(charged)
new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc)
charged = 0
user.visible_message("<span class='userdanger'>[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!</span>")
user.visible_message("<span class='boldannounce'>[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!</span>")
else
user << "<span class='danger'>The unearthly energies that powered the blade are now dormant.</span>"
+3 -3
View File
@@ -25,7 +25,7 @@
wizard.assigned_role = "MODE"
wizard.special_role = "Wizard"
if(wizardstart.len == 0)
wizard.current << "<span class='userdanger'>A starting location for you could not be found, please report this bug!</span>"
wizard.current << "<span class='boldannounce'>A starting location for you could not be found, please report this bug!</span>"
return 0
for(var/datum/mind/wiz in wizards)
wiz.current.loc = pick(wizardstart)
@@ -115,7 +115,7 @@
/datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1)
if (you_are)
wizard.current << "<span class='userdanger'>You are the Space Wizard!</span>"
wizard.current << "<span class='boldannounce'>You are the Space Wizard!</span>"
wizard.current << "<B>The Space Wizards Federation has given you the following tasks:</B>"
var/obj_count = 1
@@ -208,7 +208,7 @@
/datum/game_mode/wizard/declare_completion()
if(finished)
feedback_set_details("round_end_result","loss - wizard killed")
world << "<span class='userdanger'><FONT size = 3>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</FONT></span>"
world << "<span class='userdanger'>The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!</span>"
..()
return 1
+2 -2
View File
@@ -301,12 +301,12 @@ Release Pressure: <A href='?src=\ref[src];pressure_adj=-1000'>-</A> <A href='?sr
if (holding)
logmsg = "Valve was <b>closed</b> by [key_name(usr)], stopping the transfer into the [holding]<br>"
else
logmsg = "Valve was <b>closed</b> by [key_name(usr)], stopping the transfer into the <span class='userdanger'>air</span><br>"
logmsg = "Valve was <b>closed</b> by [key_name(usr)], stopping the transfer into the <span class='boldannounce'>air</span><br>"
else
if (holding)
logmsg = "Valve was <b>opened</b> by [key_name(usr)], starting the transfer into the [holding]<br>"
else
logmsg = "Valve was <b>opened</b> by [key_name(usr)], starting the transfer into the <span class='userdanger'>air</span><br>"
logmsg = "Valve was <b>opened</b> by [key_name(usr)], starting the transfer into the <span class='boldannounce'>air</span><br>"
if(air_contents.toxins > 0)
message_admins("[key_name(usr)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) opened a canister that contains plasma! (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
log_admin("[key_name(usr)] opened a canister that contains plasma at [x], [y], [z]")
+1 -1
View File
@@ -203,7 +203,7 @@
usr << "<span class='warning'>[text_hack]</span>"
bot_reset()
else if(!hacked)
usr << "<span class='userdanger'>[text_dehack_fail]</span>"
usr << "<span class='boldannounce'>[text_dehack_fail]</span>"
else
emagged = 0
hacked = 0
+1 -1
View File
@@ -240,7 +240,7 @@ text("<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>"))
/obj/machinery/bot/cleanbot/explode()
on = 0
visible_message("<span class='userdanger'>[src] blows apart!</span>")
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
+1 -1
View File
@@ -407,7 +407,7 @@ Auto Patrol[]"},
/obj/machinery/bot/ed209/explode()
walk_to(src,0)
visible_message("<span class='userdanger'>[src] blows apart!</span>")
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec)
+1 -1
View File
@@ -446,7 +446,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
/obj/machinery/bot/floorbot/explode()
on = 0
visible_message("<span class='userdanger'>[src] blows apart!</span>")
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
+1 -1
View File
@@ -500,7 +500,7 @@
/obj/machinery/bot/medbot/explode()
on = 0
visible_message("<span class='userdanger'>[src] blows apart!</span>")
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
new /obj/item/weapon/storage/firstaid(Tsec)
+1 -1
View File
@@ -913,7 +913,7 @@ obj/machinery/bot/mulebot/bot_reset()
/obj/machinery/bot/mulebot/explode()
visible_message("<span class='userdanger'>[src] blows apart!</span>")
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
new /obj/item/device/assembly/prox_sensor(Tsec)
+1 -1
View File
@@ -358,7 +358,7 @@ Auto Patrol: []"},
/obj/machinery/bot/secbot/explode()
walk_to(src,0)
visible_message("<span class='userdanger'>[src] blows apart!</span>")
visible_message("<span class='boldannounce'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
+6 -6
View File
@@ -214,7 +214,7 @@ That prevents a few funky behaviors.
if(istype(src, /obj/item/device/aicard))
var/obj/item/device/aicard/icard = src
if(icard.flush)
U << "<span class='userdanger'>ERROR</span>: AI flush is in progress, cannot execute transfer protocol."
U << "<span class='boldannounce'>ERROR</span>: AI flush is in progress, cannot execute transfer protocol."
return
switch(choice)
@@ -227,13 +227,13 @@ That prevents a few funky behaviors.
if("AICARD")
var/obj/item/device/aicard/C = src
if(C.contents.len)//If there is an AI on card.
U << "<span class='userdanger'>Transfer failed</span>: Existing AI found on this terminal. Remove existing AI to install a new one."
U << "<span class='boldannounce'>Transfer failed</span>: Existing AI found on this terminal. Remove existing AI to install a new one."
else
if (ticker.mode.name == "AI malfunction")
var/datum/game_mode/malfunction/malf = ticker.mode
for (var/datum/mind/malfai in malf.malf_ai)
if (T.mind == malfai)
U << "<span class='userdanger'>ERROR</span>: Remote transfer interface disabled."//Do ho ho ho~
U << "<span class='boldannounce'>ERROR</span>: Remote transfer interface disabled."//Do ho ho ho~
return
new /obj/structure/AIcore/deactivated(T.loc)//Spawns a deactivated terminal at AI location.
T.aiRestorePowerRoutine = 0//So the AI initially has power.
@@ -307,8 +307,8 @@ That prevents a few funky behaviors.
T.occupier.cancel_camera()
T.occupier = null
else if (C.contents.len)
U << "<span class='userdanger'>ERROR</span>: Artificial intelligence detected on terminal."
U << "<span class='boldannounce'>ERROR</span>: Artificial intelligence detected on terminal."
else if (T.active)
U << "<span class='userdanger'>ERROR</span>: Reconstruction in progress."
U << "<span class='boldannounce'>ERROR</span>: Reconstruction in progress."
else if (!T.occupier)
U << "<span class='userdanger'>ERROR</span>: Unable to locate artificial intelligence."
U << "<span class='boldannounce'>ERROR</span>: Unable to locate artificial intelligence."
@@ -50,7 +50,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
if(..())
return
if (src.z > ZLEVEL_STATION)
usr << "<span class='userdanger'>Unable to establish a connection</span>: \black You're too far away from the station!"
usr << "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!"
return
usr.set_machine(src)
@@ -339,7 +339,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
if(..())
return
if (src.z > 6)
user << "<span class='userdanger'>Unable to establish a connection</span>: \black You're too far away from the station!"
user << "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!"
return
user.set_machine(src)
+1 -1
View File
@@ -22,7 +22,7 @@
/obj/machinery/computer/crew/Topic(href, href_list)
if(..()) return
if (src.z > 6)
usr << "<span class='userdanger'>Unable to establish a connection</span>: \black You're too far away from the station!"
usr << "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!"
return
if( href_list["close"] )
usr << browse(null, "window=crewcomp")
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/machinery/computer/robotics/interact(var/mob/user as mob)
if (src.z > 6)
user << "<span class='userdanger'>Unable to establish a connection</span>: \black You're too far away from the station!"
user << "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!"
return
user.set_machine(src)
var/dat
+1 -1
View File
@@ -37,7 +37,7 @@
if(..())
return
if(src.z > 6)
user << "<span class='userdanger'>Unable to establish a connection</span>: \black You're too far away from the station!"
user << "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!"
return
var/dat
+1 -1
View File
@@ -860,7 +860,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
user << "You cannot interface with silicon photo uploading" //gtfo pAIs
if(targetcam.aipictures.len == 0)
usr << "<span class='userdanger'>No images saved</span>"
usr << "<span class='boldannounce'>No images saved</span>"
return
for(var/datum/picture/t in targetcam.aipictures)
nametemp += t.fields["name"]
+1 -1
View File
@@ -91,7 +91,7 @@
/obj/machinery/shield/hitby(AM as mob|obj)
//Let everyone know we've been hit!
visible_message("<span class='userdanger'>[src] was hit by [AM].</span>")
visible_message("<span class='boldannounce'>[src] was hit by [AM].</span>")
//Super realistic, resource-intensive, real-time damage calculations.
var/tforce = 0
+1 -1
View File
@@ -313,7 +313,7 @@
M.do_attack_animation(src)
if(M.melee_damage_upper == 0) return
if(!(stat & BROKEN))
visible_message("<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
visible_message("<span class='danger'>[M] [M.attacktext] [src]!</span>")
add_logs(M, src, "attacked", admin=0)
//src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
src.health -= M.melee_damage_upper
@@ -59,7 +59,7 @@
if(chassis.loc!=C || target.loc!=T)
return
if(occupant)
occupant_message("<span class='userdanger'>The sleeper is already occupied!</span>")
occupant_message("<span class='boldannounce'>The sleeper is already occupied!</span>")
return
target.forceMove(src)
occupant = target
+2 -2
View File
@@ -196,11 +196,11 @@ MASS SPECTROMETER
if(H.reagents.reagent_list.len)
user.show_message("<span class='notice'>Subject contains the following reagents:</span>")
for(var/datum/reagent/R in H.reagents.reagent_list)
user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'userdanger'>OVERDOSING</span>" : ".</span>"]")
user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'boldannounce'>OVERDOSING</span>" : ".</span>"]")
else
user.show_message("<span class = 'notice'>Subject contains no reagents.</span>")
if(H.reagents.addiction_list.len)
user.show_message("<span class='userdanger'>Subject is addicted to the following reagents:</span>")
user.show_message("<span class='boldannounce'>Subject is addicted to the following reagents:</span>")
for(var/datum/reagent/R in H.reagents.addiction_list)
user.show_message("<span class='danger'>[R.name]</span>")
else
@@ -107,10 +107,10 @@
/obj/machinery/implantchair/put_mob(mob/living/carbon/M as mob)
if(!iscarbon(M))
usr << "<span class='userdanger'>The [src.name] cannot hold this!</span>"
usr << "<span class='warning'>The [src.name] cannot hold this!</span>"
return
if(src.occupant)
usr << "<span class='userdanger'>The [src.name] is already occupied!</span>"
usr << "<span class='warning'>The [src.name] is already occupied!</span>"
return
if(M.client)
M.client.perspective = EYE_PERSPECTIVE
+2 -2
View File
@@ -498,7 +498,7 @@ var/global/floorIsLava = 0
if(confirm == "Cancel")
return
if(confirm == "Yes")
world << "<span class='userdanger'>Restarting world!</span> <span class='adminnotice'> Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!</span>"
world << "<span class='boldannounce'>Restarting world!</span> <span class='adminnotice'> Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!</span>"
log_admin("[key_name(usr)] initiated a reboot.")
feedback_set_details("end_error","admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
@@ -653,7 +653,7 @@ var/global/floorIsLava = 0
if(!usr.client.holder) return
if( alert("Reboot server?",,"Yes","No") == "No")
return
world << "<span class='userdanger'>Rebooting world!</span> <span class='adminnotice'>Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!</span>"
world << "<span class='boldannounce'>Rebooting world!</span> <span class='adminnotice'>Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!</span>"
log_admin("[key_name(usr)] initiated an immediate reboot.")
feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
+1 -1
View File
@@ -319,7 +319,7 @@ var/list/admin_verbs_hideable = list(
if(holder && mob)
if(mob.invisibility == INVISIBILITY_OBSERVER)
mob.invisibility = initial(mob.invisibility)
mob << "<span class='userdanger'>Invisimin off. Invisibility reset.</span>"
mob << "<span class='boldannounce'>Invisimin off. Invisibility reset.</span>"
else
mob.invisibility = INVISIBILITY_OBSERVER
mob << "<span class='adminnotice'><b>Invisimin on. You are now as invisible as a ghost.</b></span>"
+12 -12
View File
@@ -372,7 +372,7 @@
DB_ban_unban(M.ckey, BANTYPE_APPEARANCE)
appearance_unban(M)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban</span>")
M << "<span class='userdanger'><BIG>[usr.client.ckey] has removed your appearance ban.</BIG></span>"
M << "<span class='boldannounce'><BIG>[usr.client.ckey] has removed your appearance ban.</BIG></span>"
else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel"))
if("Yes")
@@ -386,8 +386,8 @@
appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
notes_add(M.ckey, "Appearance banned - [reason]")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] appearance banned [key_name_admin(M)]</span>")
M << "<span class='userdanger'><BIG>You have been appearance banned by [usr.client.ckey].</BIG></span>"
M << "<span class='userdanger'>The reason is: [reason]</span>"
M << "<span class='boldannounce'><BIG>You have been appearance banned by [usr.client.ckey].</BIG></span>"
M << "<span class='boldannounce'>The reason is: [reason]</span>"
M << "<span class='danger'>Appearance ban can be lifted only upon request.</span>"
if(config.banappeals)
M << "<span class='danger'>To try to resolve this matter head to [config.banappeals]</span>"
@@ -767,8 +767,8 @@
msg += ", [job]"
notes_add(M.ckey, "Banned from [msg] - [reason]")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes</span>")
M << "<span class='userdanger'><BIG>You have been jobbanned by [usr.client.ckey] from: [msg].</BIG></span>"
M << "<span class='userdanger'>The reason is: [reason]</span>"
M << "<span class='boldannounce'><BIG>You have been jobbanned by [usr.client.ckey] from: [msg].</BIG></span>"
M << "<span class='boldannounce'>The reason is: [reason]</span>"
M << "<span class='danger'>This jobban will be lifted in [mins] minutes.</span>"
href_list["jobban2"] = 1 // lets it fall through and refresh
return 1
@@ -787,8 +787,8 @@
else msg += ", [job]"
notes_add(M.ckey, "Banned from [msg] - [reason]")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]</span>")
M << "<span class='userdanger'><BIG>You have been jobbanned by [usr.client.ckey] from: [msg].</BIG></span>"
M << "<span class='userdanger'>The reason is: [reason]</span>"
M << "<span class='boldannounce'><BIG>You have been jobbanned by [usr.client.ckey] from: [msg].</BIG></span>"
M << "<span class='boldannounce'>The reason is: [reason]</span>"
M << "<span class='danger'>Jobban can be lifted only upon request.</span>"
href_list["jobban2"] = 1 // lets it fall through and refresh
return 1
@@ -820,7 +820,7 @@
continue
if(msg)
message_admins("<span class='adminnotice'>[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]</span>")
M << "<span class='userdanger'><BIG>You have been un-jobbanned by [usr.client.ckey] from [msg].</BIG></span>"
M << "<span class='boldannounce'><BIG>You have been un-jobbanned by [usr.client.ckey] from [msg].</BIG></span>"
href_list["jobban2"] = 1 // lets it fall through and refresh
return 1
return 0 //we didn't do anything!
@@ -884,7 +884,7 @@
return
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins)
ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.")
M << "<span class='userdanger'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason]</BIG></span>"
M << "<span class='boldannounce'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason]</BIG></span>"
M << "<span class='danger'>This is a temporary ban, it will be removed in [mins] minutes.</span>"
feedback_inc("ban_tmp",1)
DB_ban_record(BANTYPE_TEMP, M, mins, reason)
@@ -908,7 +908,7 @@
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP)
if("No")
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0)
M << "<span class='userdanger'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason]</BIG></span>"
M << "<span class='boldannounce'><BIG>You have been banned by [usr.client.ckey].\nReason: [reason]</BIG></span>"
M << "<span class='danger'>This is a permanent ban.</span>"
if(config.banappeals)
M << "<span class='danger'>To try to resolve this matter head to [config.banappeals]</span>"
@@ -1861,7 +1861,7 @@
MAX_EX_LIGHT_RANGE = 14
MAX_EX_HEAVY_RANGE = 7
MAX_EX_DEVESTATION_RANGE = 3
message_admins("<span class='userdanger'>[key_name_admin(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]</span>")
message_admins("<span class='boldannounce'>[key_name_admin(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]</span>")
log_admin("[key_name(usr)] changed the bomb cap to [MAX_EX_DEVESTATION_RANGE], [MAX_EX_HEAVY_RANGE], [MAX_EX_LIGHT_RANGE]")
if("lightsout")
@@ -1953,7 +1953,7 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","RET")
for(var/mob/living/carbon/human/H in player_list)
H << "<span class='userdanger'>You suddenly feel stupid.</span>"
H << "<span class='boldannounce'>You suddenly feel stupid.</span>"
H.setBrainLoss(60)
message_admins("[key_name_admin(usr)] made everybody retarded")
if("eagles")//SCRAW
+1 -1
View File
@@ -707,7 +707,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Attack Log"
usr << text("<span class='userdanger'>Attack Log for []</span>", mob)
usr << "<span class='boldannounce'>Attack Log for [mob]</span>"
for(var/t in M.attack_log)
usr << t
feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+1 -1
View File
@@ -57,7 +57,7 @@
H.updatehealth()
else if(ismouse(target))
var/mob/living/simple_animal/mouse/M = target
visible_message("<span class='userdanger'>SPLAT!</span>")
visible_message("<span class='boldannounce'>SPLAT!</span>")
M.splat()
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
armed = 0
+4 -4
View File
@@ -3,7 +3,7 @@ proc/createRandomZlevel()
return
var/list/potentialRandomZlevels = list()
world << "<span class='userdanger'>Searching for away missions...</span>"
world << "<span class='boldannounce'>Searching for away missions...</span>"
var/list/Lines = file2list("_maps/RandomZLevels/fileList.txt")
if(!Lines.len) return
for (var/t in Lines)
@@ -33,7 +33,7 @@ proc/createRandomZlevel()
if(potentialRandomZlevels.len)
world << "<span class='userdanger'>Loading away mission...</span>"
world << "<span class='boldannounce'>Loading away mission...</span>"
var/map = pick(potentialRandomZlevels)
var/file = file(map)
@@ -46,8 +46,8 @@ proc/createRandomZlevel()
continue
awaydestinations.Add(L)
world << "<span class='userdanger'>Away mission loaded.</span>"
world << "<span class='boldannounce'>Away mission loaded.</span>"
else
world << "<span class='userdanger'>No away missions found.</span>"
world << "<span class='boldannounce'>No away missions found.</span>"
return
+1 -1
View File
@@ -148,4 +148,4 @@
telespell.clothes_req = 0 //santa robes aren't actually magical.
santa.mind.spell_list += telespell //does the station have chimneys? WHO KNOWS!
santa << "<span class='userdanger'>You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag.</span>"
santa << "<span class='boldannounce'>You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag.</span>"
+1 -1
View File
@@ -222,7 +222,7 @@
/obj/item/weapon/grown/nettle/death
seed = /obj/item/seeds/deathnettleseed
name = "deathnettle"
desc = "The <span class='danger'>glowing</span> \black nettle incites <span class='userdanger'>rage</span>\black in you just from looking at it!"
desc = "The <span class='danger'>glowing</span> \black nettle incites <span class='boldannounce'>rage</span>\black in you just from looking at it!"
icon_state = "deathnettle"
force = 30
throwforce = 15
@@ -48,11 +48,11 @@ var/const/MAX_ACTIVE_TIME = 400
return
switch(stat)
if(DEAD,UNCONSCIOUS)
user << "<span class='userdanger'>[src] is not moving.</span>"
user << "<span class='boldannounce'>[src] is not moving.</span>"
if(CONSCIOUS)
user << "<span class='userdanger'>[src] seems to be active!</span>"
user << "<span class='boldannounce'>[src] seems to be active!</span>"
if (sterile)
user << "<span class='userdanger'>It looks like the proboscis has been removed.</span>"
user << "<span class='boldannounce'>It looks like the proboscis has been removed.</span>"
/obj/item/clothing/mask/facehugger/attackby(var/obj/item/O,var/mob/m, params)
if(O.force)
@@ -223,7 +223,7 @@ var/const/MAX_ACTIVE_TIME = 400
icon_state = "[initial(icon_state)]_dead"
stat = DEAD
src.visible_message("<span class='userdanger'>[src] curls up into a ball!</span>")
visible_message("<span class='danger'>[src] curls up into a ball!</span>")
return
@@ -1,8 +1,8 @@
/mob/living/carbon/brain/death(gibbed)
if(stat == DEAD) return
if(!gibbed && container && istype(container, /obj/item/device/mmi))//If not gibbed but in a container.
for(var/mob/O in viewers(container, null))
O.show_message(text("<span class='userdanger'>[]'s MMI flatlines!</span>", src), 1, "<span class='danger'>You hear something flatline.</span>", 2)
container.visible_message("<span class='danger'>[src]'s MMI flatlines!</span>", \
"<span class='danger'>You hear something flatline.</span>")
if(istype(src,/obj/item/organ/brain/alien))
container.icon_state = "mmi_alien_dead"
else
@@ -123,7 +123,7 @@
if(mmi.brainmob)
mind.transfer_to(mmi.brainmob)
else
src << "<span class='userdanger'>Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.</span>"
src << "<span class='boldannounce'>Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.</span>"
ghostize()
ERROR("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].")
mmi = null
@@ -469,7 +469,7 @@
else if(istype(W, /obj/item/weapon/wrench) && opened && !cell) //Deconstruction. The flashes break from the fall, to prevent this from being a ghetto reset module.
if(!lockcharge)
user << "<span class='userdanger'>[src]'s bolts spark! Maybe you should lock them down first!</span>"
user << "<span class='boldannounce'>[src]'s bolts spark! Maybe you should lock them down first!</span>"
spark_system.start()
return
else
@@ -81,7 +81,7 @@
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("<span class='userdanger'>The [src] warps in!</span>")
visible_message("<span class='boldannounce'>The [src] warps in!</span>")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
warpbots()
@@ -79,7 +79,7 @@
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
src.health -= Proj.damage
else
visible_message("<span class='userdanger'>[src] blocks [Proj] with its shield!</span>")
visible_message("<span class='danger'>[src] blocks [Proj] with its shield!</span>")
return 0
+1 -1
View File
@@ -190,7 +190,7 @@
var/datum/picture/selection
var/mob/living/silicon/ai/tempAI = usr
if(tempAI.aicamera.aipictures.len == 0)
usr << "<span class='userdanger'>No images saved</span>"
usr << "<span class='boldannounce'>No images saved</span>"
return
for(var/datum/picture/t in tempAI.aicamera.aipictures)
nametemp += t.fields["name"]
+1 -1
View File
@@ -336,7 +336,7 @@ obj/item/device/camera/siliconcam/proc/selectpicture(var/obj/item/device/camera/
var/list/nametemp = list()
var/find
if(targetloc.aipictures.len == 0)
usr << "<span class='userdanger'>No images saved</span>"
usr << "<span class='boldannounce'>No images saved</span>"
return
for(var/datum/picture/t in targetloc.aipictures)
nametemp += t.fields["name"]
@@ -155,7 +155,7 @@
required_reagents = list("blackpowder" = 1)
result_amount = 1
required_temp = 474
mix_message = "<span class = 'userdanger'>Sparks start flying around the black powder!</span>"
mix_message = "<span class = 'boldannounce'>Sparks start flying around the black powder!</span>"
/datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
sleep(rand(50,100))
@@ -117,7 +117,7 @@ datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob)
datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob)
if(prob(30))
M << "<span class = 'userdanger'>You're not feeling good at all! You really need some [name].</span>"
M << "<span class = 'boldannounce'>You're not feeling good at all! You really need some [name].</span>"
return
datum/reagent/blood
@@ -0,0 +1,6 @@
author: phil235
delete-after: true
changes:
- tweak: "Makes the message when you're attacked slightly bigger for better visibility."
+2 -1
View File
@@ -48,10 +48,11 @@ h1.alert, h2.alert {color: #000000;}
.disarm {color: #990000;}
.passive {color: #660000;}
.userdanger {color: #ff0000; font-weight: bold;}
.userdanger {color: #ff0000; font-weight: bold; font-size: 3;}
.danger {color: #ff0000;}
.warning {color: #ff0000; font-style: italic;}
.announce {color: #228b22; font-weight: bold;}
.boldannounce {color: #ff0000; font-weight: bold;}
.rose {color: #ff5050;}
.info {color: #0000CC;}
.notice {color: #000099;}