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

code/machinery, fix for code/antagonist merge string causing false positive

Browse Source
This commit is contained in:
GinjaNinja32
2015-05-30 14:05:32 +01:00
parent 2c49644ba4
commit dfd871f168
81 changed files with 412 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/antagonist/station/rogue_ai.dm
+2 -1
View File
@@ -64,7 +64,8 @@ var/datum/antagonist/rogue_ai/malf
sleep(50)
malf << "<B>MEMCHCK</B> Corrupted sectors confirmed. Reccomended solution: Delete. Proceed? Y/N: Y"
sleep(10)
malf << "<span class='notice'>Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\backups.dat</span>"
// this is so Travis doesn't complain about the backslash-B. Fixed at compile time (or should be).
malf << "<span class='notice'>Corrupted files deleted: sys\\core\\users.dat sys\\core\\laws.dat sys\\core\\" + "backups.dat</span>"
sleep(20)
malf << "<span class='notice'><b>CAUTION:</b> Law database not found! User database not found! Unable to restore backups. Activating failsafe AI shutd3wn52&&$#!##</span>"
sleep(5)
code/game/machinery/OpTable.dm
+5 -5
View File
@@ -47,8 +47,8 @@
/obj/machinery/optable/attack_hand(mob/user as mob)
if (HULK in usr.mutations)
usr << text("\blue You destroy the table.")
visible_message("\red [usr] destroys the operating table!")
usr << text("<span class='notice'>You destroy the table.</span>")
visible_message("<span class='warning'>\The [usr] destroys the operating table!</span>")
src.density = 0
qdel(src)
return
@@ -89,7 +89,7 @@
if (C == user)
user.visible_message("[user] climbs on the operating table.","You climb on the operating table.")
else
visible_message("\red [C] has been laid on the operating table by [user].", 3)
visible_message("<span class='warning'>[C] has been laid on the operating table by [user].</span>", 3)
if (C.client)
C.client.perspective = EYE_PERSPECTIVE
C.client.eye = src
@@ -135,11 +135,11 @@
/obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob)
if(src.victim)
usr << "\blue <B>The table is already occupied!</B>"
usr << "<span class='warning'>The table is already occupied!</span>"
return 0
if(patient.buckled)
usr << "\blue <B>Unbuckle first!</B>"
usr << "<span class='warning'>Unbuckle first!</span>"
return 0
return 1
code/game/machinery/Sleeper.dm
+19 -19
View File
@@ -118,11 +118,11 @@
if (src.connected)
if (src.connected.occupant)
if (src.connected.occupant.stat == DEAD)
usr << "\red \b This person has no life for to preserve anymore. Take them to a department capable of reanimating them."
usr << "<span class='danger'>This person has no life for to preserve anymore. Take them to a department capable of reanimating them.</span>"
else if(src.connected.occupant.health > 0 || href_list["chemical"] == "inaprovaline")
src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"]))
else
usr << "\red \b This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!"
usr << "<span class='danger'>This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!</span>"
src.updateUsrDialog()
if (href_list["refresh"])
src.updateUsrDialog()
@@ -217,7 +217,7 @@
src.updateUsrDialog()
return
else
user << "\red The sleeper has a beaker already."
user << "<span class='warning'>The sleeper has a beaker already.</span>"
return
else if(istype(G, /obj/item/weapon/grab))
@@ -225,7 +225,7 @@
return
if(src.occupant)
user << "\blue <B>The sleeper is already occupied!</B>"
user << "<span class='warning'>The sleeper is already occupied!</span>"
return
for(var/mob/living/carbon/slime/M in range(1,G:affecting))
@@ -237,7 +237,7 @@
if(do_after(user, 20))
if(src.occupant)
user << "\blue <B>The sleeper is already occupied!</B>"
user << "<span class='warning'>The sleeper is already occupied!</span>"
return
if(!G || !G:affecting) return
var/mob/M = G:affecting
@@ -350,7 +350,7 @@
proc/check(mob/living/user as mob)
if(src.occupant)
user << text("\blue <B>Occupant ([]) Statistics:</B>", src.occupant)
user << text("<span class='notice'><B>Occupant ([]) Statistics:</B></span>", src.occupant)
var/t1
switch(src.occupant.stat)
if(0.0)
@@ -360,20 +360,20 @@
if(2.0)
t1 = "*dead*"
else
user << text("[]\t Health %: [] ([])", (src.occupant.health > 50 ? "\blue " : "\red "), src.occupant.health, t1)
user << text("[]\t -Core Temperature: []&deg;C ([]&deg;F)</FONT><BR>", (src.occupant.bodytemperature > 50 ? "<font color='blue'>" : "<font color='red'>"), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67)
user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "\blue " : "\red "), src.occupant.getBruteLoss())
user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "\blue " : "\red "), src.occupant.getOxyLoss())
user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "\blue " : "\red "), src.occupant.getToxLoss())
user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "\blue " : "\red "), src.occupant.getFireLoss())
user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)"
user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5)
user << text("<span class='[]'>\t Health %: [] ([])</span>", (src.occupant.health > 50 ? "notice" : "warning"), src.occupant.health, t1)
user << text("<span class='[]'>\t -Core Temperature: []&deg;C ([]&deg;F)</span>", (src.occupant.bodytemperature > 50 ? "notice" : "warning"), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67)
user << text("<span class='[]'>\t -Brute Damage %: []</span>", (src.occupant.getBruteLoss() < 60 ? "notice" : "warning"), src.occupant.getBruteLoss())
user << text("<span class='[]'>\t -Respiratory Damage %: []</span>", (src.occupant.getOxyLoss() < 60 ? "notice" : "warning"), src.occupant.getOxyLoss())
user << text("<span class='[]'>\t -Toxin Content %: []</span>", (src.occupant.getToxLoss() < 60 ? "notice" : "warning"), src.occupant.getToxLoss())
user << text("<span class='[]'>\t -Burn Severity %: []</span>", (src.occupant.getFireLoss() < 60 ? "notice" : "warning"), src.occupant.getFireLoss())
user << "<span class='notice'>Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)</span>"
user << text("<span class='notice'>\t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)</span>", src.occupant.paralysis / 5)
if(src.beaker)
user << text("\blue \t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
user << text("<span class='notice'>\t Dialysis Output Beaker has [] of free space remaining.</span>", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
else
user << "\blue No Dialysis Output Beaker loaded."
user << "<span class='notice'>No Dialysis Output Beaker loaded.</span>"
else
user << "\blue There is no one inside!"
user << "<span class='notice'>There is no one inside!</span>"
return
@@ -412,7 +412,7 @@
return
if(src.occupant)
usr << "\blue <B>The sleeper is already occupied!</B>"
usr << "<span class='warning'>The sleeper is already occupied!</span>"
return
for(var/mob/living/carbon/slime/M in range(1,usr))
@@ -422,7 +422,7 @@
visible_message("[usr] starts climbing into the sleeper.", 3)
if(do_after(usr, 20))
if(src.occupant)
usr << "\blue <B>The sleeper is already occupied!</B>"
usr << "<span class='warning'>The sleeper is already occupied!</span>"
return
usr.stop_pulling()
usr.client.perspective = EYE_PERSPECTIVE
code/game/machinery/adv_med.dm
+7 -7
View File
@@ -42,10 +42,10 @@
if (usr.stat != 0)
return
if (src.occupant)
usr << "\blue <B>The scanner is already occupied!</B>"
usr << "<span class='warning'>The scanner is already occupied!</span>"
return
if (usr.abiotic())
usr << "\blue <B>Subject cannot have abiotic items on.</B>"
usr << "<span class='warning'>The subject cannot have abiotic items on.</span>"
return
usr.pulling = null
usr.client.perspective = EYE_PERSPECTIVE
@@ -80,10 +80,10 @@
if ((!( istype(G, /obj/item/weapon/grab) ) || !( ismob(G.affecting) )))
return
if (src.occupant)
user << "\blue <B>The scanner is already occupied!</B>"
user << "<span class='warning'>The scanner is already occupied!</span>"
return
if (G.affecting.abiotic())
user << "\blue <B>Subject cannot have abiotic items on.</B>"
user << "<span class='warning'>Subject cannot have abiotic items on.</span>"
return
var/mob/M = G.affecting
if (M.client)
@@ -220,10 +220,10 @@
if(stat & (NOPOWER|BROKEN))
return
if(!connected || (connected.stat & (NOPOWER|BROKEN)))
user << "\red This console is not connected to a functioning body scanner."
user << "<span class='warning'>This console is not connected to a functioning body scanner.</span>"
return
if(!ishuman(connected.occupant))
user << "\red This device can only scan compatible lifeforms."
user << "<span class='warning'>This device can only scan compatible lifeforms.</span>"
return
var/dat
@@ -449,4 +449,4 @@
dat += text("<font color='red'>Cataracts detected.</font><BR>")
if(occ["sdisabilities"] & NEARSIGHTED)
dat += text("<font color='red'>Retinal misalignment detected.</font><BR>")
return dat
return dat
code/game/machinery/ai_slipper.dm
+2 -2
View File
@@ -52,7 +52,7 @@
if (user.machine==src)
src.attack_hand(usr)
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
return
return
@@ -127,4 +127,4 @@
if (uses >= 0)
cooldown_on = 0
src.power_change()
return
return
code/game/machinery/alarm.dm
+6 -6
View File
@@ -800,9 +800,9 @@
else
if(allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN))
locked = !locked
user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface."
user << "<span class='notice'>You [ locked ? "lock" : "unlock"] the Air Alarm interface.</span>"
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
return
if(1)
@@ -941,11 +941,11 @@ FIRE ALARM
if (istype(W, /obj/item/device/multitool))
src.detecting = !( src.detecting )
if (src.detecting)
user.visible_message("\red [user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.")
user.visible_message("<span class='notice'>\The [user] has reconnected [src]'s detecting unit!</span>", "<span class='notice'>You have reconnected [src]'s detecting unit.</span>")
else
user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.")
user.visible_message("<span class='notice'>\The [user] has disconnected [src]'s detecting unit!</span>", "<span class='notice'>You have disconnected [src]'s detecting unit.</span>")
else if (istype(W, /obj/item/weapon/wirecutters))
user.visible_message("\red [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].")
user.visible_message("<span class='notice'>\The [user] has cut the wires inside \the [src]!</span>", "<span class='notice'>You have cut the wires inside \the [src].</span>")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
buildstage = 1
update_icon()
@@ -957,7 +957,7 @@ FIRE ALARM
buildstage = 2
return
else
user << "<span class='warning'>You need 5 pieces of cable to do wire \the [src].</span>"
user << "<span class='warning'>You need 5 pieces of cable to wire \the [src].</span>"
return
else if(istype(W, /obj/item/weapon/crowbar))
user << "You pry out the circuit!"
code/game/machinery/atmoalter/canister.dm
+1 -1
View File
@@ -247,7 +247,7 @@ update_flag
/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda))
visible_message("\red [user] hits the [src] with a [W]!")
visible_message("<span class='warning'>\The [user] hits \the [src] with \a [W]!</span>")
src.health -= W.force
src.add_fingerprint(user)
healthcheck()
code/game/machinery/atmoalter/meter.dm
+5 -5
View File
@@ -69,10 +69,10 @@
var/t = "A gas flow meter. "
if(get_dist(user, src) > 3 && !(istype(user, /mob/living/silicon/ai) || istype(user, /mob/dead)))
t += "\blue <B>You are too far away to read it.</B>"
t += "<span class='warning'>You are too far away to read it.</span>"
else if(stat & (NOPOWER|BROKEN))
t += "\red <B>The display is off.</B>"
t += "<span class='warning'>The display is off.</span>"
else if(src.target)
var/datum/gas_mixture/environment = target.return_air()
@@ -97,11 +97,11 @@
if (!istype(W, /obj/item/weapon/wrench))
return ..()
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You begin to unfasten \the [src]..."
user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
if (do_after(user, 40))
user.visible_message( \
"[user] unfastens \the [src].", \
"\blue You have unfastened \the [src].", \
"<span class='notice'>\The [user] unfastens \the [src].</span>", \
"<span class='notice'>You have unfastened \the [src].</span>", \
"You hear ratchet.")
new /obj/item/pipe_meter(src.loc)
qdel(src)
code/game/machinery/atmoalter/portable_atmospherics.dm
+14 -14
View File
@@ -118,39 +118,39 @@
else if (istype(W, /obj/item/weapon/wrench))
if(connected_port)
disconnect()
user << "\blue You disconnect [name] from the port."
user << "<span class='notice'>You disconnect \the [src] from the port.</span>"
update_icon()
return
else
var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc
if(possible_port)
if(connect(possible_port))
user << "\blue You connect [name] to the port."
user << "<span class='notice'>You connect \the [src] to the port.</span>"
update_icon()
return
else
user << "\blue [name] failed to connect to the port."
user << "<span class='notice'>\The [src] failed to connect to the port.</span>"
return
else
user << "\blue Nothing happens."
user << "<span class='notice'>Nothing happens.</span>"
return
else if ((istype(W, /obj/item/device/analyzer)) && Adjacent(user))
visible_message("\red [user] has used [W] on \icon[icon]")
visible_message("<span class='notice'>\The [user] has used \the [W] on \the [src] \icon[icon]</span>")
if(air_contents)
var/pressure = air_contents.return_pressure()
var/total_moles = air_contents.total_moles
user << "\blue Results of analysis of \icon[icon]"
user << "<span class='notice'>Results of analysis of \icon[icon]</span>"
if (total_moles>0)
user << "\blue Pressure: [round(pressure,0.1)] kPa"
user << "<span class='notice'>Pressure: [round(pressure,0.1)] kPa</span>"
for(var/g in air_contents.gas)
user << "\blue [gas_data.name[g]]: [round((air_contents.gas[g] / total_moles) * 100)]%"
user << "\blue Temperature: [round(air_contents.temperature-T0C)]&deg;C"
user << "<span class='notice'>[gas_data.name[g]]: [round((air_contents.gas[g] / total_moles) * 100)]%</span>"
user << "<span class='notice'>Temperature: [round(air_contents.temperature-T0C)]&deg;C</span>"
else
user << "\blue Tank is empty!"
user << "<span class='notice'>Tank is empty!</span>"
else
user << "\blue Tank is empty!"
user << "<span class='notice'>Tank is empty!</span>"
return
return
@@ -175,15 +175,15 @@
C.add_fingerprint(user)
cell = C
C.loc = src
user.visible_message("\blue [user] opens the panel on [src] and inserts [C].", "\blue You open the panel on [src] and insert [C].")
user.visible_message("<span class='notice'>[user] opens the panel on [src] and inserts [C].<span class='notice'>", "<span class='notice'>You open the panel on [src] and insert [C].<span class='notice'>")
return
if(istype(I, /obj/item/weapon/screwdriver))
if(!cell)
user << "\red There is no power cell installed."
user << "<span class='warning'>There is no power cell installed.<span class='notice'>"
return
user.visible_message("\blue [user] opens the panel on [src] and removes [cell].", "\blue You open the panel on [src] and remove [cell].")
user.visible_message("<span class='notice'>[user] opens the panel on [src] and removes [cell].<span class='notice'>", "<span class='notice'>You open the panel on [src] and remove [cell].<span class='notice'>")
cell.add_fingerprint(user)
cell.loc = src.loc
cell = null
code/game/machinery/atmoalter/scrubber.dm
+5 -5
View File
@@ -165,7 +165,7 @@
name = "[name] (ID [id])"
/obj/machinery/portable_atmospherics/powered/scrubber/huge/attack_hand(var/mob/user as mob)
usr << "\blue You can't directly interact with this machine. Use the scrubber control console."
usr << "<span class='notice'>You can't directly interact with this machine. Use the scrubber control console.</span>"
/obj/machinery/portable_atmospherics/powered/scrubber/huge/update_icon()
src.overlays = 0
@@ -206,12 +206,12 @@
/obj/machinery/portable_atmospherics/powered/scrubber/huge/attackby(var/obj/item/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/wrench))
if(on)
user << "\blue Turn it off first!"
user << "<span class='warning'>Turn \the [src] off first!</span>"
return
anchored = !anchored
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You [anchored ? "wrench" : "unwrench"] \the [src]."
user << "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>"
return
@@ -233,7 +233,7 @@
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/wrench))
user << "\blue The bolts are too tight for you to unscrew!"
user << "<span class='warning'>The bolts are too tight for you to unscrew!</span>"
return
..()
..()
code/game/machinery/bees_items.dm
+2 -2
View File
@@ -21,9 +21,9 @@
if(B.feral < 0)
caught_bees += B.strength
qdel(B)
user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.")
user.visible_message("<span class='notice'>\The [user] nets some bees.</span>","<span class='notice'>You net up some of the becalmed bees.</span>")
else
user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.")
user.visible_message("<span class='warning'>\The [user] swings at some bees, they don't seem to like it.</span>","<span class='warning'>You swing at some bees, they don't seem to like it.</span>")
B.feral = 5
B.target_mob = user
code/game/machinery/bots/bots.dm
+2 -2
View File
@@ -60,7 +60,7 @@
if(health < maxhealth)
if(open)
health = min(maxhealth, health+10)
user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!")
user.visible_message("<span class='warning'>[user] repairs [src]!</span>","<span class='notice'>You repair [src]!</span>")
else
user << "<span class='notice'>Unable to repair with the maintenance panel closed.</span>"
else
@@ -143,7 +143,7 @@
if(user.species.can_shred(user))
src.health -= rand(15,30)*brute_dam_coeff
src.visible_message("\red <B>[user] has slashed [src]!</B>")
src.visible_message("<span class='danger'>[user] has slashed [src]!</span>")
playsound(src.loc, 'sound/weapons/slice.ogg', 25, 1, -1)
if(prob(10))
new /obj/effect/decal/cleanable/blood/oil(src.loc)
code/game/machinery/bots/mulebot.dm
+17 -17
View File
@@ -90,7 +90,7 @@
/obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user)
if(istype(I,/obj/item/weapon/card/emag))
locked = !locked
user << "\blue You [locked ? "lock" : "unlock"] the mulebot's controls!"
user << "<span class='notice'>You [locked ? "lock" : "unlock"] the mulebot's controls!</span>"
flick("mulebot-emagged", src)
playsound(src.loc, 'sound/effects/sparks1.ogg', 100, 0)
else if(istype(I,/obj/item/weapon/cell) && open && !cell)
@@ -101,16 +101,16 @@
updateDialog()
else if(istype(I,/obj/item/weapon/screwdriver))
if(locked)
user << "\blue The maintenance hatch cannot be opened or closed while the controls are locked."
user << "<span class='notice'>The maintenance hatch cannot be opened or closed while the controls are locked.</span>"
return
open = !open
if(open)
src.visible_message("[user] opens the maintenance hatch of [src]", "\blue You open [src]'s maintenance hatch.")
src.visible_message("[user] opens the maintenance hatch of [src]", "<span class='notice'>You open [src]'s maintenance hatch.")
on = 0
icon_state="mulebot-hatch"
else
src.visible_message("[user] closes the maintenance hatch of [src]", "\blue You close [src]'s maintenance hatch.")
src.visible_message("[user] closes the maintenance hatch of [src]", "<span class='notice'>You close [src]'s maintenance hatch.")
icon_state = "mulebot0"
updateDialog()
@@ -118,15 +118,15 @@
if (src.health < maxhealth)
src.health = min(maxhealth, src.health+25)
user.visible_message(
"\red [user] repairs [src]!",
"\blue You repair [src]!"
"<span class='notice'>\The [user] repairs \the [src]!</span>",
"<span class='notice'>You repair \the [src]!</span>"
)
else
user << "\blue [src] does not need a repair!"
user << "<span class='notice'>[src] does not need a repair!</span>"
else if(load && ismob(load)) // chance to knock off rider
if(prob(1+I.force * 2))
unload(0)
user.visible_message("\red [user] knocks [load] off [src] with \the [I]!", "\red You knock [load] off [src] with \the [I]!")
user.visible_message("<span class='warning'>[user] knocks [load] off [src] with \the [I]!</span>", "<span class='warning'>You knock [load] off [src] with \the [I]!</span>")
else
user << "You hit [src] with \the [I] but to no effect."
else
@@ -150,7 +150,7 @@
if(prob(50) && !isnull(load))
unload(0)
if(prob(25))
src.visible_message("\red Something shorts out inside [src]!")
src.visible_message("<span class='warning'>Something shorts out inside [src]!</span>")
var/index = 1<< (rand(0,9))
if(wires & index)
wires &= ~index
@@ -250,14 +250,14 @@
locked = !locked
updateDialog()
else
usr << "\red Access denied."
usr << "<span class='warning'>Access denied.</span>"
return
if("power")
if (src.on)
turn_off()
else if (cell && !open)
if (!turn_on())
usr << "\red You can't switch on [src]."
usr << "<span class='warning'>You can't switch on [src].</span>"
return
else
return
@@ -272,7 +272,7 @@
cell.add_fingerprint(usr)
cell = null
usr.visible_message("\blue [usr] removes the power cell from [src].", "\blue You remove the power cell from [src].")
usr.visible_message("<span class='notice'>[usr] removes the power cell from [src].</span>", "<span class='notice'>You remove the power cell from [src].</span>")
updateDialog()
if("cellinsert")
@@ -284,7 +284,7 @@
C.loc = src
C.add_fingerprint(usr)
usr.visible_message("\blue [usr] inserts a power cell into [src].", "\blue You insert the power cell into [src].")
usr.visible_message("<span class='notice'>[usr] inserts a power cell into [src].</span>", "<span class='notice'>You insert the power cell into [src].</span>")
updateDialog()
@@ -702,9 +702,9 @@
var/mob/M = obs
if(ismob(M))
if(istype(M,/mob/living/silicon/robot))
src.visible_message("\red [src] bumps into [M]!")
src.visible_message("<span class='warning'>[src] bumps into [M]!</span>")
else
src.visible_message("\red [src] knocks over [M]!")
src.visible_message("<span class='warning'>[src] knocks over [M]!</span>")
M.stop_pulling()
M.Stun(8)
M.Weaken(5)
@@ -718,7 +718,7 @@
// called from mob/living/carbon/human/Crossed()
// when mulebot is in the same loc
/obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H)
src.visible_message("\red [src] drives over [H]!")
src.visible_message("<span class='warning'>[src] drives over [H]!</span>")
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
var/damage = rand(5,15)
@@ -866,7 +866,7 @@
/obj/machinery/bot/mulebot/explode()
src.visible_message("\red <B>[src] blows apart!</B>", 1)
src.visible_message("<span class='danger'>[src] blows apart!</span>", 1)
var/turf/Tsec = get_turf(src)
new /obj/item/device/assembly/prox_sensor(Tsec)
code/game/machinery/camera/camera.dm
+3 -3
View File
@@ -180,13 +180,13 @@
else if (istype(W, /obj/item/weapon/camera_bug))
if (!src.can_use())
user << "\blue Camera non-functional"
user << "<span class='warning'>Camera non-functional.</span>"
return
if (src.bugged)
user << "\blue Camera bug removed."
user << "<span class='notice'>Camera bug removed.</span>"
src.bugged = 0
else
user << "\blue Camera bugged."
user << "<span class='notice'>Camera bugged.</span>"
src.bugged = 1
else if(W.damtype == BRUTE || W.damtype == BURN) //bashing cameras
code/game/machinery/camera/tracking.dm
+6 -6
View File
@@ -47,20 +47,20 @@
loc = sanitize(loc)
if(!loc)
src << "\red Must supply a location name"
src << "<span class='warning'>Must supply a location name</span>"
return
if(stored_locations.len >= max_locations)
src << "\red Cannot store additional locations. Remove one first"
src << "<span class='warning'>Cannot store additional locations. Remove one first</span>"
return
if(loc in stored_locations)
src << "\red There is already a stored location by this name"
src << "<span class='warning'>There is already a stored location by this name</span>"
return
var/L = src.eyeobj.getLoc()
if (InvalidPlayerTurf(get_turf(L)))
src << "\red Unable to store this location"
src << "<span class='warning'>Unable to store this location</span>"
return
stored_locations[loc] = L
@@ -75,7 +75,7 @@
set desc = "Returns to the selected camera location"
if (!(loc in stored_locations))
src << "\red Location [loc] not found"
src << "<span class='warning'>Location [loc] not found</span>"
return
var/L = stored_locations[loc]
@@ -87,7 +87,7 @@
set desc = "Deletes the selected camera location"
if (!(loc in stored_locations))
src << "\red Location [loc] not found"
src << "<span class='warning'>Location [loc] not found</span>"
return
stored_locations.Remove(loc)
code/game/machinery/cell_charger.dm
+3 -3
View File
@@ -42,14 +42,14 @@
if(istype(W, /obj/item/weapon/cell) && anchored)
if(charging)
user << "\red There is already a cell in the charger."
user << "<span class='warning'>There is already a cell in the charger.</span>"
return
else
var/area/a = loc.loc // Gets our locations location, like a dream within a dream
if(!isarea(a))
return
if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
user << "\red The [name] blinks red as you try to insert the cell!"
user << "<span class='warning'>The [name] blinks red as you try to insert the cell!</span>"
return
user.drop_item()
@@ -60,7 +60,7 @@
update_icon()
else if(istype(W, /obj/item/weapon/wrench))
if(charging)
user << "\red Remove the cell first!"
user << "<span class='warning'>Remove the cell first!</span>"
return
anchored = !anchored
code/game/machinery/computer/ai_core.dm
+22 -22
View File
@@ -17,7 +17,7 @@
if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20))
user << "\blue You wrench the frame into place."
user << "<span class='notice'>You wrench the frame into place.</span>"
anchored = 1
state = 1
if(istype(P, /obj/item/weapon/weldingtool))
@@ -28,31 +28,31 @@
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 20))
if(!src || !WT.remove_fuel(0, user)) return
user << "\blue You deconstruct the frame."
user << "<span class='notice'>You deconstruct the frame.</span>"
new /obj/item/stack/material/plasteel( loc, 4)
qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20))
user << "\blue You unfasten the frame."
user << "<span class='notice'>You unfasten the frame.</span>"
anchored = 0
state = 0
if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit)
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
user << "\blue You place the circuit board inside the frame."
user << "<span class='notice'>You place the circuit board inside the frame.</span>"
icon_state = "1"
circuit = P
user.drop_item()
P.loc = src
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You screw the circuit board into place."
user << "<span class='notice'>You screw the circuit board into place.</span>"
state = 2
icon_state = "2"
if(istype(P, /obj/item/weapon/crowbar) && circuit)
playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the circuit board."
user << "<span class='notice'>You remove the circuit board.</span>"
state = 1
icon_state = "0"
circuit.loc = loc
@@ -60,7 +60,7 @@
if(2)
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You unfasten the circuit board."
user << "<span class='notice'>You unfasten the circuit board.</span>"
state = 1
icon_state = "1"
if(istype(P, /obj/item/stack/cable_coil))
@@ -82,7 +82,7 @@
user << "Get that brain out of there first"
else
playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "\blue You remove the cables."
user << "<span class='notice'>You remove the cables.</span>"
state = 2
icon_state = "2"
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc )
@@ -126,14 +126,14 @@
if(istype(P, /obj/item/device/mmi))
var/obj/item/device/mmi/M = P
if(!M.brainmob)
user << "\red Sticking an empty [P] into the frame would sort of defeat the purpose."
user << "<span class='warning'>Sticking an empty [P] into the frame would sort of defeat the purpose.</span>"
return
if(M.brainmob.stat == 2)
user << "\red Sticking a dead [P] into the frame would sort of defeat the purpose."
user << "<span class='warning'>Sticking a dead [P] into the frame would sort of defeat the purpose.</span>"
return
if(jobban_isbanned(M.brainmob, "AI"))
user << "\red This [P] does not seem to fit."
user << "<span class='warning'>This [P] does not seem to fit.</span>"
return
if(M.brainmob.mind)
@@ -148,7 +148,7 @@
if(istype(P, /obj/item/weapon/crowbar) && brain)
playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the brain."
user << "<span class='notice'>You remove the brain.</span>"
brain.loc = loc
brain = null
icon_state = "3"
@@ -156,7 +156,7 @@
if(4)
if(istype(P, /obj/item/weapon/crowbar))
playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the glass panel."
user << "<span class='notice'>You remove the glass panel.</span>"
state = 3
if (brain)
icon_state = "3b"
@@ -167,7 +167,7 @@
if(istype(P, /obj/item/weapon/screwdriver))
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You connect the monitor."
user << "<span class='notice'>You connect the monitor.</span>"
if(!brain)
var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes"
var/obj/structure/AIcore/deactivated/D = new(loc)
@@ -202,7 +202,7 @@
transfer.aiRadio.disabledAi = 0
transfer.loc = get_turf(src)
transfer.cancel_camera()
user << "\blue <b>Transfer successful</b>: \black [transfer.name] ([rand(1000,9999)].exe) downloaded to host terminal. Local copy wiped."
user << "<span class='notice'>Transfer successful:</span> [transfer.name] ([rand(1000,9999)].exe) downloaded to host terminal. Local copy wiped."
transfer << "You have been uploaded to a stationary terminal. Remote device connection restored."
if(card)
@@ -224,23 +224,23 @@
if(transfer)
load_ai(transfer,card,user)
else
user << "\red <b>ERROR</b>: \black Unable to locate artificial intelligence."
user << "<span class='danger'>ERROR:</span> Unable to locate artificial intelligence."
return
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("<span class='notice'>\The [user] starts to unbolt \the [src] from the plating...</span>")
if(!do_after(user,40))
user.visible_message("\blue \The [user] decides not to unbolt \the [src].")
user.visible_message("<span class='notice'>\The [user] decides not to unbolt \the [src].</span>")
return
user.visible_message("\blue \The [user] finishes unfastening \the [src]!")
user.visible_message("<span class='notice'>\The [user] finishes unfastening \the [src]!</span>")
anchored = 0
return
else
user.visible_message("\blue \The [user] starts to bolt \the [src] to the plating...")
user.visible_message("<span class='notice'>\The [user] starts to bolt \the [src] to the plating...</span>")
if(!do_after(user,40))
user.visible_message("\blue \The [user] decides not to bolt \the [src].")
user.visible_message("<span class='notice'>\The [user] decides not to bolt \the [src].</span>")
return
user.visible_message("\blue \The [user] finishes fastening down \the [src]!")
user.visible_message("<span class='notice'>\The [user] finishes fastening down \the [src]!</span>")
anchored = 1
return
else
code/game/machinery/computer/aifixer.dm
+2 -2
View File
@@ -18,7 +18,7 @@
// Transfer over the AI.
transfer << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
user << "\blue <b>Transfer successful</b>: \black [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
user << "<span class='notice'>Transfer successful:</span> [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
transfer.loc = src
transfer.cancel_camera()
@@ -44,7 +44,7 @@
if(istype(comp_ai))
if(active)
user << "\red <b>ERROR</b>: \black Reconstruction in progress."
user << "<span class='danger'>ERROR:</span> Reconstruction in progress."
return
card.grab_ai(comp_ai, user)
if(!(locate(/mob/living/silicon/ai) in src)) occupant = null
code/game/machinery/computer/atmos_control.dm
+2 -2
View File
@@ -33,8 +33,8 @@
/obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/card/emag) && !emagged)
user.visible_message("\red \The [user] swipes \a [I] through \the [src], causing the screen to flash!",\
"\red You swipe your [I] through \the [src], the screen flashing as you gain full control.",\
user.visible_message("<span class='warning'>\The [user] swipes \a [I] through \the [src], causing the screen to flash!</span>",\
"<span class='warning'>You swipe your [I] through \the [src], the screen flashing as you gain full control.</span>",\
"You hear the swipe of a card through a reader, and an electronic warble.")
atmos_control.emagged = 1
return
code/game/machinery/computer/buildandrepair.dm
+11 -11
View File
@@ -16,7 +16,7 @@
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20))
user << "\blue You wrench the frame into place."
user << "<span class='notice'>You wrench the frame into place.</span>"
src.anchored = 1
src.state = 1
if(istype(P, /obj/item/weapon/weldingtool))
@@ -27,35 +27,35 @@
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 20))
if(!src || !WT.isOn()) return
user << "\blue You deconstruct the frame."
user << "<span class='notice'>You deconstruct the frame.</span>"
new /obj/item/stack/material/steel( src.loc, 5 )
qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20))
user << "\blue You unfasten the frame."
user << "<span class='notice'>You unfasten the frame.</span>"
src.anchored = 0
src.state = 0
if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
var/obj/item/weapon/circuitboard/B = P
if(B.board_type == "computer")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
user << "\blue You place the circuit board inside the frame."
user << "<span class='notice'>You place the circuit board inside the frame.</span>"
src.icon_state = "1"
src.circuit = P
user.drop_item()
P.loc = src
else
user << "\red This frame does not accept circuit boards of this type!"
user << "<span class='warning'>This frame does not accept circuit boards of this type!</span>"
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You screw the circuit board into place."
user << "<span class='notice'>You screw the circuit board into place.</span>"
src.state = 2
src.icon_state = "2"
if(istype(P, /obj/item/weapon/crowbar) && circuit)
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the circuit board."
user << "<span class='notice'>You remove the circuit board.</span>"
src.state = 1
src.icon_state = "0"
circuit.loc = src.loc
@@ -63,7 +63,7 @@
if(2)
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You unfasten the circuit board."
user << "<span class='notice'>You unfasten the circuit board.</span>"
src.state = 1
src.icon_state = "1"
if(istype(P, /obj/item/stack/cable_coil))
@@ -81,7 +81,7 @@
if(3)
if(istype(P, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "\blue You remove the cables."
user << "<span class='notice'>You remove the cables.</span>"
src.state = 2
src.icon_state = "2"
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
@@ -102,13 +102,13 @@
if(4)
if(istype(P, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the glass panel."
user << "<span class='notice'>You remove the glass panel.</span>"
src.state = 3
src.icon_state = "3"
new /obj/item/stack/material/glass( src.loc, 2 )
if(istype(P, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You connect the monitor."
user << "<span class='notice'>You connect the monitor.</span>"
var/B = new src.circuit.build_path ( src.loc )
src.circuit.construct(B)
qdel(src)
code/game/machinery/computer/camera.dm
+1 -1
View File
@@ -94,7 +94,7 @@
attack_hand(var/mob/user as mob)
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
user << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
if(stat & (NOPOWER|BROKEN)) return
code/game/machinery/computer/camera_circuit.dm
+6 -6
View File
@@ -45,13 +45,13 @@
else
return
authorised = 1
user << "\blue You authorised the circuit network!"
user << "<span class='notice'>You authorised the circuit network!</span>"
updateDialog()
else
user << "\blue You must select a camera network circuit!"
user << "<span class='warning'>You must select a camera network circuit!</span>"
else if(istype(I,/obj/item/weapon/screwdriver))
secured = !secured
user.visible_message("\blue The [src] can [secured ? "no longer" : "now"] be modified.")
user.visible_message("<span class='notice'>The [src] can [secured ? "no longer" : "now"] be modified.</span>")
updateBuildPath()
return
@@ -114,14 +114,14 @@
else
return
authorised = 1
usr << "\blue You authorised the circuit network!"
usr << "<span class='notice'>You authorised the circuit network!</span>"
updateDialog()
else
usr << "\blue You must select a camera network circuit!"
usr << "<span class='warning'>You must select a camera network circuit!</span>"
else if( href_list["removeauth"] )
authorised = 0
updateDialog()
updateDialog()
if(istype(src.loc,/mob))
attack_self(src.loc)
attack_self(src.loc)
code/game/machinery/computer/card.dm
+1 -1
View File
@@ -208,7 +208,7 @@
jobdatum = J
break
if(!jobdatum)
usr << "\red No log exists for this job: [t1]"
usr << "<span class='warning'>No log exists for this job: [t1]</span>"
return
access = jobdatum.get_access()
code/game/machinery/computer/computer.dm
+2 -2
View File
@@ -124,12 +124,12 @@
for (var/obj/C in src)
C.loc = src.loc
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
user << "<span class='notice'>The broken glass falls out.</span>"
new /obj/item/weapon/material/shard( src.loc )
A.state = 3
A.icon_state = "3"
else
user << "\blue You disconnect the monitor."
user << "<span class='notice'>You disconnect the monitor.</span>"
A.state = 4
A.icon_state = "4"
M.deconstruct(src)
code/game/machinery/computer/guestpass.dm
+1 -1
View File
@@ -185,6 +185,6 @@
pass.reason = reason
pass.name = "guest pass #[number]"
else
usr << "\red Cannot issue pass without issuing ID."
usr << "<span class='warning'>Cannot issue pass without issuing ID.</span>"
updateUsrDialog()
return
code/game/machinery/computer/law.dm
+3 -3
View File
@@ -18,15 +18,15 @@
opened = !opened
if(opened)
usr << "\blue The access panel is now open."
usr << "<span class='notice'>The access panel is now open.</span>"
else
usr << "\blue The access panel is now closed."
usr << "<span class='notice'>The access panel is now closed.</span>"
return
attackby(obj/item/weapon/O as obj, mob/user as mob)
if (user.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
user << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
if(istype(O, /obj/item/weapon/aiModule))
var/obj/item/weapon/aiModule/M = O
code/game/machinery/computer/lockdown.dm
+1 -1
View File
@@ -103,7 +103,7 @@
t += "<td><a href='?src=\ref[src];show_net=[curNetId]'>\[+\]</a> <b>" + curNetId + "<b></td>"
t += "</table>"
if(empty)
t += "\red No networks connected.<br>"
t += "<span class='warning'>No networks connected.</span><br>"
t += "<A href='?src=\ref[src];refresh=1'>Refresh</A><BR>"
t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
user << browse(t, "window=lockdown;size=550x600")
code/game/machinery/computer/pod.dm
+3 -3
View File
@@ -56,7 +56,7 @@
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
if(stat & BROKEN)
user << "\blue The broken glass falls out."
user << "<span class='notice'>The broken glass falls out.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc )
new /obj/item/weapon/material/shard( loc )
@@ -80,7 +80,7 @@
A.anchored = 1
qdel(src)
else
user << "\blue You disconnect the monitor."
user << "<span class='notice'>You disconnect the monitor.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc )
//generate appropriate circuitboard. Accounts for /pod/old computer types
@@ -208,7 +208,7 @@
/obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob)
if(!allowed(user))
user << "\red Access Denied"
user << "<span class='warning'>Access Denied</span>"
return
else
..()
code/game/machinery/computer/prisoner.dm
+1 -1
View File
@@ -96,7 +96,7 @@
var/obj/item/weapon/implant/I = locate(href_list["warn"])
if((I)&&(I.imp_in))
var/mob/living/carbon/R = I.imp_in
R << "\green You hear a voice in your head saying: '[warning]'"
R << "<span class='notice'>You hear a voice in your head saying: '[warning]'</span>"
src.add_fingerprint(usr)
src.updateUsrDialog()
code/game/machinery/computer/prisonshuttle.dm
+11 -11
View File
@@ -37,29 +37,29 @@ var/prison_shuttle_timeleft = 0
A.anchored = 1
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
user << "<span class='notice'>The broken glass falls out.</span>"
new /obj/item/weapon/material/shard( src.loc )
A.state = 3
A.icon_state = "3"
else
user << "\blue You disconnect the monitor."
user << "<span class='notice'>You disconnect the monitor.</span>"
A.state = 4
A.icon_state = "4"
qdel(src)
else if(istype(I,/obj/item/weapon/card/emag) && (!hacked))
hacked = 1
user << "\blue You disable the lock."
user << "<span class='notice'>You disable the lock.</span>"
else
return src.attack_hand(user)
attack_hand(var/mob/user as mob)
if(!src.allowed(user) && (!hacked))
user << "\red Access Denied."
user << "<span class='warning'>Access Denied.</span>"
return
if(prison_break)
user << "\red Unable to locate shuttle."
user << "<span class='warning'>Unable to locate shuttle.</span>"
return
if(..())
return
@@ -88,11 +88,11 @@ var/prison_shuttle_timeleft = 0
if (href_list["sendtodock"])
if (!prison_can_move())
usr << "\red The prison shuttle is unable to leave."
usr << "<span class='warning'>The prison shuttle is unable to leave.</span>"
return
if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
post_signal("prison")
usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds."
usr << "<span class='notice'>The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.</span>"
src.temp += "Shuttle sent.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
src.updateUsrDialog()
prison_shuttle_moving_to_prison = 1
@@ -102,11 +102,11 @@ var/prison_shuttle_timeleft = 0
else if (href_list["sendtostation"])
if (!prison_can_move())
usr << "\red The prison shuttle is unable to leave."
usr << "<span class='warning'>The prison shuttle is unable to leave.</span>"
return
if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
post_signal("prison")
usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds."
usr << "<span class='notice'>The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.</span>"
src.temp += "Shuttle sent.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
src.updateUsrDialog()
prison_shuttle_moving_to_station = 1
@@ -174,7 +174,7 @@ var/prison_shuttle_timeleft = 0
if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
if (!prison_can_move())
usr << "\red The prison shuttle is unable to leave."
usr << "<span class='warning'>The prison shuttle is unable to leave.</span>"
return
var/area/start_location = locate(/area/shuttle/prison/prison)
@@ -203,7 +203,7 @@ var/prison_shuttle_timeleft = 0
if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return
if (!prison_can_move())
usr << "\red The prison shuttle is unable to leave."
usr << "<span class='warning'>The prison shuttle is unable to leave.</span>"
return
var/area/start_location = locate(/area/shuttle/prison/station)
code/game/machinery/computer/robot.dm
+5 -5
View File
@@ -61,8 +61,8 @@
target << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered."
target.ResetSecurityCodes()
else
message_admins("\blue [key_name_admin(usr)] detonated [target.name]!")
log_game("\blue [key_name_admin(usr)] detonated [target.name]!")
message_admins("<span class='notice'>[key_name_admin(usr)] detonated [target.name]!</span>")
log_game("[key_name(usr)] detonated [target.name]!")
target << "<span class='danger'>Self-destruct command received.</span>"
spawn(10)
target.self_destruct()
@@ -90,7 +90,7 @@
if(!target || !istype(target))
return
message_admins("\blue [key_name_admin(usr)] [target.canmove ? "locked down" : "released"] [target.name]!")
message_admins("<span class='notice'>[key_name_admin(usr)] [target.canmove ? "locked down" : "released"] [target.name]!</span>")
log_game("[key_name(usr)] [target.canmove ? "locked down" : "released"] [target.name]!")
target.canmove = !target.canmove
if (target.lockcharge)
@@ -122,7 +122,7 @@
if(!target || !istype(target))
return
message_admins("\blue [key_name_admin(usr)] emagged [target.name] using robotic console!")
message_admins("<span class='notice'>[key_name_admin(usr)] emagged [target.name] using robotic console!</span>")
log_game("[key_name(usr)] emagged [target.name] using robotic console!")
target.emagged = 1
target << "<span class='notice'>Failsafe protocols overriden. New tools available.</span>"
@@ -145,7 +145,7 @@
user << "Self-destruct aborted - safety active"
return
message_admins("\blue [key_name_admin(usr)] detonated all cyborgs!")
message_admins("<span class='notice'>[key_name_admin(usr)] detonated all cyborgs!</span>")
log_game("[key_name(usr)] detonated all cyborgs!")
for(var/mob/living/silicon/robot/R in mob_list)
code/game/machinery/computer/security.dm
+1 -1
View File
@@ -56,7 +56,7 @@
if(..())
return
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
user << "<span class='warning'>Unable to establish a connection:</span> You're too far away from the station!"
return
var/dat
code/game/machinery/computer/shuttle.dm
+5 -5
View File
@@ -37,11 +37,11 @@
if (src.auth_need - src.authorized.len > 0)
message_admins("[key_name_admin(user)] has authorized early shuttle launch")
log_game("[user.ckey] has authorized early shuttle launch")
world << text("\blue <B>Alert: [] authorizations needed until shuttle is launched early</B>", src.auth_need - src.authorized.len)
world << text("<span class='notice'><b>Alert: [] authorizations needed until shuttle is launched early</b></span>", src.auth_need - src.authorized.len)
else
message_admins("[key_name_admin(user)] has launched the shuttle")
log_game("[user.ckey] has launched the shuttle early")
world << "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>"
world << "<span class='notice'><b>Alert: Shuttle launch time shortened to 10 seconds!</b></span>"
emergency_shuttle.set_launch_countdown(10)
//src.authorized = null
qdel(src.authorized)
@@ -49,10 +49,10 @@
if("Repeal")
src.authorized -= W:registered_name
world << text("\blue <B>Alert: [] authorizations needed until shuttle is launched early</B>", src.auth_need - src.authorized.len)
world << text("<span class='notice'><b>Alert: [] authorizations needed until shuttle is launched early</b></span>", src.auth_need - src.authorized.len)
if("Abort")
world << "\blue <B>All authorizations to shortening time for shuttle launch have been revoked!</B>"
world << "<span class='notice'><b>All authorizations to shortening time for shuttle launch have been revoked!</b></span>"
src.authorized.len = 0
src.authorized = list( )
@@ -62,7 +62,7 @@
if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W)
switch(choice)
if("Launch")
world << "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>"
world << "<span class='notice'><b>Alert: Shuttle launch time shortened to 10 seconds!</b></span>"
emergency_shuttle.set_launch_countdown(10)
emagged = 1
if("Cancel")
code/game/machinery/computer/skills.dm
+1 -1
View File
@@ -39,7 +39,7 @@
if(..())
return
if (src.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
user << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
var/dat
code/game/machinery/computer/specops_shuttle.dm
+11 -11
View File
@@ -88,7 +88,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
M << "\red You have arrived at Central Command. Operation has ended!"
M << "<span class='notice'>You have arrived at Central Command. Operation has ended!</span>"
specops_shuttle_at_station = 0
@@ -136,7 +136,7 @@ var/specops_shuttle_timeleft = 0
if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
if (!specops_can_move())
usr << "\red The Special Operations shuttle is unable to leave."
usr << "<span class='warning'>The Special Operations shuttle is unable to leave.</span>"
return
//Begin Marauder launchpad.
@@ -231,7 +231,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
M << "\red You have arrived to [station_name]. Commence operation!"
M << "<span class='notice'>You have arrived to [station_name]. Commence operation!</span>"
for(var/obj/machinery/computer/specops_shuttle/S in world)
S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY
@@ -251,13 +251,13 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob)
if(istype(I,/obj/item/weapon/card/emag))
user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals."
user << "<span class='notice'>The electronic systems in this console are far too advanced for your primitive hacking peripherals.</span>"
else
return attack_hand(user)
/obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob)
if(!allowed(user))
user << "\red Access Denied."
user << "<span class='warning'>Access Denied.</span>"
return
if(..())
@@ -288,14 +288,14 @@ var/specops_shuttle_timeleft = 0
if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
if (!specops_can_move())
usr << "\blue Central Command will not allow the Special Operations shuttle to return yet."
usr << "<span class='notice'>Central Command will not allow the Special Operations shuttle to return yet.</span>"
if(world.timeofday <= specops_shuttle_timereset)
if (((world.timeofday - specops_shuttle_timereset)/10) > 60)
usr << "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!"
usr << "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!"
usr << "<span class='notice'>[-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!"
usr << "<span class='notice'>[-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!"
return
usr << "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds."
usr << "<span class='notice'>The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds.</span>"
temp += "Shuttle departing.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
updateUsrDialog()
@@ -309,10 +309,10 @@ var/specops_shuttle_timeleft = 0
if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
if (!specops_can_move())
usr << "\red The Special Operations shuttle is unable to leave."
usr << "<span class='warning'>The Special Operations shuttle is unable to leave.</span>"
return
usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds."
usr << "<span class='notice'>The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.</span>"
temp += "Shuttle departing.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
updateUsrDialog()
code/game/machinery/computer/supply.dm
+2 -2
View File
@@ -150,7 +150,7 @@
/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
if(!allowed(user))
user << "\red Access Denied."
user << "<span class='warning'>Access Denied.</span>"
return
if(..())
@@ -209,7 +209,7 @@
/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob)
if(istype(I,/obj/item/weapon/card/emag) && !hacked)
user << "\blue Special supplies unlocked."
user << "<span class='notice'>Special supplies unlocked.</span>"
hacked = 1
return
else
code/game/machinery/computer/syndicate_specops_shuttle.dm
+8 -8
View File
@@ -59,7 +59,7 @@ var/syndicate_elite_shuttle_timeleft = 0
if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
if (!syndicate_elite_can_move())
usr << "\red The Syndicate Elite shuttle is unable to leave."
usr << "<span class='warning'>The Syndicate Elite shuttle is unable to leave.</span>"
return
sleep(600)
@@ -173,7 +173,7 @@ var/syndicate_elite_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
M << "\red You have arrived to [station_name]. Commence operation!"
M << "<span class='warning'>You have arrived to [station_name]. Commence operation!</span>"
/proc/syndicate_elite_can_move()
if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0
@@ -187,17 +187,17 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob)
if(istype(I,/obj/item/weapon/card/emag))
user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals."
user << "<span class='notice'>The electronic systems in this console are far too advanced for your primitive hacking peripherals.</span>"
else
return attack_hand(user)
/obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob)
if(!allowed(user))
user << "\red Access Denied."
user << "<span class='warning'>Access Denied.</span>"
return
// if (sent_syndicate_strike_team == 0)
// usr << "\red The strike team has not yet deployed."
// usr << "<span class='warning'>The strike team has not yet deployed.</span>"
// return
if(..())
@@ -227,17 +227,17 @@ var/syndicate_elite_shuttle_timeleft = 0
if (href_list["sendtodock"])
if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return."
usr << "<span class='notice'>The Syndicate will not allow the Elite Squad shuttle to return.</span>"
return
else if (href_list["sendtostation"])
if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
if (!specops_can_move())
usr << "\red The Syndicate Elite shuttle is unable to leave."
usr << "<span class='warning'>The Syndicate Elite shuttle is unable to leave.</span>"
return
usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds."
usr << "<span class='notice'>The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.</span>"
temp = "Shuttle departing.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"
updateUsrDialog()
code/game/machinery/computer3/bios.dm
+7 -7
View File
@@ -24,22 +24,22 @@
if(istype(user,/mob/living/silicon))
if(!program.ai_allowed)
user << "\blue You are forbidden from accessing this program."
user << "<span class='warning'>You are forbidden from accessing this program.</span>"
return 0
else
if(program.human_controls)
if(!ishuman(user))
user << "\red Your body can't work the controls!"
user << "<span class='warning'>Your body can't work the controls!</span>"
return 0
if(user.restrained())
user << "\red You need a free hand!"
user << "<span class='warning'>You need a free hand!</span>"
return 0
if(!in_range(src,user))
// telekinesis check
if(ishuman(user) && istype(user.get_active_hand(),/obj/item/tk_grab))
if(program.human_controls)
user << "\red It's too complicated to work at a distance!"
user << "<span class='warning'>It's too complicated to work at a distance!</span>"
return 0
add_fingerprint(user)
user.set_machine(src)
@@ -115,7 +115,7 @@
switch(errorcode)
if(PROG_CRASH)
if(usr)
usr << "\red The program crashed!"
usr << "<span class='warning'>The program crashed!</span>"
usr << browse(null,"\ref[src]")
Reset()
@@ -143,12 +143,12 @@
if(NETWORK_FAILURE)
Reset()
if(usr)
usr << browse("<h2>ERROR: Networking exception: Unable to connect to remote host.</b>","window=\ref[src]")
usr << browse("<h2>ERROR: Networking exception: Unable to connect to remote host.</h2>","window=\ref[src]")
else
if(usr)
usr << "\red The program crashed!"
usr << "<span class='warning'>The program crashed!</span>"
usr << browse(null,"\ref[src]")
testing("computer/Crash() - unknown error code [errorcode]")
Reset()
code/game/machinery/computer3/buildandrepair.dm
+19 -19
View File
@@ -81,7 +81,7 @@
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20))
user << "\blue You wrench the frame into place."
user << "<span class='notice'>You wrench the frame into place.</span>"
src.anchored = 1
src.state = 1
if(istype(P, /obj/item/weapon/weldingtool))
@@ -92,35 +92,35 @@
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 20))
if(!src || !WT.isOn()) return
user << "\blue You deconstruct the frame."
user << "<span class='notice'>You deconstruct the frame.</span>"
new /obj/item/stack/material/steel( src.loc, 5 )
qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 20))
user << "\blue You unfasten the frame."
user << "<span class='notice'>You unfasten the frame.</span>"
src.anchored = 0
src.state = 0
if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
var/obj/item/weapon/circuitboard/B = P
if(B.board_type == "computer")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
user << "\blue You place the circuit board inside the frame."
user << "<span class='notice'>You place the circuit board inside the frame.</span>"
src.icon_state = "1"
src.circuit = P
user.drop_item()
P.loc = src
else
user << "\red This frame does not accept circuit boards of this type!"
user << "<span class='warning'>This frame does not accept circuit boards of this type!</span>"
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You screw the circuit board into place."
user << "<span class='notice'>You screw the circuit board into place.</span>"
src.state = 2
src.icon_state = "2"
if(istype(P, /obj/item/weapon/crowbar) && circuit)
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the circuit board."
user << "<span class='notice'>You remove the circuit board.</span>"
src.state = 1
src.icon_state = "0"
circuit.loc = src.loc
@@ -128,7 +128,7 @@
if(2)
if(istype(P, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You unfasten the circuit board."
user << "<span class='notice'>You unfasten the circuit board.</span>"
src.state = 1
src.icon_state = "1"
@@ -137,10 +137,10 @@
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
if(do_after(10))
battery.loc = loc
user << "\blue You remove [battery]."
user << "<span class='notice'>You remove [battery].</span>"
battery = null
else
user << "\red There's no battery to remove!"
user << "<span class='warning'>There's no battery to remove!</span>"
if(istype(P, /obj/item/weapon/cell))
if(!battery)
@@ -148,9 +148,9 @@
if(do_after(5))
battery = P
P.loc = src
user << "\blue You insert [battery]."
user << "<span class='notice'>You insert [battery].</span>"
else
user << "\red There's already \an [battery] in [src]!"
user << "<span class='warning'>There's already \an [battery] in [src]!</span>"
if(istype(P, /obj/item/stack/cable_coil))
@@ -160,7 +160,7 @@
if(P)
P:amount -= 5
if(!P:amount) qdel(P)
user << "\blue You add cables to the frame."
user << "<span class='notice'>You add cables to the frame.</span>"
src.state = 3
src.icon_state = "3"
if(3)
@@ -169,7 +169,7 @@
user << "There are parts in the way!"
return
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "\blue You remove the cables."
user << "<span class='notice'>You remove the cables.</span>"
src.state = 2
src.icon_state = "2"
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
@@ -184,19 +184,19 @@
if(do_after(user, 20))
if(P)
P:use(2)
user << "\blue You put in the glass panel."
user << "<span class='notice'>You put in the glass panel.</span>"
src.state = 4
src.icon_state = "4"
if(4)
if(istype(P, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
user << "\blue You remove the glass panel."
user << "<span class='notice'>You remove the glass panel.</span>"
src.state = 3
src.icon_state = "3"
new /obj/item/stack/material/glass( src.loc, 2 )
if(istype(P, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
user << "\blue You connect the monitor."
user << "<span class='notice'>You connect the monitor.</span>"
var/obj/machinery/computer3/B = new src.circuit.build_path ( src.loc, built=1 )
/*if(circuit.powernet) B:powernet = circuit.powernet
if(circuit.id) B:id = circuit.id
@@ -219,7 +219,7 @@
*/
/obj/structure/computer3frame/proc/remove_peripheral(var/obj/item/I = null)
if(!components || !components.len)
usr << "\red There are no components in [src] to take out!"
usr << "<span class='warning'>There are no components in [src] to take out!</span>"
return 0
if(!I)
I = input(usr, "Remove which component?","Remove component", null) as null|obj in components
@@ -258,7 +258,7 @@
else
warning("Erronous component in computerframe/remove_peripheral: [I]")
I.loc = loc
usr << "\blue You remove [I]"
usr << "<span class='notice'>You remove [I]</span>"
return 1
return 0
/obj/structure/computer3frame/proc/insert_peripheral(var/obj/item/I)
code/game/machinery/computer3/component.dm
+2 -2
View File
@@ -60,7 +60,7 @@
if(istype(comp_ai))
if(busy)
user << "\red <b>ERROR</b>: \black Reconstruction in progress."
user << "<span class='danger'>ERROR:</span> Reconstruction in progress."
return
card.grab_ai(comp_ai, user)
if(!(locate(/mob/living/silicon/ai) in src)) occupant = null
@@ -82,7 +82,7 @@
// Transfer over the AI.
transfer << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here."
user << "\blue <b>Transfer successful</b>: \black [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
user << "<span class='notice'>Transfer successful:</span> [transfer.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
transfer.loc = src
transfer.cancel_camera()
code/game/machinery/computer3/computer.dm
+1 -1
View File
@@ -77,7 +77,7 @@
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
usr << "\red You can't do that."
usr << "<span class='warning'>You can't do that.</span>"
return
if(!Adjacent(usr))
code/game/machinery/computer3/computers/HolodeckControl.dm
+1 -1
View File
@@ -202,7 +202,7 @@
if(world.time < (last_change + 15))//To prevent super-spam clicking, reduced process size and annoyance -Sieve
return
for(var/mob/M in range(3,src))
M.show_message("\b ERROR. Recalibrating projetion apparatus.")
M.show_message("<span class='warning'>ERROR. Recalibrating projetion apparatus.</span>")
last_change = world.time
return
code/game/machinery/computer3/computers/atmos_alert.dm
+2 -2
View File
@@ -86,14 +86,14 @@
var/removing_zone = href_list["priority_clear"]
for(var/zone in priority_air_alarms)
if(ckey(zone) == removing_zone)
usr << "\green Priority Alert for area [zone] cleared."
usr << "<span class='notice'>Priority Alert for area [zone] cleared.</span>"
priority_air_alarms -= zone
if("minor_clear" in href_list)
var/removing_zone = href_list["minor_clear"]
for(var/zone in minor_air_alarms)
if(ckey(zone) == removing_zone)
usr << "\green Minor Alert for area [zone] cleared."
usr << "<span class='notice'>Minor Alert for area [zone] cleared.</span>"
minor_air_alarms -= zone
computer.updateUsrDialog()
code/game/machinery/computer3/computers/communications.dm
+1 -1
View File
@@ -60,7 +60,7 @@
if(!interactable() || !computer.radio || ..(href,href_list) )
return
if (computer.z > 1)
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
usr << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
if("main" in href_list)
code/game/machinery/computer3/computers/law.dm
+3 -3
View File
@@ -18,15 +18,15 @@
opened = !opened
if(opened)
usr << "\blue The access panel is now open."
usr << "<span class='notice'>The access panel is now open.</span>"
else
usr << "\blue The access panel is now closed."
usr << "<span class='notice'>The access panel is now closed.</span>"
return
attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob)
if (user.z > 6)
user << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
user << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
if(istype(module, /obj/item/weapon/aiModule))
module.install(src)
code/game/machinery/computer3/computers/medical.dm
+2 -2
View File
@@ -50,7 +50,7 @@
if(!interactable())
return
if (computer.z > 6)
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
usr << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
var/dat
@@ -528,4 +528,4 @@
src.printing = null
interact()
return
return
code/game/machinery/computer3/computers/prisoner.dm
+1 -1
View File
@@ -96,7 +96,7 @@
if( istype(I) && I.imp_in)
var/mob/living/carbon/R = I.imp_in
log_say("PrisonComputer3 message: [key_name(usr)]->[key_name(R)] : [warning]")
R << "\green You hear a voice in your head saying: '[warning]'"
R << "<span class='notice'>You hear a voice in your head saying: '[warning]'</span>"
interact()
return
code/game/machinery/computer3/computers/robot.dm
+6 -6
View File
@@ -118,14 +118,14 @@
if (istype(I))
if(src.check_access(I))
if (!status)
message_admins("\blue [key_name_admin(usr)] has initiated the global cyborg killswitch!")
log_game("\blue [key_name(usr)] has initiated the global cyborg killswitch!")
message_admins("<span class='notice'>[key_name_admin(usr)] has initiated the global cyborg killswitch!</span>")
log_game("[key_name(usr)] has initiated the global cyborg killswitch!")
src.status = 1
src.start_sequence()
src.temp = null
else
usr << "\red Access Denied."
usr << "<span class='warning'>Access Denied.</span>"
if ("stop" in href_list)
src.temp = {"
@@ -169,7 +169,7 @@
R.connected_ai << "<br><br><span class='alert'>ALERT - Cyborg kill-switch activated: [R.name]</span><br>"
R.self_destruct()
else
usr << "\red Access Denied."
usr << "<span class='warning'>Access Denied.</span>"
if ("stopbot" in href_list)
if(computer.allowed(usr))
@@ -189,7 +189,7 @@
R << "You have been locked down!"
else
usr << "\red Access Denied."
usr << "<span class='warning'>Access Denied.</span>"
if ("magbot" in href_list)
if(computer.allowed(usr))
@@ -198,7 +198,7 @@
var/choice = input("Are you certain you wish to hack [R.name]?") in list("Confirm", "Abort")
if(choice == "Confirm")
if(R && istype(R))
// message_admins("\blue [key_name_admin(usr)] emagged [R.name] using robotic console!")
// message_admins("<span class='notice'>[key_name_admin(usr)] emagged [R.name] using robotic console!</span>") // why is this commented out?
log_game("[key_name(usr)] emagged [R.name] using robotic console!")
R.emagged = 1
if(R.mind.special_role)
code/game/machinery/computer3/computers/security.dm
+1 -1
View File
@@ -58,7 +58,7 @@
return
if (computer.z > 6)
usr << "\red <b>Unable to establish a connection</b>: \black You're too far away from the station!"
usr << "<span class='danger'>Unable to establish a connection:</span> You're too far away from the station!"
return
var/dat
code/game/machinery/computer3/laptop.dm
+4 -4
View File
@@ -35,7 +35,7 @@
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
usr << "\red You can't do that."
usr << "<span class='warning'>You can't do that.</span>"
return
if(!Adjacent(usr))
@@ -67,7 +67,7 @@
stored_computer.manipulating = 0
qdel(src)
else
usr << "\red You are already opening the computer!"
usr << "<span class='warning'>You are already opening the computer!</span>"
AltClick()
@@ -131,11 +131,11 @@
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
usr << "\red You can't do that."
usr << "<span class='warning'>You can't do that.</span>"
return
if(!Adjacent(usr))
usr << "You can't reach it."
usr << "You can't reach it.</span>"
return
close_laptop(usr)
code/game/machinery/constructable_frame.dm
+7 -7
View File
@@ -44,7 +44,7 @@
else
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user << "\blue You dismantle the frame"
user << "<span class='notice'>You dismantle the frame</span>"
new /obj/item/stack/material/steel(src.loc, 5)
qdel(src)
if(2)
@@ -52,7 +52,7 @@
var/obj/item/weapon/circuitboard/B = P
if(B.board_type == "machine")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
user << "\blue You add the circuit board to the frame."
user << "<span class='notice'>You add the circuit board to the frame.</span>"
circuit = P
user.drop_item()
P.loc = src
@@ -70,11 +70,11 @@
update_desc()
user << desc
else
user << "\red This frame does not accept circuit boards of this type!"
user << "<span class='warning'>This frame does not accept circuit boards of this type!</span>"
else
if(istype(P, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "\blue You remove the cables."
user << "<span class='notice'>You remove the cables.</span>"
state = 1
icon_state = "box_0"
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
@@ -87,9 +87,9 @@
circuit.loc = src.loc
circuit = null
if(components.len == 0)
user << "\blue You remove the circuit board."
user << "<span class='notice'>You remove the circuit board.</span>"
else
user << "\blue You remove the circuit board and other components."
user << "<span class='notice'>You remove the circuit board and other components.</span>"
for(var/obj/item/weapon/W in components)
W.loc = src.loc
desc = initial(desc)
@@ -145,4 +145,4 @@
break
user << desc
if(P && P.loc != src && !istype(P, /obj/item/stack/cable_coil))
user << "\red You cannot add that component to the machine!"
user << "<span class='warning'>You cannot add that component to the machine!</span>"
code/game/machinery/cryo.dm
+8 -8
View File
@@ -176,7 +176,7 @@
/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
if(istype(G, /obj/item/weapon/reagent_containers/glass))
if(beaker)
user << "\red A beaker is already loaded into the machine."
user << "<span class='warning'>A beaker is already loaded into the machine.</span>"
return
beaker = G
@@ -273,19 +273,19 @@
return
/obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob)
if (stat & (NOPOWER|BROKEN))
usr << "\red The cryo cell is not functioning."
usr << "<span class='warning'>The cryo cell is not functioning.</span>"
return
if (!istype(M))
usr << "\red <B>The cryo cell cannot handle such a lifeform!</B>"
usr << "<span class='danger'>The cryo cell cannot handle such a lifeform!</span>"
return
if (occupant)
usr << "\red <B>The cryo cell is already occupied!</B>"
usr << "<span class='danger'>The cryo cell is already occupied!</span>"
return
if (M.abiotic())
usr << "\red Subject may not have abiotic items on."
usr << "<span class='warning'>Subject may not have abiotic items on.</span>"
return
if(!node)
usr << "\red The cell is not correctly connected to its pipe network!"
usr << "<span class='warning'>The cell is not correctly connected to its pipe network!</span>"
return
if (M.client)
M.client.perspective = EYE_PERSPECTIVE
@@ -294,7 +294,7 @@
M.loc = src
M.ExtinguishMob()
if(M.health > -100 && (M.health < 0 || M.sleeping))
M << "\blue <b>You feel a cold liquid surround you. Your skin starts to freeze up.</b>"
M << "<span class='notice'><b>You feel a cold liquid surround you. Your skin starts to freeze up.</b></span>"
occupant = M
current_heat_capacity = HEAT_CAPACITY_HUMAN
update_use_power(2)
@@ -310,7 +310,7 @@
if(usr == occupant)//If the user is inside the tube...
if (usr.stat == 2)//and he's not dead....
return
usr << "\blue Release sequence activated. This will take two minutes."
usr << "<span class='notice'>Release sequence activated. This will take two minutes.</span>"
sleep(1200)
if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already
return
code/game/machinery/deployable.dm
+7 -7
View File
@@ -188,7 +188,7 @@ for reference:
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, src)
s.start()
visible_message("\red BZZzZZzZZzZT")
visible_message("<span class='warning'>BZZzZZzZZzZT</span>")
return
return
else if (istype(W, /obj/item/weapon/card/emag))
@@ -200,7 +200,7 @@ for reference:
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, src)
s.start()
visible_message("\red BZZzZZzZZzZT")
visible_message("<span class='warning'>BZZzZZzZZzZT</span>")
return
else if (src.emagged == 1)
src.emagged = 2
@@ -208,19 +208,19 @@ for reference:
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, src)
s.start()
visible_message("\red BZZzZZzZZzZT")
visible_message("<span class='warning'>BZZzZZzZZzZT</span>")
return
else if (istype(W, /obj/item/weapon/wrench))
if (src.health < src.maxhealth)
src.health = src.maxhealth
src.emagged = 0
src.req_access = list(access_security)
visible_message("\red [user] repairs \the [src]!")
visible_message("<span class='warning'>[user] repairs \the [src]!</span>")
return
else if (src.emagged > 0)
src.emagged = 0
src.req_access = list(access_security)
visible_message("\red [user] repairs \the [src]!")
visible_message("<span class='warning'>[user] repairs \the [src]!</span>")
return
return
else
@@ -272,7 +272,7 @@ for reference:
proc/explode()
visible_message("\red <B>[src] blows apart!</B>")
visible_message("<span class='danger'>[src] blows apart!</span>")
var/turf/Tsec = get_turf(src)
/* var/obj/item/stack/rods/ =*/
@@ -284,4 +284,4 @@ for reference:
explosion(src.loc,-1,-1,0)
if(src)
qdel(src)
qdel(src)
code/game/machinery/doors/airlock.dm
+10 -10
View File
@@ -311,7 +311,7 @@
About the new airlock wires panel:
* An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.
* one wire from the ID scanner. Sending a pulse through this flashes the red light on the door (if the door has power). If you cut this wire, the door will stop recognizing valid IDs. (If the door has 0000 access, it still opens and closes, though)
* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be \red open, but bolts-raising will not work. Cutting these wires may electrocute the user.
* two wires for power. Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be open, but bolts-raising will not work. Cutting these wires may electrocute the user.
* one wire for door bolts. Sending a pulse through this drops door bolts (whether the door is powered or not) or raises them (if it is). Cutting this wire also drops the door bolts, and mending it does not raise them. If the wire is cut, trying to raise the door bolts will not work.
* two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter). Cutting either one disables the backup door power (allowing it to be crowbarred open, but disabling bolts-raising), but may electocute the user.
* one wire for opening the door. Sending a pulse through this while the door has power makes it open the door if no access is required.
@@ -335,7 +335,7 @@ About the new airlock wires panel:
else /*if(src.justzap)*/
return
else if(user.hallucination > 50 && prob(10) && src.operating == 0)
user << "\red <B>You feel a powerful shock course through your body!</B>"
user << "<span class='danger'>You feel a powerful shock course through your body!</span>"
user.halloss += 10
user.stunned += 10
return
@@ -632,14 +632,14 @@ About the new airlock wires panel:
if(H.getBrainLoss() >= 60)
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
if(!istype(H.head, /obj/item/clothing/head/helmet))
visible_message("\red [user] headbutts the airlock.")
visible_message("<span class='warning'>[user] headbutts the airlock.</span>")
var/obj/item/organ/external/affecting = H.get_organ("head")
H.Stun(8)
H.Weaken(5)
if(affecting.take_damage(10, 0))
H.UpdateDamageIcon()
else
visible_message("\red [user] headbutts the airlock. Good thing they're wearing a helmet.")
visible_message("<span class='warning'>[user] headbutts the airlock. Good thing they're wearing a helmet.</span>")
return
**/
@@ -772,7 +772,7 @@ About the new airlock wires panel:
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
if(do_after(user,40))
user << "\blue You removed the airlock electronics!"
user << "<span class='notice'>You removed the airlock electronics!</span>"
var/obj/structure/door_assembly/da = new assembly_type(src.loc)
if (istype(da, /obj/structure/door_assembly/multi_tile))
@@ -800,9 +800,9 @@ About the new airlock wires panel:
qdel(src)
return
else if(arePowerSystemsOn())
user << "\blue The airlock's motors resist your efforts to force it."
user << "<span class='notice'>The airlock's motors resist your efforts to force it.</span>"
else if(locked)
user << "\blue The airlock's bolts prevent it from being forced."
user << "<span class='notice'>The airlock's bolts prevent it from being forced.</span>"
else
if(density)
spawn(0) open(1)
@@ -811,20 +811,20 @@ About the new airlock wires panel:
else if(istype(C, /obj/item/weapon/material/twohanded/fireaxe) && !arePowerSystemsOn())
if(locked)
user << "\blue The airlock's bolts prevent it from being forced."
user << "<span class='notice'>The airlock's bolts prevent it from being forced.</span>"
else if( !welded && !operating )
if(density)
var/obj/item/weapon/material/twohanded/fireaxe/F = C
if(F.wielded)
spawn(0) open(1)
else
user << "\red You need to be wielding \the [C] to do that."
user << "<span class='warning'>You need to be wielding \the [C] to do that.</span>"
else
var/obj/item/weapon/material/twohanded/fireaxe/F = C
if(F.wielded)
spawn(0) close(1)
else
user << "\red You need to be wielding \the [C] to do that."
user << "<span class='warning'>You need to be wielding \the [C] to do that.</span>"
else
..()
code/game/machinery/doors/airlock_control.dm
+2 -2
View File
@@ -261,7 +261,7 @@ obj/machinery/access_button/attackby(obj/item/I as obj, mob/user as mob)
obj/machinery/access_button/attack_hand(mob/user)
add_fingerprint(usr)
if(!allowed(user))
user << "\red Access Denied"
user << "<span class='warning'>Access Denied</span>"
else if(radio_connection)
var/datum/signal/signal = new
@@ -300,4 +300,4 @@ obj/machinery/access_button/airlock_interior
obj/machinery/access_button/airlock_exterior
frequency = 1379
command = "cycle_exterior"
command = "cycle_exterior"
code/game/machinery/doors/door.dm
+4 -4
View File
@@ -161,7 +161,7 @@
if (Proj.damage > 90)
destroy_hits--
if (destroy_hits <= 0)
visible_message("\red <B>\The [src.name] disintegrates!</B>")
visible_message("<span class='danger'>\The [src.name] disintegrates!</span>")
switch (Proj.damage_type)
if(BRUTE)
new /obj/item/stack/material/steel(src.loc, 2)
@@ -179,7 +179,7 @@
/obj/machinery/door/hitby(AM as mob|obj, var/speed=5)
..()
visible_message("\red <B>[src.name] was hit by [AM].</B>")
visible_message("<span class='danger'>[src.name] was hit by [AM].</span>")
var/tforce = 0
if(ismob(AM))
tforce = 15 * (speed/5)
@@ -267,9 +267,9 @@
if(W.damtype == BRUTE || W.damtype == BURN)
user.do_attack_animation(src)
if(W.force < min_force)
user.visible_message("\red <B>\The [user] hits \the [src] with \the [W] with no visible effect.</B>" )
user.visible_message("<span class='danger'>\The [user] hits \the [src] with \the [W] with no visible effect.</span>")
else
user.visible_message("\red <B>\The [user] forcefully strikes \the [src] with \the [W]!</B>" )
user.visible_message("<span class='danger'>\The [user] forcefully strikes \the [src] with \the [W]!</span>")
playsound(src.loc, hitsound, 100, 1)
take_damage(W.force)
return
code/game/machinery/doors/windowdoor.dm
+4 -4
View File
@@ -158,7 +158,7 @@
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message("\red <B>[user] smashes against the [src.name].</B>", 1)
visible_message("<span class='danger'>[user] smashes against the [src.name].</span>", 1)
take_damage(25)
return
return src.attackby(user, user)
@@ -178,7 +178,7 @@
spark_system.start()
playsound(src.loc, "sparks", 50, 1)
playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
visible_message("\blue The glass door was sliced open by [user]!")
visible_message("<span class='warning'>The glass door was sliced open by [user]!</span>")
flick("[src.base_state]spark", src)
sleep(6)
open()
@@ -189,7 +189,7 @@
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.")
if (do_after(user,40))
user << "\blue You removed the windoor electronics!"
user << "<span class='notice'>You removed the windoor electronics!</span>"
var/obj/structure/windoor_assembly/wa = new/obj/structure/windoor_assembly(src.loc)
if (istype(src, /obj/machinery/door/window/brigdoor))
@@ -227,7 +227,7 @@
if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card))
var/aforce = I.force
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message("\red <B>[src] was hit by [I].</B>")
visible_message("<span class='danger'>[src] was hit by [I].</span>")
if(I.damtype == BRUTE || I.damtype == BURN)
take_damage(aforce)
return
code/game/machinery/flasher.dm
+5 -5
View File
@@ -44,9 +44,9 @@
add_fingerprint(user)
src.disable = !src.disable
if (src.disable)
user.visible_message("\red [user] has disconnected the [src]'s flashbulb!", "\red You disconnect the [src]'s flashbulb!")
user.visible_message("<span class='warning'>[user] has disconnected the [src]'s flashbulb!</span>", "<span class='warning'>You disconnect the [src]'s flashbulb!</span>")
if (!src.disable)
user.visible_message("\red [user] has connected the [src]'s flashbulb!", "\red You connect the [src]'s flashbulb!")
user.visible_message("<span class='warning'>[user] has connected the [src]'s flashbulb!</span>", "<span class='warning'>You connect the [src]'s flashbulb!</span>")
//Let the AI trigger them directly.
/obj/machinery/flasher/attack_ai()
@@ -114,11 +114,11 @@
src.anchored = !src.anchored
if (!src.anchored)
user.show_message(text("\red [src] can now be moved."))
user.show_message(text("<span class='warning'>[src] can now be moved.</span>"))
src.overlays.Cut()
else if (src.anchored)
user.show_message(text("\red [src] is now secured."))
user.show_message(text("<span class='warning'>[src] is now secured.</span>"))
src.overlays += "[base_state]-s"
/obj/machinery/button/flasher
@@ -145,4 +145,4 @@
icon_state = "launcherbtt"
active = 0
return
return
code/game/machinery/floodlight.dm
+2 -2
View File
@@ -50,7 +50,7 @@
if(on)
on = 0
user << "\blue You turn off the light"
user << "<span class='notice'>You turn off the light</span>"
set_light(0)
else
if(!cell)
@@ -58,7 +58,7 @@
if(cell.charge <= 0)
return
on = 1
user << "\blue You turn on the light"
user << "<span class='notice'>You turn on the light</span>"
set_light(brightness_on)
updateicon()
code/game/machinery/igniter.dm
+2 -2
View File
@@ -78,10 +78,10 @@
add_fingerprint(user)
src.disable = !src.disable
if (src.disable)
user.visible_message("\red [user] has disabled the [src]!", "\red You disable the connection to the [src].")
user.visible_message("<span class='warning'>[user] has disabled the [src]!</span>", "<span class='warning'>You disable the connection to the [src].</span>")
icon_state = "[base_state]-d"
if (!src.disable)
user.visible_message("\red [user] has reconnected the [src]!", "\red You fix the connection to the [src].")
user.visible_message("<span class='warning'>[user] has reconnected the [src]!</span>", "<span class='warning'>You fix the connection to the [src].</span>")
if(src.powered())
icon_state = "[base_state]"
else
code/game/machinery/kitchen/gibber.dm
+2 -2
View File
@@ -134,10 +134,10 @@
user << "<span class='danger'>Subject may not have abiotic items on.</span>"
return
user.visible_message("\red [user] starts to put [victim] into the gibber!")
user.visible_message("<span class='danger'>[user] starts to put [victim] into the gibber!</span>")
src.add_fingerprint(user)
if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message("\red [user] stuffs [victim] into the gibber!")
user.visible_message("<span class='danger'>[user] stuffs [victim] into the gibber!</span>")
if(victim.client)
victim.client.perspective = EYE_PERSPECTIVE
victim.client.eye = src
code/game/machinery/kitchen/microwave.dm
+26 -26
View File
@@ -56,69 +56,69 @@
if(src.broken > 0)
if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver
user.visible_message( \
"\blue [user] starts to fix part of the microwave.", \
"\blue You start to fix part of the microwave." \
"<span class='notice'>\The [user] starts to fix part of the microwave.</span>", \
"<span class='notice'>You start to fix part of the microwave.</span>" \
)
if (do_after(user,20))
user.visible_message( \
"\blue [user] fixes part of the microwave.", \
"\blue You have fixed part of the microwave." \
"<span class='notice'>\The [user] fixes part of the microwave.</span>", \
"<span class='notice'>You have fixed part of the microwave.</span>" \
)
src.broken = 1 // Fix it a bit
else if(src.broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench
user.visible_message( \
"\blue [user] starts to fix part of the microwave.", \
"\blue You start to fix part of the microwave." \
"<span class='notice'>\The [user] starts to fix part of the microwave.</span>", \
"<span class='notice'>You start to fix part of the microwave.</span>" \
)
if (do_after(user,20))
user.visible_message( \
"\blue [user] fixes the microwave.", \
"\blue You have fixed the microwave." \
"<span class='notice'>\The [user] fixes the microwave.</span>", \
"<span class='notice'>You have fixed the microwave.</span>" \
)
src.icon_state = "mw"
src.broken = 0 // Fix it!
src.dirty = 0 // just to be sure
src.flags = OPENCONTAINER
else
user << "\red It's broken!"
user << "<span class='warning'>It's broken!</span>"
return 1
else if(src.dirty==100) // The microwave is all dirty so can't be used!
if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner)) // If they're trying to clean it then let them
user.visible_message( \
"\blue [user] starts to clean the microwave.", \
"\blue You start to clean the microwave." \
"<span class='notice'>\The [user] starts to clean the microwave.</span>", \
"<span class='notice'>You start to clean the microwave.</span>" \
)
if (do_after(user,20))
user.visible_message( \
"\blue [user] has cleaned the microwave.", \
"\blue You have cleaned the microwave." \
"<span class='notice'>\The [user] has cleaned the microwave.</span>", \
"<span class='notice'>You have cleaned the microwave.</span>" \
)
src.dirty = 0 // It's clean!
src.broken = 0 // just to be sure
src.icon_state = "mw"
src.flags = OPENCONTAINER
else //Otherwise bad luck!!
user << "\red It's dirty!"
user << "<span class='warning'>It's dirty!</span>"
return 1
else if(is_type_in_list(O,acceptable_items))
if (contents.len>=max_n_of_items)
user << "\red This [src] is full of ingredients, you cannot put more."
user << "<span class='warning'>This [src] is full of ingredients, you cannot put more.</span>"
return 1
if(istype(O, /obj/item/stack) && O:get_amount() > 1) // This is bad, but I can't think of how to change it
var/obj/item/stack/S = O
new O.type (src)
S.use(1)
user.visible_message( \
"\blue [user] has added one of [O] to \the [src].", \
"\blue You add one of [O] to \the [src].")
"<span class='notice'>\The [user] has added one of [O] to \the [src].</span>", \
"<span class='notice'>You add one of [O] to \the [src].</span>")
return
else
// user.remove_from_mob(O) //This just causes problems so far as I can tell. -Pete
user.drop_item()
O.loc = src
user.visible_message( \
"\blue [user] has added \the [O] to \the [src].", \
"\blue You add \the [O] to \the [src].")
"<span class='notice'>\The [user] has added \the [O] to \the [src].</span>", \
"<span class='notice'>You add \the [O] to \the [src].</span>")
return
else if(istype(O,/obj/item/weapon/reagent_containers/glass) || \
istype(O,/obj/item/weapon/reagent_containers/food/drinks) || \
@@ -128,15 +128,15 @@
return 1
for (var/datum/reagent/R in O.reagents.reagent_list)
if (!(R.id in acceptable_reagents))
user << "\red Your [O] contains components unsuitable for cookery."
user << "<span class='warning'>Your [O] contains components unsuitable for cookery.</span>"
return 1
//G.reagents.trans_to(src,G.amount_per_transfer_from_this)
else if(istype(O,/obj/item/weapon/grab))
var/obj/item/weapon/grab/G = O
user << "\red This is ridiculous. You can not fit \the [G.affecting] in this [src]."
user << "<span class='warning'>This is ridiculous. You can not fit \the [G.affecting] in this [src].</span>"
return 1
else
user << "\red You have no idea what you can cook with this [O]."
user << "<span class='warning'>You have no idea what you can cook with this [O].</span>"
..()
src.updateUsrDialog()
@@ -295,7 +295,7 @@
return 0
/obj/machinery/microwave/proc/start()
src.visible_message("\blue The microwave turns on.", "\blue You hear a microwave.")
src.visible_message("<span class='notice'>The microwave turns on.</span>", "<span class='notice'>You hear a microwave.</span>")
src.operating = 1
src.icon_state = "mw1"
src.updateUsrDialog()
@@ -317,7 +317,7 @@
if (src.reagents.total_volume)
src.dirty++
src.reagents.clear_reagents()
usr << "\blue You dispose of the microwave contents."
usr << "<span class='notice'>You dispose of the microwave contents.</span>"
src.updateUsrDialog()
/obj/machinery/microwave/proc/muck_start()
@@ -326,7 +326,7 @@
/obj/machinery/microwave/proc/muck_finish()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
src.visible_message("\red The microwave gets covered in muck!")
src.visible_message("<span class='warning'>The microwave gets covered in muck!</span>")
src.dirty = 100 // Make it dirty so it can't be used util cleaned
src.flags = null //So you can't add condiments
src.icon_state = "mwbloody" // Make it look dirty too
@@ -338,7 +338,7 @@
s.set_up(2, 1, src)
s.start()
src.icon_state = "mwb" // Make it look all busted up and shit
src.visible_message("\red The microwave breaks!") //Let them know they're stupid
src.visible_message("<span class='warning'>The microwave breaks!</span>") //Let them know they're stupid
src.broken = 2 // Make it broken so it can't be used util fixed
src.flags = null //So you can't add condiments
src.operating = 0 // Turn it off again aferwards
code/game/machinery/kitchen/smartfridge.dm
+1 -1
View File
@@ -338,7 +338,7 @@
return 0
spawn(0)
throw_item.throw_at(target,16,3,src)
src.visible_message("\red <b>[src] launches [throw_item.name] at [target.name]!</b>")
src.visible_message("<span class='warning'>[src] launches [throw_item.name] at [target.name]!</span>")
return 1
/************************
code/game/machinery/machinery.dm
+3 -3
View File
@@ -216,7 +216,7 @@ Class Procs:
return 1
if ( ! (istype(usr, /mob/living/carbon/human) || \
istype(usr, /mob/living/silicon)))
usr << "\red You don't have the dexterity to do this!"
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
return 1
/*
//distance checks are made by atom/proc/DblClick
@@ -226,10 +226,10 @@ Class Procs:
if (ishuman(user))
var/mob/living/carbon/human/H = user
if(H.getBrainLoss() >= 60)
visible_message("\red [H] stares cluelessly at [src] and drools.")
visible_message("<span class='warning'>[H] stares cluelessly at [src] and drools.</span>")
return 1
else if(prob(H.getBrainLoss()))
user << "\red You momentarily forget how to use [src]."
user << "<span class='warning'>You momentarily forget how to use [src].</span>"
return 1
src.add_fingerprint(user)
code/game/machinery/mass_driver.dm
+2 -2
View File
@@ -27,7 +27,7 @@
O_limit++
if(O_limit >= 20)
for(var/mob/M in hearers(src, null))
M << "\blue The mass driver lets out a screech, it mustn't be able to handle any more items."
M << "<span class='notice'>The mass driver lets out a screech, it mustn't be able to handle any more items.</span>"
break
use_power(500)
spawn( 0 )
@@ -39,4 +39,4 @@
if(stat & (BROKEN|NOPOWER))
return
drive()
..(severity)
..(severity)
code/game/machinery/navbeacon.dm
+1 -1
View File
@@ -127,7 +127,7 @@ var/global/list/navbeacons // no I don't like putting this in, but it will do
src.locked = !src.locked
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
updateDialog()
else
user << "You must open the cover first!"
code/game/machinery/nuclear_bomb.dm
+14 -17
View File
@@ -102,7 +102,7 @@ var/bomb_set
var/obj/item/weapon/weldingtool/WT = O
if(!WT.isOn()) return
if (WT.get_fuel() < 5) // uses up 5 fuel.
user << "\red You need more fuel to complete this task."
user << "<span class='warning'>You need more fuel to complete this task.</span>"
return
user.visible_message("[user] starts cutting loose the anchoring bolt covers on [src].", "You start cutting loose the anchoring bolt covers with [O]...")
@@ -129,7 +129,7 @@ var/bomb_set
var/obj/item/weapon/weldingtool/WT = O
if(!WT.isOn()) return
if (WT.get_fuel() < 5) // uses up 5 fuel.
user << "\red You need more fuel to complete this task."
user << "<span class='warning'>You need more fuel to complete this task.</span>"
return
user.visible_message("[user] starts cutting apart the anchoring system sealant on [src].", "You start cutting apart the anchoring system's sealant with [O]...")
@@ -167,12 +167,9 @@ var/bomb_set
/obj/machinery/nuclearbomb/attack_hand(mob/user as mob)
if (src.extended)
if (!ishuman(user))
usr << "\red You don't have the dexterity to do this!"
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
return 1
if (!ishuman(user))
usr << "\red You don't have the dexterity to do this!"
return 1
user.set_machine(src)
var/dat = text("<TT><B>Nuclear Fission Explosive</B><BR>\nAuth. Disk: <A href='?src=\ref[];auth=1'>[]</A><HR>", src, (src.auth ? "++++++++++" : "----------"))
if (src.auth)
@@ -196,9 +193,9 @@ var/bomb_set
else if (src.deployable)
if(removal_stage < 5)
src.anchored = 1
visible_message("\red With a steely snap, bolts slide out of [src] and anchor it to the flooring!")
visible_message("<span class='warning'>With a steely snap, bolts slide out of [src] and anchor it to the flooring!</span>")
else
visible_message("\red \The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.")
visible_message("<span class='warning'>\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.</span>")
if(!src.lighthack)
flick("nuclearbombc", src)
src.icon_state = "nuclearbomb1"
@@ -224,14 +221,14 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
if (!usr.canmove || usr.stat || usr.restrained())
return
if (!ishuman(usr))
usr << "\red You don't have the dexterity to do this!"
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
return 1
if (src.deployable)
usr << "\red You close several panels to make [src] undeployable."
usr << "<span class='warning'>You close several panels to make [src] undeployable.</span>"
src.deployable = 0
else
usr << "\red You adjust some panels to make [src] deployable."
usr << "<span class='warning'>You adjust some panels to make [src] deployable.</span>"
src.deployable = 1
return
@@ -261,12 +258,12 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
src.safety = !src.safety
spawn(100) src.safety = !src.safety
if(src.safety == 1)
visible_message("\blue The [src] quiets down.")
visible_message("<span class='notice'>The [src] quiets down.</span>")
if(!src.lighthack)
if (src.icon_state == "nuclearbomb2")
src.icon_state = "nuclearbomb1"
else
visible_message("\blue The [src] emits a quiet whirling noise!")
visible_message("<span class='notice'>The [src] emits a quiet whirling noise!</span>")
if(href_list["act"] == "wire")
if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
usr << "You need wirecutters!"
@@ -320,7 +317,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
if (src.timing == -1.0)
return
if (src.safety)
usr << "\red The safety is still on."
usr << "<span class='warning'>The safety is still on.</span>"
return
src.timing = !( src.timing )
if (src.timing)
@@ -343,14 +340,14 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
if(removal_stage == 5)
src.anchored = 0
visible_message("\red \The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.")
visible_message("<span class='warning'>\The [src] makes a highly unpleasant crunching noise. It looks like the anchoring bolts have been cut.</span>")
return
src.anchored = !( src.anchored )
if(src.anchored)
visible_message("\red With a steely snap, bolts slide out of [src] and anchor it to the flooring.")
visible_message("<span class='warning'>With a steely snap, bolts slide out of [src] and anchor it to the flooring.</span>")
else
visible_message("\red The anchoring bolts slide back into the depths of [src].")
visible_message("<span class='warning'>The anchoring bolts slide back into the depths of [src].</span>")
src.add_fingerprint(usr)
for(var/mob/M in viewers(1, src))
code/game/machinery/pipe/construction.dm
+5 -5
View File
@@ -447,11 +447,11 @@ Buildable meters
for(var/obj/machinery/atmospherics/M in src.loc)
if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe & same connection type
user << "\red There is already a pipe of the same type at this location."
user << "<span class='warning'>There is already a pipe of the same type at this location.</span>"
return 1
// no conflicts found
var/pipefailtext = "\red There's nothing to connect this pipe section to!" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
var/pipefailtext = "<span class='warning'>There's nothing to connect this pipe section to!</span>" //(with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
//TODO: Move all of this stuff into the various pipe constructors.
switch(pipe_type)
@@ -1147,7 +1147,7 @@ Buildable meters
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user.visible_message( \
"[user] fastens the [src].", \
"\blue You have fastened the [src].", \
"<span class='notice'>You have fastened the [src].</span>", \
"You hear ratchet.")
qdel(src) // remove the pipe item
@@ -1172,11 +1172,11 @@ Buildable meters
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if(!locate(/obj/machinery/atmospherics/pipe, src.loc))
user << "\red You need to fasten it to a pipe"
user << "<span class='warning'>You need to fasten it to a pipe</span>"
return 1
new/obj/machinery/meter( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You have fastened the meter to the pipe"
user << "<span class='notice'>You have fastened the meter to the pipe</span>"
qdel(src)
//not sure why these are necessary
#undef PIPE_SIMPLE_STRAIGHT
code/game/machinery/pipe/pipe_dispenser.dm
+7 -7
View File
@@ -101,18 +101,18 @@
/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob)
src.add_fingerprint(usr)
if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter))
usr << "\blue You put [W] back to [src]."
usr << "<span class='notice'>You put [W] back to [src].</span>"
user.drop_item()
qdel(W)
return
else if (istype(W, /obj/item/weapon/wrench))
if (unwrenched==0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You begin to unfasten \the [src] from the floor..."
user << "<span class='notice'>You begin to unfasten \the [src] from the floor...</span>"
if (do_after(user, 40))
user.visible_message( \
"[user] unfastens \the [src].", \
"\blue You have unfastened \the [src]. Now it can be pulled somewhere else.", \
"<span class='notice'>[user] unfastens \the [src].</span>", \
"<span class='notice'>You have unfastened \the [src]. Now it can be pulled somewhere else.</span>", \
"You hear ratchet.")
src.anchored = 0
src.stat |= MAINT
@@ -121,11 +121,11 @@
usr << browse(null, "window=pipedispenser")
else /*if (unwrenched==1)*/
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You begin to fasten \the [src] to the floor..."
user << "<span class='notice'>You begin to fasten \the [src] to the floor...</span>"
if (do_after(user, 20))
user.visible_message( \
"[user] fastens \the [src].", \
"\blue You have fastened \the [src]. Now it can dispense pipes.", \
"<span class='notice'>[user] fastens \the [src].</span>", \
"<span class='notice'>You have fastened \the [src]. Now it can dispense pipes.</span>", \
"You hear ratchet.")
src.anchored = 1
src.stat &= ~MAINT
code/game/machinery/recharger.dm
+3 -3
View File
@@ -24,12 +24,12 @@ obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob)
if(allowed)
if(charging)
user << "\red \A [charging] is already charging here."
user << "<span class='warning'>\A [charging] is already charging here.</span>"
return
// Checks to make sure he's not in space doing it, and that the area got proper power.
var/area/a = get_area(src)
if(!isarea(a) || (a.power_equip == 0 && !a.unlimited_power))
user << "\red The [name] blinks red as you try to insert the item!"
user << "<span class='warning'>The [name] blinks red as you try to insert the item!</span>"
return
if (istype(G, /obj/item/weapon/gun/energy/gun/nuclear) || istype(G, /obj/item/weapon/gun/energy/crossbow))
user << "<span class='notice'>Your gun's recharge port was removed to make room for a miniaturized reactor.</span>"
@@ -47,7 +47,7 @@ obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob)
update_icon()
else if(istype(G, /obj/item/weapon/wrench))
if(charging)
user << "\red Remove [charging] first!"
user << "<span class='warning'>Remove [charging] first!</span>"
return
anchored = !anchored
user << "You [anchored ? "attached" : "detached"] the recharger."
code/game/machinery/records_scanner.dm
+2 -2
View File
@@ -69,8 +69,8 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user)
<b><u>Black Marks</u></b>:<br> "}
for(var/A in marks)
text += "\red[A]<br>"
user << "\blue You feel a sting as the scanner extracts some of your blood."
text += "<span class='danger'>[A]</span><br>"
user << "<span class='notice'>You feel a sting as the scanner extracts some of your blood.</span>"
var/turf/T = get_step(src,outputdir)
var/obj/item/weapon/paper/print = new(T)
print.name = "[mname] Report"
code/game/machinery/requests_console.dm
+1 -1
View File
@@ -404,7 +404,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name
else
reset_announce()
user << "\red You are not authorized to send announcements."
user << "<span class='warning'>You are not authorized to send announcements.</span>"
updateUsrDialog()
if (istype(O, /obj/item/weapon/stamp))
if(screen == 9)
code/game/machinery/spaceheater.dm
+5 -5
View File
@@ -55,13 +55,13 @@
C.loc = src
C.add_fingerprint(usr)
user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].")
user.visible_message("<span class='notice'>[user] inserts a power cell into [src].</span>", "<span class='notice'>You insert the power cell into [src].</span>")
else
user << "The hatch must be open to insert a power cell."
return
else if(istype(I, /obj/item/weapon/screwdriver))
panel_open = !panel_open
user.visible_message("\blue [user] [panel_open ? "opens" : "closes"] the hatch on the [src].", "\blue You [panel_open ? "open" : "close"] the hatch on the [src].")
user.visible_message("<span class='notice'>[user] [panel_open ? "opens" : "closes"] the hatch on the [src].</span>", "<span class='notice'>You [panel_open ? "open" : "close"] the hatch on the [src].</span>")
update_icon()
if(!panel_open && user.machine == src)
user << browse(null, "window=spaceheater")
@@ -99,7 +99,7 @@
onclose(user, "spaceheater")
else
on = !on
user.visible_message("\blue [user] switches [on ? "on" : "off"] the [src].","\blue You switch [on ? "on" : "off"] the [src].")
user.visible_message("<span class='notice'>[user] switches [on ? "on" : "off"] the [src].</span>","<span class='notice'>You switch [on ? "on" : "off"] the [src].</span>")
update_icon()
return
@@ -120,7 +120,7 @@
if("cellremove")
if(panel_open && cell && !usr.get_active_hand())
usr.visible_message("\blue [usr] removes \the [cell] from \the [src].", "\blue You remove \the [cell] from \the [src].")
usr.visible_message("<span class='notice'>[usr] removes \the [cell] from \the [src].</span>", "<span class='notice'>You remove \the [cell] from \the [src].</span>")
cell.updateicon()
usr.put_in_hands(cell)
cell.add_fingerprint(usr)
@@ -136,7 +136,7 @@
C.loc = src
C.add_fingerprint(usr)
usr.visible_message("\blue [usr] inserts \the [C] into \the [src].", "\blue You insert \the [C] into \the [src].")
usr.visible_message("<span class='notice'>[usr] inserts \the [C] into \the [src].</span>", "<span class='notice'>You insert \the [C] into \the [src].</span>")
updateDialog()
else
code/game/machinery/suit_storage_unit.dm
+4 -4
View File
@@ -100,7 +100,7 @@
dat+= "<HEAD><TITLE>Suit storage unit: Maintenance panel</TITLE></HEAD>"
dat+= "<Font color ='black'><B>Maintenance panel controls</B></font><HR>"
dat+= "<font color ='grey'>The panel is ridden with controls, button and meters, labeled in strange signs and symbols that <BR>you cannot understand. Probably the manufactoring world's language.<BR> Among other things, a few controls catch your eye.<BR><BR>"
dat+= text("<font color ='black'>A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads []</font>.<BR> <font color='blue'><A href='?src=\ref[];toggleUV=1'> Turn towards []</A><BR>",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") )
dat+= text("<font color ='black'>A small dial with a small lambda symbol on it. It's pointing towards a gauge that reads []</font>.<BR> <font color='blue'><A href='?src=\ref[];toggleUV=1'> Turn towards []</A><BR>",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") )
dat+= text("<font color ='black'>A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.</font><BR><font color ='blue'><A href='?src=\ref[];togglesafeties=1'>Press button</a></font>",(src.safetieson? "<font color='green'><B>GREEN</B></font>" : "<font color='red'><B>RED</B></font>"),src)
dat+= text("<HR><BR><A href='?src=\ref[];mach_close=suit_storage_unit'>Close panel</A>", user)
//user << browse(dat, "window=ssu_m_panel;size=400x500")
@@ -933,7 +933,7 @@
/obj/machinery/suit_cycler/proc/finished_job()
var/turf/T = get_turf(src)
T.visible_message("\icon[src] \blue The [src] pings loudly.")
T.visible_message("\icon[src]<span class='notice'>The [src] pings loudly.</span>")
icon_state = initial(icon_state)
active = 0
src.updateUsrDialog()
@@ -960,7 +960,7 @@
/obj/machinery/suit_cycler/proc/eject_occupant(mob/user as mob)
if(locked || active)
user << "\red The cycler is locked."
user << "<span class='warning'>The cycler is locked.</span>"
return
if (!occupant)
@@ -1046,4 +1046,4 @@
suit.icon_state = "rig-syndie"
if(helmet) helmet.name = "refitted [helmet.name]"
if(suit) suit.name = "refitted [suit.name]"
if(suit) suit.name = "refitted [suit.name]"
code/game/machinery/telecomms/logbrowser.dm
+4 -4
View File
@@ -152,7 +152,7 @@
if(href_list["delete"])
if(!src.allowed(usr) && !emagged)
usr << "\red ACCESS DENIED."
usr << "<span class='warning'>ACCESS DENIED.</span>"
return
if(SelectedServer)
@@ -190,7 +190,7 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
user << "<span class='notice'>The broken glass falls out.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/material/shard( src.loc )
var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
@@ -202,7 +202,7 @@
A.anchored = 1
qdel(src)
else
user << "\blue You disconnect the monitor."
user << "<span class='notice'>You disconnect the monitor.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
for (var/obj/C in src)
@@ -215,6 +215,6 @@
else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "\blue You you disable the security protocols"
user << "<span class='notice'>You you disable the security protocols</span>"
src.updateUsrDialog()
return
code/game/machinery/telecomms/telemonitor.dm
+3 -3
View File
@@ -128,7 +128,7 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
user << "<span class='notice'>The broken glass falls out.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/material/shard( src.loc )
var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A )
@@ -140,7 +140,7 @@
A.anchored = 1
qdel(src)
else
user << "\blue You disconnect the monitor."
user << "<span class='notice'>You disconnect the monitor.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A )
for (var/obj/C in src)
@@ -153,6 +153,6 @@
else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "\blue You you disable the security protocols"
user << "<span class='notice'>You you disable the security protocols</span>"
src.updateUsrDialog()
return
code/game/machinery/telecomms/traffic_control.dm
+4 -4
View File
@@ -125,7 +125,7 @@
add_fingerprint(usr)
usr.set_machine(src)
if(!src.allowed(usr) && !emagged)
usr << "\red ACCESS DENIED."
usr << "<span class='warning'>ACCESS DENIED.</span>"
return
if(href_list["viewserver"])
@@ -211,7 +211,7 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
user << "<span class='notice'>The broken glass falls out.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/material/shard( src.loc )
var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
@@ -223,7 +223,7 @@
A.anchored = 1
qdel(src)
else
user << "\blue You disconnect the monitor."
user << "<span class='notice'>You disconnect the monitor.</span>"
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
for (var/obj/C in src)
@@ -236,6 +236,6 @@
else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "\blue You you disable the security protocols"
user << "<span class='notice'>You you disable the security protocols</span>"
src.updateUsrDialog()
return
code/game/machinery/teleporter.dm
+12 -12
View File
@@ -62,7 +62,7 @@
if(C.data == "Clown Land")
//whoops
for(var/mob/O in hearers(src, null))
O.show_message("\red Incoming bluespace portal detected, unable to lock in.", 2)
O.show_message("<span class='warning'>Incoming bluespace portal detected, unable to lock in.</span>", 2)
for(var/obj/machinery/teleport/hub/H in range(1))
var/amount = rand(2,5)
@@ -71,7 +71,7 @@
//
else
for(var/mob/O in hearers(src, null))
O.show_message("\blue Locked In", 2)
O.show_message("<span class='notice'>Locked In</span>", 2)
src.locked = L
one_time_use = 1
@@ -132,7 +132,7 @@
src.locked = L[desc]
for(var/mob/O in hearers(src, null))
O.show_message("\blue Locked In", 2)
O.show_message("<span class='notice'>Locked In</span>", 2)
src.add_fingerprint(usr)
return
@@ -193,7 +193,7 @@
return
if (!com.locked)
for(var/mob/O in hearers(src, null))
O.show_message("\red Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")
O.show_message("<span class='warning'>Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.</span>")
return
if (istype(M, /atom/movable))
if(prob(5) && !accurate) //oh dear a problem, put em in deep space
@@ -211,7 +211,7 @@
accurate = 1
spawn(3000) accurate = 0 //Accurate teleporting for 5 minutes
for(var/mob/B in hearers(src, null))
B.show_message("\blue Test fire completed.")
B.show_message("<span class='notice'>Test fire completed.</span>")
return
/*
/proc/do_teleport(atom/movable/M as mob|obj, atom/destination, precision)
@@ -220,12 +220,12 @@
return
if (istype(M, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>The [] bounces off of the portal!</B>", M.name), 1)
O.show_message(text("<span class='danger'>The [] bounces off of the portal!</span>", M.name), 1)
return
if (istype(M, /mob/living))
var/mob/living/MM = M
if(MM.check_contents_for(/obj/item/weapon/disk/nuclear))
MM << "\red Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."
MM << "<span class='warning'>Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>"
return
var/disky = 0
for (var/atom/O in M.contents) //I'm pretty sure this accounts for the maximum amount of container in container stacking. --NeoFite
@@ -245,14 +245,14 @@
disky = 1
if (disky)
for(var/mob/P in viewers(M, null))
P.show_message(text("\red <B>The [] bounces off of the portal!</B>", M.name), 1)
P.show_message(text("<span class='danger'>The [] bounces off of the portal!</span>", M.name), 1)
return
//Bags of Holding cause bluespace teleportation to go funky. --NeoFite
if (istype(M, /mob/living))
var/mob/living/MM = M
if(MM.check_contents_for(/obj/item/weapon/storage/backpack/holding))
MM << "\red The Bluespace interface on your Bag of Holding interferes with the teleport!"
MM << "<span class='warning'>The Bluespace interface on your Bag of Holding interferes with the teleport!</span>"
precision = rand(1,100)
if (istype(M, /obj/item/weapon/storage/backpack/holding))
precision = rand(1,100)
@@ -339,7 +339,7 @@
update_use_power(2)
com.update_use_power(2)
for(var/mob/O in hearers(src, null))
O.show_message("\blue Teleporter engaged!", 2)
O.show_message("<span class='notice'>Teleporter engaged!</span>", 2)
src.add_fingerprint(usr)
src.engaged = 1
return
@@ -354,7 +354,7 @@
com.update_use_power(1)
update_use_power(1)
for(var/mob/O in hearers(src, null))
O.show_message("\blue Teleporter disengaged!", 2)
O.show_message("<span class='notice'>Teleporter disengaged!</span>", 2)
src.add_fingerprint(usr)
src.engaged = 0
return
@@ -370,7 +370,7 @@
if (com && !active)
active = 1
for(var/mob/O in hearers(src, null))
O.show_message("\blue Test firing!", 2)
O.show_message("<span class='notice'>Test firing!</span>", 2)
com.teleport()
use_power(5000)
code/game/machinery/turrets.dm
+1 -1
View File
@@ -80,7 +80,7 @@
if(user.species.can_shred(user) && !(stat & BROKEN))
playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
visible_message("\red <B>[user] has slashed at [src]!</B>")
visible_message("<span class='danger'>[user] has slashed at [src]!</span>")
src.take_damage(15)
return
code/game/machinery/vending.dm
+7 -7
View File
@@ -229,7 +229,7 @@
W.loc = src
coin = W
categories |= CAT_COIN
user << "\blue You insert \the [W] into \the [src]"
user << "<span class='notice'>You insert \the [W] into \the [src].</span>"
nanomanager.update_uis(src)
return
else if(istype(W, /obj/item/weapon/wrench))
@@ -472,7 +472,7 @@
coin.loc = src.loc
if(!usr.get_active_hand())
usr.put_in_hands(coin)
usr << "\blue You remove the [coin] from the [src]"
usr << "<span class='notice'>You remove the [coin] from the [src]</span>"
coin = null
categories &= ~CAT_COIN
@@ -525,13 +525,13 @@
if (R.category & CAT_COIN)
if(!coin)
user << "\blue You need to insert a coin to get this item."
user << "<span class='notice'>You need to insert a coin to get this item.</span>"
return
if(coin.string_attached)
if(prob(50))
user << "\blue You successfully pull the coin out before \the [src] could swallow it."
user << "<span class='notice'>You successfully pull the coin out before \the [src] could swallow it.</span>"
else
user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all."
user << "<span class='notice'>You weren't able to pull the coin out fast enough, the machine ate it, string and all.</span>"
qdel(coin)
categories &= ~CAT_COIN
else
@@ -558,7 +558,7 @@
/obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user)
if(src.panel_open)
user << "\blue You stock \the [src] with \a [R.product_name]"
user << "<span class='notice'>You stock \the [src] with \a [R.product_name]</span>"
R.amount++
nanomanager.update_uis(src)
@@ -645,7 +645,7 @@
return 0
spawn(0)
throw_item.throw_at(target, 16, 3, src)
src.visible_message("\red <b>[src] launches [throw_item.name] at [target.name]!</b>")
src.visible_message("<span class='warning'>[src] launches [throw_item.name] at [target.name]!</span>")
return 1
/*
code/game/machinery/washing_machine.dm
+5 -5
View File
@@ -75,7 +75,7 @@
/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob)
/*if(istype(W,/obj/item/weapon/screwdriver))
panel = !panel
user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/
user << "<span class='notice'>You [panel ? "open" : "close"] the [src]'s maintenance panel</span>"*/
if(istype(W,/obj/item/weapon/pen/crayon) || istype(W,/obj/item/weapon/stamp))
if( state in list( 1, 3, 6 ) )
if(!crayon)
@@ -148,9 +148,9 @@
W.loc = src
state = 3
else
user << "\blue You can't put the item in right now."
user << "<span class='notice'>You can't put the item in right now.</span>"
else
user << "\blue The washing machine is full."
user << "<span class='notice'>The washing machine is full.</span>"
else
..()
update_icon()
@@ -172,7 +172,7 @@
crayon = null
state = 1
if(5)
user << "\red The [src] is busy."
user << "<span class='warning'>The [src] is busy.</span>"
if(6)
state = 7
if(7)
@@ -187,4 +187,4 @@
state = 1
update_icon()
update_icon()