cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8315 from phil235/BigUserdanger

Browse Source 
Makes the message when you're attacked slightly bigger
This commit is contained in:
Jordie
2015-03-16 18:30:21 +11:00
parent fb6aa85094 78d28a6d64
commit 9c148ff13e
54 changed files with 114 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/changeling.dm
+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>"
code/game/gamemodes/cult/cult.dm
+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)
code/game/gamemodes/cult/ritual.dm
+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)
code/game/gamemodes/cult/runes.dm
+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)
code/game/gamemodes/game_mode.dm
+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
code/game/gamemodes/malfunction/malfunction.dm
+1 -1
View File
@@ -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."
code/game/gamemodes/monkey/monkey.dm
+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>"
code/game/gamemodes/revolution/revolution.dm
+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"
code/game/gamemodes/sandbox/h_sandbox.dm
+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
code/game/gamemodes/wizard/artefact.dm
+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>"
code/game/gamemodes/wizard/wizard.dm
+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
code/game/machinery/atmoalter/canister.dm
+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]")
code/game/machinery/bots/bots.dm
+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
code/game/machinery/bots/cleanbot.dm
+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)
code/game/machinery/bots/ed209bot.dm
+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)
code/game/machinery/bots/floorbot.dm
+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)
code/game/machinery/bots/medbot.dm
+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)
code/game/machinery/bots/mulebot.dm
+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)
code/game/machinery/bots/secbot.dm
+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)
code/game/machinery/computer/ai_core.dm
+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."
code/game/machinery/computer/communications.dm
+2 -2
View File
@@ -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)
code/game/machinery/computer/crew.dm
+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")
code/game/machinery/computer/robot.dm
+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
code/game/machinery/computer/security.dm
+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
code/game/machinery/newscaster.dm
+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"]
code/game/machinery/shieldgen.dm
+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
code/game/machinery/turrets.dm
+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
code/game/mecha/equipment/tools/medical_tools.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/scanners.dm
+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
code/game/objects/items/weapons/implants/implantchair.dm
+2 -2
View File
@@ -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