cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+50 -50
View File
@@ -474,7 +474,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(W.has_tool_quality(TOOL_CROWBAR) && opened)
if(has_electronics == APC_HAS_ELECTRONICS_WIRED)
if(terminal)
to_chat(user, "<span class='warning'>Disconnect the wires first.</span>")
to_chat(user, span_warning("Disconnect the wires first."))
return
playsound(src, W.usesound, 50, 1)
to_chat(user, "You begin to remove the power control board...") //lpeters - fixed grammar issues //Ner - grrrrrr
@@ -483,21 +483,21 @@ GLOBAL_LIST_EMPTY(apcs)
has_electronics = APC_HAS_ELECTRONICS_NONE
if((stat & BROKEN))
user.visible_message(\
"<span class='warning'>[user.name] has broken the charred power control board inside [name]!</span>",\
"<span class='notice'>You broke the charred power control board and remove the remains.</span>",
span_warning("[user.name] has broken the charred power control board inside [name]!"),\
span_notice("You broke the charred power control board and remove the remains."),
"You hear a crack!")
//ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0
else
user.visible_message(\
"<span class='warning'>[user.name] has removed the power control board from [name]!</span>",\
"<span class='notice'>You remove the power control board.</span>")
span_warning("[user.name] has removed the power control board from [name]!"),\
span_notice("You remove the power control board."))
new /obj/item/module/power_control(loc)
else if(opened != 2) //cover isn't removed
opened = 0
update_icon()
else if(W.has_tool_quality(TOOL_CROWBAR) && !(stat & BROKEN) )
if(coverlocked && !(stat & MAINT))
to_chat(user, "<span class='warning'>The cover is locked and cannot be opened.</span>")
to_chat(user, span_warning("The cover is locked and cannot be opened."))
return
else
opened = 1
@@ -507,7 +507,7 @@ GLOBAL_LIST_EMPTY(apcs)
to_chat(user, "The [name] already has a power cell installed.")
return
if(stat & MAINT)
to_chat(user, "<span class='warning'>You need to install the wiring and electronics first.</span>")
to_chat(user, span_warning("You need to install the wiring and electronics first."))
return
if(W.w_class != ITEMSIZE_NORMAL)
to_chat(user, "\The [W] is too [W.w_class < 3? "small" : "large"] to work here.")
@@ -517,14 +517,14 @@ GLOBAL_LIST_EMPTY(apcs)
W.forceMove(src)
cell = W
user.visible_message(\
"<span class='warning'>[user.name] has inserted a power cell into [name]!</span>",\
"<span class='notice'>You insert the power cell.</span>")
span_warning("[user.name] has inserted a power cell into [name]!"),\
span_notice("You insert the power cell."))
chargecount = 0
update_icon()
else if (W.has_tool_quality(TOOL_SCREWDRIVER)) // haxing
if(opened)
if(cell)
to_chat(user, "<span class='warning'>Remove the power cell first.</span>")
to_chat(user, span_warning("Remove the power cell first."))
return
else
if(has_electronics == APC_HAS_ELECTRONICS_WIRED && terminal)
@@ -538,7 +538,7 @@ GLOBAL_LIST_EMPTY(apcs)
playsound(src, W.usesound, 50, 1)
to_chat(user, "You unfasten the electronics.")
else /* has_electronics == APC_HAS_ELECTRONICS_NONE */
to_chat(user, "<span class='warning'>There is nothing to secure.</span>")
to_chat(user, span_warning("There is nothing to secure."))
return
update_icon()
else
@@ -553,13 +553,13 @@ GLOBAL_LIST_EMPTY(apcs)
else if(istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics != APC_HAS_ELECTRONICS_SECURED)
var/turf/T = loc
if(istype(T) && !T.is_plating())
to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first.</span>")
to_chat(user, span_warning("You must remove the floor plating in front of the APC first."))
return
var/obj/item/stack/cable_coil/C = W
if(C.get_amount() < 10)
to_chat(user, "<span class='warning'>You need ten lengths of cable for that.</span>")
to_chat(user, span_warning("You need ten lengths of cable for that."))
return
user.visible_message("<span class='warning'>[user.name] adds cables to the APC frame.</span>", \
user.visible_message(span_warning("[user.name] adds cables to the APC frame."), \
"You start adding cables to the APC frame...")
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20))
@@ -573,16 +573,16 @@ GLOBAL_LIST_EMPTY(apcs)
return
C.use(10)
user.visible_message(\
"<span class='warning'>[user.name] has added cables to the APC frame!</span>",\
span_warning("[user.name] has added cables to the APC frame!"),\
"You add cables to the APC frame.")
make_terminal()
terminal.connect_to_network()
else if(W.has_tool_quality(TOOL_WIRECUTTER) && terminal && opened && has_electronics != APC_HAS_ELECTRONICS_SECURED)
var/turf/T = loc
if(istype(T) && !T.is_plating())
to_chat(user, "<span class='warning'>You must remove the floor plating in front of the APC first.</span>")
to_chat(user, span_warning("You must remove the floor plating in front of the APC first."))
return
user.visible_message("<span class='warning'>[user.name] starts dismantling the [src]'s power terminal.</span>", \
user.visible_message(span_warning("[user.name] starts dismantling the [src]'s power terminal."), \
"You begin to cut the cables...")
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50 * W.toolspeed))
@@ -594,27 +594,27 @@ GLOBAL_LIST_EMPTY(apcs)
if(usr.stunned)
return
new /obj/item/stack/cable_coil(loc,10)
to_chat(user, "<span class='notice'>You cut the cables and dismantle the power terminal.</span>")
to_chat(user, span_notice("You cut the cables and dismantle the power terminal."))
qdel(terminal)
else if(istype(W, /obj/item/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !((stat & BROKEN)))
user.visible_message("<span class='warning'>[user.name] inserts the power control board into [src].</span>", \
user.visible_message(span_warning("[user.name] inserts the power control board into [src]."), \
"You start to insert the power control board into the frame...")
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10))
if(has_electronics == APC_HAS_ELECTRONICS_NONE)
has_electronics = APC_HAS_ELECTRONICS_WIRED
reboot()
to_chat(user, "<span class='notice'>You place the power control board inside the frame.</span>")
to_chat(user, span_notice("You place the power control board inside the frame."))
qdel(W)
else if(istype(W, /obj/item/module/power_control) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && ((stat & BROKEN)))
to_chat(user, "<span class='warning'>The [src] is too broken for that. Repair it first.</span>")
to_chat(user, span_warning("The [src] is too broken for that. Repair it first."))
return
else if(W.has_tool_quality(TOOL_WELDER) && opened && has_electronics == APC_HAS_ELECTRONICS_NONE && !terminal)
var/obj/item/weldingtool/WT = W.get_welder()
if(WT.get_fuel() < 3)
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
to_chat(user, span_warning("You need more welding fuel to complete this task."))
return
user.visible_message("<span class='warning'>[user.name] begins cutting apart [src] with the [WT.name].</span>", \
user.visible_message(span_warning("[user.name] begins cutting apart [src] with the [WT.name]."), \
"You start welding the APC frame...", \
"You hear welding.")
playsound(src, WT.usesound, 25, 1)
@@ -623,26 +623,26 @@ GLOBAL_LIST_EMPTY(apcs)
if(emagged || (stat & BROKEN) || opened==2)
new /obj/item/stack/material/steel(loc)
user.visible_message(\
"<span class='warning'>[src] has been cut apart by [user.name] with the [WT.name].</span>",\
"<span class='notice'>You disassembled the broken APC frame.</span>",\
span_warning("[src] has been cut apart by [user.name] with the [WT.name]."),\
span_notice("You disassembled the broken APC frame."),\
"You hear welding.")
else
new /obj/item/frame/apc(loc)
user.visible_message(\
"<span class='warning'>[src] has been cut from the wall by [user.name] with the [WT.name].</span>",\
"<span class='notice'>You cut the APC frame from the wall.</span>",\
span_warning("[src] has been cut from the wall by [user.name] with the [WT.name]."),\
span_notice("You cut the APC frame from the wall."),\
"You hear welding.")
qdel(src)
return
else if(opened && ((stat & BROKEN) || hacker || emagged))
if(istype(W, /obj/item/frame/apc) && (stat & BROKEN))
if(cell)
to_chat(user, "<span class='warning'>You need to remove the power cell first.</span>")
to_chat(user, span_warning("You need to remove the power cell first."))
return
user.visible_message("<span class='warning'>[user.name] begins replacing the damaged APC cover with a new one.</span>",\
user.visible_message(span_warning("[user.name] begins replacing the damaged APC cover with a new one."),\
"You begin to replace the damaged APC cover...")
if(do_after(user, 50))
user.visible_message("<span class='notice'>[user.name] has replaced the damaged APC cover with a new one.</span>",\
user.visible_message(span_notice("[user.name] has replaced the damaged APC cover with a new one."),\
"You replace the damaged APC cover with a new one.")
qdel(W)
stat &= ~BROKEN
@@ -652,12 +652,12 @@ GLOBAL_LIST_EMPTY(apcs)
update_icon()
else if(istype(W, /obj/item/multitool) && (hacker || emagged))
if(cell)
to_chat(user, "<span class='warning'>You need to remove the power cell first.</span>")
to_chat(user, span_warning("You need to remove the power cell first."))
return
user.visible_message("<span class='warning'>[user.name] connects their [W.name] to the APC and begins resetting it.</span>",\
user.visible_message(span_warning("[user.name] connects their [W.name] to the APC and begins resetting it."),\
"You begin resetting the APC...")
if(do_after(user, 50))
user.visible_message("<span class='notice'>[user.name] resets the APC with a beep from their [W.name].</span>",\
user.visible_message(span_notice("[user.name] resets the APC with a beep from their [W.name]."),\
"You finish resetting the APC.")
playsound(src, 'sound/machines/chime.ogg', 25, 1)
reboot()
@@ -666,13 +666,13 @@ GLOBAL_LIST_EMPTY(apcs)
&& !opened \
&& W.force >= 5 \
&& W.w_class >= ITEMSIZE_SMALL )
user.visible_message("<span class='danger'>The [name] has been hit with the [W.name] by [user.name]!</span>", \
"<span class='danger'>You hit the [name] with your [W.name]!</span>", \
user.visible_message(span_danger("The [name] has been hit with the [W.name] by [user.name]!"), \
span_danger("You hit the [name] with your [W.name]!"), \
"You hear a bang!")
if(prob(20))
opened = 2
user.visible_message("<span class='danger'>The APC cover was knocked down with the [W.name] by [user.name]!</span>", \
"<span class='danger'>You knock down the APC cover with your [W.name]!</span>", \
user.visible_message(span_danger("The APC cover was knocked down with the [W.name] by [user.name]!"), \
span_danger("You knock down the APC cover with your [W.name]!"), \
"You hear a bang!")
update_icon()
else
@@ -681,7 +681,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(!opened && wiresexposed && (istype(W, /obj/item/multitool) || W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/assembly/signaler)))
return attack_hand(user)
//Placeholder until someone can do take_damage() for APCs or something.
to_chat(user, "<span class='notice'>The [name] looks too sturdy to bash open with \the [W.name].</span>")
to_chat(user, span_notice("The [name] looks too sturdy to bash open with \the [W.name]."))
// attack with hand - remove cell (if cover open) or interact with the APC
@@ -695,14 +695,14 @@ GLOBAL_LIST_EMPTY(apcs)
else if(stat & (BROKEN|MAINT))
to_chat(user, "Nothing happens.")
else if(hacker)
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
else
if(allowed(user) && !wires.is_cut(WIRE_IDSCAN))
locked = !locked
to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.")
update_icon()
else
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
/obj/machinery/power/apc/AltClick(mob/user)
..()
@@ -721,7 +721,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(do_after(user,6))
emagged = 1
locked = 0
to_chat(user, "<span class='notice'>You emag the APC interface.</span>")
to_chat(user, span_notice("You emag the APC interface."))
update_icon()
return 1
@@ -742,7 +742,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(H.species.can_shred(H))
user.setClickCooldown(user.get_attack_speed())
user.visible_message("<span call='warning'>[user.name] slashes at the [name]!</span>", "<span class='notice'>You slash at the [name]!</span>")
user.visible_message("<span call='warning'>[user.name] slashes at the [name]!</span>", span_notice("You slash at the [name]!"))
playsound(src, 'sound/weapons/slash.ogg', 100, 1)
var/allcut = wires.is_all_cut()
@@ -767,8 +767,8 @@ GLOBAL_LIST_EMPTY(apcs)
cell.update_icon()
cell = null
user.visible_message("<span class='warning'>[user.name] removes the power cell from [name]!</span>",\
"<span class='notice'>You remove the power cell.</span>")
user.visible_message(span_warning("[user.name] removes the power cell from [name]!"),\
span_notice("You remove the power cell."))
charging = 0
update_icon()
return
@@ -885,10 +885,10 @@ GLOBAL_LIST_EMPTY(apcs)
if(!user.IsAdvancedToolUser())
return 0
if(user.restrained())
to_chat(user, "<span class='warning'>Your hands must be free to use [src].</span>")
to_chat(user, span_warning("Your hands must be free to use [src]."))
return 0
if(user.lying)
to_chat(user, "<span class='warning'>You must stand to use [src]!</span>")
to_chat(user, span_warning("You must stand to use [src]!"))
return 0
autoflag = 5
if(istype(user, /mob/living/silicon))
@@ -903,14 +903,14 @@ GLOBAL_LIST_EMPTY(apcs)
if(aidisabled && !permit)
if(!loud)
to_chat(user, "<span class='danger'>\The AI control for [src] has been disabled!</span>")
to_chat(user, span_danger("\The AI control for [src] has been disabled!"))
return 0
else
if(!in_range(src, user) || !istype(loc, /turf))
return 0
var/mob/living/carbon/human/H = user
if(istype(H) && prob(H.getBrainLoss()))
to_chat(user, "<span class='danger'>You momentarily forget how to use [src].</span>")
to_chat(user, span_danger("You momentarily forget how to use [src]."))
return 0
return 1
@@ -947,7 +947,7 @@ GLOBAL_LIST_EMPTY(apcs)
toggle_breaker()
if("nightshift")
if(last_nightshift_switch > world.time - 10 SECONDS) // don't spam...
to_chat(usr, "<span class='warning'>[src]'s night lighting circuit breaker is still cycling!</span>")
to_chat(usr, span_warning("[src]'s night lighting circuit breaker is still cycling!"))
return 0
last_nightshift_switch = world.time
nightshift_setting = params["nightshift"]
@@ -1244,7 +1244,7 @@ GLOBAL_LIST_EMPTY(apcs)
/obj/machinery/power/apc/proc/set_broken()
// Aesthetically much better!
spawn(rand(2,5))
visible_message("<span class='warning'>[src]'s screen flickers suddenly, then explodes in a rain of sparks and small debris!</span>")
visible_message(span_warning("[src]'s screen flickers suddenly, then explodes in a rain of sparks and small debris!"))
stat |= BROKEN
operating = 0
update_icon()
code/modules/power/batteryrack.dm
+2 -2
View File
@@ -224,9 +224,9 @@
/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/cell)) // ID Card, try to insert it.
if(insert_cell(W, user))
to_chat(user, "<span class='filter_notice'>You insert \the [W] into \the [src].</span>")
to_chat(user, span_filter_notice("You insert \the [W] into \the [src]."))
else
to_chat(user, "<span class='filter_notice'>\The [src] has no empty slot for \the [W]</span>")
to_chat(user, span_filter_notice("\The [src] has no empty slot for \the [W]"))
if(!..())
return 0
if(default_deconstruction_crowbar(user, W))
code/modules/power/breaker_box.dm
+5 -5
View File
@@ -47,9 +47,9 @@
/obj/machinery/power/breakerbox/examine(mob/user)
. = ..()
if(on)
. += "<span class='notice'>It seems to be online.</span>"
. += span_notice("It seems to be online.")
else
. += "<span class='warning'>It seems to be offline.</span>"
. += span_warning("It seems to be offline.")
/obj/machinery/power/breakerbox/attack_ai(mob/user)
if(update_locked)
@@ -87,8 +87,8 @@
if(do_after(user, 50))
set_state(!on)
user.visible_message(\
"<span class='notice'>[user.name] [on ? "enabled" : "disabled"] the breaker box!</span>",\
"<span class='notice'>You [on ? "enabled" : "disabled"] the breaker box!</span>")
span_notice("[user.name] [on ? "enabled" : "disabled"] the breaker box!"),\
span_notice("You [on ? "enabled" : "disabled"] the breaker box!"))
update_locked = 1
spawn(600)
update_locked = 0
@@ -100,7 +100,7 @@
newtag = sanitize(newtag,MAX_NAME_LEN)
if(newtag)
RCon_tag = newtag
to_chat(user, "<span class='notice'>You changed the RCON tag to: [newtag]</span>")
to_chat(user, span_notice("You changed the RCON tag to: [newtag]"))
if(on)
to_chat(user, span_red("Disable the breaker before performing maintenance."))
return
code/modules/power/cable.dm
+13 -13
View File
@@ -114,7 +114,7 @@ var/list/possible_cable_coil_colours = list(
/obj/structure/cable/examine(mob/user)
. = ..()
if(isobserver(user))
. += "<span class='warning'>[powernet?.avail > 0 ? "[DisplayPower(powernet.avail)] in power network." : "The cable is not powered."]</span>"
. += span_warning("[powernet?.avail > 0 ? "[DisplayPower(powernet.avail)] in power network." : "The cable is not powered."]")
// Rotating cables requires d1 and d2 to be rotated
/obj/structure/cable/set_dir(new_dir)
@@ -180,11 +180,11 @@ var/list/possible_cable_coil_colours = list(
if(W.has_tool_quality(TOOL_WIRECUTTER))
var/obj/item/stack/cable_coil/CC
if(d1 == UP || d2 == UP)
to_chat(user, "<span class='warning'>You must cut this cable from above.</span>")
to_chat(user, span_warning("You must cut this cable from above."))
return
if(breaker_box)
to_chat(user, "<span class='warning'>This cable is connected to nearby breaker box. Use breaker box to interact with it.</span>")
to_chat(user, span_warning("This cable is connected to nearby breaker box. Use breaker box to interact with it."))
return
if (shock(user, 50))
@@ -199,7 +199,7 @@ var/list/possible_cable_coil_colours = list(
src.transfer_fingerprints_to(CC)
for(var/mob/O in viewers(src, null))
O.show_message("<span class='warning'>[user] cuts the cable.</span>", 1)
O.show_message(span_warning("[user] cuts the cable."), 1)
if(d1 == DOWN || d2 == DOWN)
var/turf/turf = GetBelow(src)
@@ -224,10 +224,10 @@ var/list/possible_cable_coil_colours = list(
else if(istype(W, /obj/item/multitool))
if(powernet && (powernet.avail > 0)) // is it powered?
to_chat(user, "<span class='warning'>[DisplayPower(powernet.avail)] in power network.</span>")
to_chat(user, span_warning("[DisplayPower(powernet.avail)] in power network."))
else
to_chat(user, "<span class='warning'>The cable is not powered.</span>")
to_chat(user, span_warning("The cable is not powered."))
shock(user, 5, 0.2)
@@ -554,11 +554,11 @@ var/list/possible_cable_coil_colours = list(
if(S.organ_tag == BP_HEAD)
if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
to_chat(user, "<span class='warning'>You can't apply [src] through [H.head]!</span>")
to_chat(user, span_warning("You can't apply [src] through [H.head]!"))
return 1
else
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
to_chat(user, "<span class='warning'>You can't apply [src] through [H.wear_suit]!</span>")
to_chat(user, span_warning("You can't apply [src] through [H.wear_suit]!"))
return 1
var/use_amt = min(src.amount, CEILING(S.burn_dam/5, 1), 5)
@@ -591,7 +591,7 @@ var/list/possible_cable_coil_colours = list(
final_color = possible_cable_coil_colours["Red"]
selected_color = "red"
color = final_color
to_chat(user, "<span class='notice'>You change \the [src]'s color to [lowertext(selected_color)].</span>")
to_chat(user, span_notice("You change \the [src]'s color to [lowertext(selected_color)]."))
/obj/item/stack/cable_coil/proc/update_wclass()
if(amount == 1)
@@ -614,14 +614,14 @@ var/list/possible_cable_coil_colours = list(
if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned)
if(!istype(usr.loc,/turf)) return
if(src.amount <= 14)
to_chat(usr, "<span class='warning'>You need at least 15 lengths to make restraints!</span>")
to_chat(usr, span_warning("You need at least 15 lengths to make restraints!"))
return
var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc)
B.color = color
to_chat(usr, "<span class='notice'>You wind some cable together to make some restraints.</span>")
to_chat(usr, span_notice("You wind some cable together to make some restraints."))
src.use(15)
else
to_chat(usr, "<span class='notice'>You cannot do that.</span>")
to_chat(usr, span_notice("You cannot do that."))
/obj/item/stack/cable_coil/cyborg/verb/set_colour()
set name = "Change Colour"
@@ -685,7 +685,7 @@ var/list/possible_cable_coil_colours = list(
for(var/obj/structure/cable/LC in F)
if((LC.d1 == dirn && LC.d2 == end_dir ) || ( LC.d2 == dirn && LC.d1 == end_dir))
to_chat(user, "<span class='warning'>There's already a cable at that position.</span>")
to_chat(user, span_warning("There's already a cable at that position."))
return
put_cable(F, user, end_dir, dirn)
code/modules/power/cable_ender.dm
+2 -3
View File
@@ -25,10 +25,10 @@
/obj/structure/cable/ender/attackby(obj/item/W, mob/user)
src.add_fingerprint(user)
if(W.has_tool_quality(TOOL_WIRECUTTER))
to_chat(user, "<span class='notice'> These cables are too tough to be cut with those [W.name].</span>")
to_chat(user, span_notice(" These cables are too tough to be cut with those [W.name]."))
return
else if(istype(W, /obj/item/stack/cable_coil))
to_chat(user, "<span class='notice'> You will need heavier cables to connect to these.</span>")
to_chat(user, span_notice(" You will need heavier cables to connect to these."))
return
else
..()
@@ -36,4 +36,3 @@
// Because they cannot be rebuilt, they are hard to destroy
/obj/structure/cable/ender/ex_act(severity)
return
code/modules/power/cells/device_cells_vr.dm
+2 -2
View File
@@ -7,7 +7,7 @@
/obj/item/cell/device/weapon/recharge/alien/attack_self(var/mob/user)
user.remove_from_mob(src)
to_chat(user, "<span class='notice'>You swap [src] to 'machinery cell' mode.</span>")
to_chat(user, span_notice("You swap [src] to 'machinery cell' mode."))
var/obj/item/cell/newcell = new swaps_to(null)
user.put_in_active_hand(newcell)
var/percentage = charge/maxcharge
@@ -32,7 +32,7 @@
/obj/item/cell/void/attack_self(var/mob/user)
user.remove_from_mob(src)
to_chat(user, "<span class='notice'>You swap [src] to 'device cell' mode.</span>")
to_chat(user, span_notice("You swap [src] to 'device cell' mode."))
var/obj/item/cell/newcell = new swaps_to(null)
user.put_in_active_hand(newcell)
var/percentage = charge/maxcharge
code/modules/power/cells/esoteric_cells.dm
+1 -1
View File
@@ -66,7 +66,7 @@
var/obj/item/plastique/C4 = locate() in get_turf(src)
if(C4)
C4.visible_message("<span class='danger'>The current fries \the [C4]!</span>")
C4.visible_message(span_danger("The current fries \the [C4]!"))
if(prob(10))
C4.explode(get_turf(src))
code/modules/power/cells/power_cells.dm
+3 -3
View File
@@ -224,11 +224,11 @@
if(H.nutrition <= amount)
use(user,H)
else
to_chat(user,"<span class='warning'>The difference in potential is too great. [user == M ? "You have" : "[H] has"] too much charge to use such a small battery.</span>")
to_chat(user,span_warning("The difference in potential is too great. [user == M ? "You have" : "[H] has"] too much charge to use such a small battery."))
else if(M == user)
to_chat(user,"<span class='warning'>You lick the cell, and your tongue tingles slightly.</span>")
to_chat(user,span_warning("You lick the cell, and your tongue tingles slightly."))
else
to_chat(user,"<span class='warning'>This cell is meant for use on humanoid synthetics only.</span>")
to_chat(user,span_warning("This cell is meant for use on humanoid synthetics only."))
. = ..()
code/modules/power/debug_items.dm
+12 -12
View File
@@ -13,15 +13,15 @@
/obj/machinery/power/debug_items/proc/show_info(var/mob/user)
var/list/extra_info = list()
if(!powernet)
extra_info += "<span class='filter_notice'>This device is not connected to a powernet</span>"
extra_info += span_filter_notice("This device is not connected to a powernet")
return
extra_info += "<span class='filter_notice'>Connected to powernet: [powernet]</span>"
extra_info += "<span class='filter_notice'>Available power: [num2text(powernet.avail, 20)] W</span>"
extra_info += "<span class='filter_notice'>Load: [num2text(powernet.viewload, 20)] W</span>"
extra_info += "<span class='filter_notice'>Has alert: [powernet.problem ? "YES" : "NO"]</span>"
extra_info += "<span class='filter_notice'>Cables: [powernet.cables.len]</span>"
extra_info += "<span class='filter_notice'>Nodes: [powernet.nodes.len]</span>"
extra_info += span_filter_notice("Connected to powernet: [powernet]")
extra_info += span_filter_notice("Available power: [num2text(powernet.avail, 20)] W")
extra_info += span_filter_notice("Load: [num2text(powernet.viewload, 20)] W")
extra_info += span_filter_notice("Has alert: [powernet.problem ? "YES" : "NO"]")
extra_info += span_filter_notice("Cables: [powernet.cables.len]")
extra_info += span_filter_notice("Nodes: [powernet.nodes.len]")
return extra_info
@@ -36,7 +36,7 @@
/obj/machinery/power/debug_items/infinite_generator/show_info(var/mob/user)
. = ..()
. += "<span class='filter_notice'>Generator is providing [num2text(power_generation_rate, 20)] W</span>"
. += span_filter_notice("Generator is providing [num2text(power_generation_rate, 20)] W")
// A cable powersink, without the explosion/network alarms normal powersink causes.
@@ -51,8 +51,8 @@
/obj/machinery/power/debug_items/infinite_cable_powersink/show_info(var/mob/user)
. = ..()
. += "<span class='filter_notice'>Power sink is demanding [num2text(power_usage_rate, 20)] W</span>"
. += "<span class='filter_notice'>[num2text(last_used, 20)] W was actually used last tick</span>"
. += span_filter_notice("Power sink is demanding [num2text(power_usage_rate, 20)] W")
. += span_filter_notice("[num2text(last_used, 20)] W was actually used last tick")
/obj/machinery/power/debug_items/infinite_apc_powersink
@@ -63,5 +63,5 @@
/obj/machinery/power/debug_items/infinite_apc_powersink/show_info(var/mob/user)
. = ..()
. += "<span class='filter_notice'>Dummy load is using [num2text(active_power_usage, 20)] W</span>"
. += "<span class='filter_notice'>Powered: [powered() ? "YES" : "NO"]</span>"
. += span_filter_notice("Dummy load is using [num2text(active_power_usage, 20)] W")
. += span_filter_notice("Powered: [powered() ? "YES" : "NO"]")
code/modules/power/fusion/core/_core.dm
+2 -2
View File
@@ -138,7 +138,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
/obj/machinery/power/fusion_core/attackby(var/obj/item/W, var/mob/user)
if(owned_field)
to_chat(user,"<span class='warning'>Shut \the [src] off first!</span>")
to_chat(user,span_warning("Shut \the [src] off first!"))
return
if(default_deconstruction_screwdriver(user, W))
@@ -166,4 +166,4 @@ GLOBAL_LIST_EMPTY(fusion_cores)
if(!owned_field)
return FALSE
owned_field.plasma_temperature = field_temperature
return TRUE
return TRUE
code/modules/power/fusion/core/core_control.dm
+1 -1
View File
@@ -57,7 +57,7 @@
cur_viewed_device = null
if(!id_tag)
to_chat(user, "<span class='warning'>This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.</span>")
to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool."))
return
if(cur_viewed_device && (cur_viewed_device.id_tag != id_tag || get_dist(src, cur_viewed_device) > scan_range))
code/modules/power/fusion/core/core_field.dm
+12 -12
View File
@@ -206,21 +206,21 @@
else
if(percent_unstable > 0.1 && prob(percent_unstable*100))
if(plasma_temperature < 2000)
visible_message("<span class='danger'>\The [src] ripples uneasily, like a disturbed pond.</span>")
visible_message(span_danger("\The [src] ripples uneasily, like a disturbed pond."))
else
var/flare
var/fuel_loss
var/rupture
if(percent_unstable > 0.2)
visible_message("<span class='danger'>\The [src] ripples uneasily, like a disturbed pond.</span>")
visible_message(span_danger("\The [src] ripples uneasily, like a disturbed pond."))
flare = prob(25)
else if(percent_unstable > 0.5)
visible_message("<span class='danger'>\The [src] undulates violently, shedding plumes of plasma!</span>")
visible_message(span_danger("\The [src] undulates violently, shedding plumes of plasma!"))
flare = prob(50)
fuel_loss = prob(20)
rupture = prob(5)
else if(percent_unstable > 0.8)
visible_message("<span class='danger'>\The [src] is wracked by a series of horrendous distortions, buckling and twisting like a living thing!</span>")
visible_message(span_danger("\The [src] is wracked by a series of horrendous distortions, buckling and twisting like a living thing!"))
flare = 1
fuel_loss = prob(50)
rupture = prob(25)
@@ -260,11 +260,11 @@
critical += 0.6
if(critical >= 25 && prob(percent_unstable*100))
if (critical >= 90)
visible_message("<span class='danger'>\The [src] rumbles and quivers violently, threatening to break free!</span>")
visible_message(span_danger("\The [src] rumbles and quivers violently, threatening to break free!"))
else if(critical >= 50)
visible_message("<span class='danger'>\The [src] rumbles and quivers energetically, the walls distorting slightly.</span>")
visible_message(span_danger("\The [src] rumbles and quivers energetically, the walls distorting slightly."))
else if(critical >= 25)
visible_message("<span class='danger'>\The [src] rumbles and quivers slightly, vibrating the deck.</span>")
visible_message(span_danger("\The [src] rumbles and quivers slightly, vibrating the deck."))
*/
/obj/effect/fusion_em_field/proc/ChangeFieldStrength(var/new_strength)
var/calc_size = 1
@@ -353,7 +353,7 @@
continue
log_debug("R-UST DEBUG: [AM] is [AM.type]")
AM.visible_message("<span class='danger'>The field buckles visibly around \the [AM]!</span>")
AM.visible_message(span_danger("The field buckles visibly around \the [AM]!"))
tick_instability += rand(15,30)
AM.emp_act(empsev)
@@ -580,7 +580,7 @@
light_min_power = 30
light_min_range = 30
light_max_range = 30
visible_message("<span class='danger'>\The [src] flares to eye-searing brightness!</span>")
visible_message(span_danger("\The [src] flares to eye-searing brightness!"))
sleep(60)
temp_color()
//plasma_temperature -= lost_plasma
@@ -589,7 +589,7 @@
/obj/effect/fusion_em_field/proc/Rupture()
visible_message("<span class='danger'>\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!</span>")
visible_message(span_danger("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!"))
set_light(15, 15, "#CCCCFF")
empulse(get_turf(src), CEILING(plasma_temperature/1000, 1), CEILING(plasma_temperature/300, 1))
global_announcer.autosay("WARNING: FIELD RUPTURE IMMINENT!", "Containment Monitor")
@@ -616,7 +616,7 @@
return
/obj/effect/fusion_em_field/proc/MRC() //spews electromagnetic pulses in an area around the core.
visible_message("<span class='danger'>\The [src] glows an extremely bright pink and flares out of existance!</span>")
visible_message(span_danger("\The [src] glows an extremely bright pink and flares out of existance!"))
global_announcer.autosay("Warning! Magnetic Resonance Cascade detected! Brace for electronic system distruption.", "Field Stability Monitor")
set_light(15, 15, "#ff00d8")
var/list/things_in_range = range(15, owned_core)
@@ -667,7 +667,7 @@
return
/obj/effect/fusion_em_field/proc/BluespaceQuenchEvent() //!!FUN!! causes a number of explosions in an area around the core. Will likely destory or heavily damage the reactor.
visible_message("<span class='danger'>\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!</span>")
visible_message(span_danger("\The [src] shudders like a dying animal before flaring to eye-searing brightness and rupturing!"))
set_light(15, 15, "#CCCCFF")
empulse(get_turf(src), CEILING(plasma_temperature/1000, 1), CEILING(plasma_temperature/300, 1))
global_announcer.autosay("WARNING: FIELD RUPTURE IMMINENT!", "Containment Monitor")
code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
+5 -5
View File
@@ -20,10 +20,10 @@
/obj/machinery/fusion_fuel_compressor/proc/do_special_fuel_compression(var/obj/item/thing, var/mob/user)
if(istype(thing) && thing.reagents && thing.reagents.total_volume && thing.is_open_container())
if(thing.reagents.reagent_list.len > 1)
to_chat(user, "<span class='warning'>The contents of \the [thing] are impure and cannot be used as fuel.</span>")
to_chat(user, span_warning("The contents of \the [thing] are impure and cannot be used as fuel."))
return 1
if(thing.reagents.total_volume < 300)
to_chat(user, "<span class='warning'>You need at least three hundred units of material to form a fuel rod.</span>")
to_chat(user, span_warning("You need at least three hundred units of material to form a fuel rod."))
return 1
var/datum/reagent/R = thing.reagents.reagent_list[1]
visible_message("<b>\The [src]</b> compresses the contents of \the [thing] into a new fuel assembly.")
@@ -52,10 +52,10 @@
var/obj/item/stack/material/M = thing
var/datum/material/mat = M.get_material()
if(!mat.is_fusion_fuel)
to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
to_chat(user, span_warning("It would be pointless to make a fuel rod out of [mat.use_name]."))
return
if(M.get_amount() < FUSION_ROD_SHEET_AMT)
to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
to_chat(user, span_warning("You need at least 25 [mat.sheet_plural_name] to make a fuel rod."))
return
var/obj/item/fuel_assembly/F = new(get_turf(src), mat.name)
visible_message("<b>\The [src]</b> compresses the [mat.use_name] into a new fuel assembly.")
@@ -67,4 +67,4 @@
return ..()
#undef FUSION_ROD_SHEET_AMT
#undef FUSION_ROD_SHEET_AMT
code/modules/power/fusion/fuel_assembly/fuel_control.dm
+1 -1
View File
@@ -47,7 +47,7 @@
return
if(!id_tag)
to_chat(user, "<span class='warning'>This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.</span>")
to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool."))
return
var/dat = "<B>Reactor Core Fuel Control #[id_tag]</B><BR>"
code/modules/power/fusion/fuel_assembly/fuel_injector.dm
+4 -4
View File
@@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
if(istype(W, /obj/item/fuel_assembly))
if(injecting)
to_chat(user, "<span class='warning'>Shut \the [src] off before playing with the fuel rod!</span>")
to_chat(user, span_warning("Shut \the [src] off before playing with the fuel rod!"))
return
if(cur_assembly)
@@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
if(W.has_tool_quality(TOOL_WRENCH) || W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_CROWBAR) || istype(W, /obj/item/storage/part_replacer))
if(injecting)
to_chat(user, "<span class='warning'>Shut \the [src] off first!</span>")
to_chat(user, span_warning("Shut \the [src] off first!"))
return
if(default_unfasten_wrench(user, W))
return
@@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
/obj/machinery/fusion_fuel_injector/attack_hand(mob/user)
if(injecting)
to_chat(user, "<span class='warning'>Shut \the [src] off before playing with the fuel rod!</span>")
to_chat(user, span_warning("Shut \the [src] off before playing with the fuel rod!"))
return
if(cur_assembly)
@@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors)
cur_assembly = null
return
else
to_chat(user, "<span class='warning'>There is no fuel rod in \the [src].</span>")
to_chat(user, span_warning("There is no fuel rod in \the [src]."))
return
/obj/machinery/fusion_fuel_injector/proc/BeginInjecting()
code/modules/power/fusion/gyrotron/gyrotron_control.dm
+3 -3
View File
@@ -44,7 +44,7 @@
return
if(!id_tag)
to_chat(user, "<span class='warning'>This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool.</span>")
to_chat(user, span_warning("This console has not been assigned an ident tag. Please contact your system administrator or conduct a manual update with a standard multitool."))
return
var/dat = "<td><b>Gyrotron controller #[id_tag]</b>"
@@ -92,7 +92,7 @@
if(href_list["modifypower"])
var/new_val = input(usr, "Enter new emission power level (1 - 50)", "Modifying power level", G.mega_energy) as num
if(!new_val)
to_chat(usr, "<span class='warning'>That's not a valid number.</span>")
to_chat(usr, span_warning("That's not a valid number."))
return 1
G.mega_energy = CLAMP(new_val, 1, 50)
G.update_active_power_usage(G.mega_energy * 1500)
@@ -102,7 +102,7 @@
if(href_list["modifyrate"])
var/new_val = input(usr, "Enter new emission delay between 1 and 10 seconds.", "Modifying emission rate", G.rate) as num
if(!new_val)
to_chat(usr, "<span class='warning'>That's not a valid number.</span>")
to_chat(usr, span_warning("That's not a valid number."))
return 1
G.rate = CLAMP(new_val, 1, 10)
updateUsrDialog()
code/modules/power/gravitygenerator_vr.dm
+5 -5
View File
@@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
switch(broken_state)
if(GRAV_NEEDS_SCREWDRIVER)
if(I.has_tool_quality(TOOL_SCREWDRIVER))
to_chat(user, "<span class='notice'>You secure the screws of the framework.</span>")
to_chat(user, span_notice("You secure the screws of the framework."))
playsound(src, I.usesound, 75, 1)
broken_state++
update_icon()
@@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
if(I.has_tool_quality(TOOL_WELDER))
var/obj/item/weldingtool/W = I.get_welder()
if(W.remove_fuel(0,user))
to_chat(user, "<span class='notice'>You mend the damaged framework.</span>")
to_chat(user, span_notice("You mend the damaged framework."))
broken_state++
update_icon()
return
@@ -223,16 +223,16 @@ GLOBAL_LIST_EMPTY(gravity_generators)
var/obj/item/stack/material/plasteel/PS = I
if(PS.get_amount() >= 10)
PS.use(10)
to_chat(user, "<span class='notice'>You add the plating to the framework.</span>")
to_chat(user, span_notice("You add the plating to the framework."))
playsound(src, 'sound/machines/click.ogg', 75, 1)
broken_state++
update_icon()
else
to_chat(user, "<span class='warning'>You need 10 sheets of plasteel!</span>")
to_chat(user, span_warning("You need 10 sheets of plasteel!"))
return
if(GRAV_NEEDS_WRENCH)
if(I.has_tool_quality(TOOL_WRENCH))
to_chat(user, "<span class='notice'>You secure the plating to the framework.</span>")
to_chat(user, span_notice("You secure the plating to the framework."))
playsound(src, I.usesound, 75, 1)
set_fix()
return
code/modules/power/lighting.dm
+11 -11
View File
@@ -67,14 +67,14 @@ var/global/list/light_type_cache = list()
else
. += "The casing has no power cell for backup power."
else
. += "<span class='danger'>This casing doesn't support power cells for backup power.</span>"
. += span_danger("This casing doesn't support power cells for backup power.")
/obj/machinery/light_construct/attack_hand(mob/user)
. = ..()
if(.)
return . // obj/machinery/attack_hand returns 1 if user can't use the machine
if(cell)
user.visible_message("[user] removes [cell] from [src]!","<span class='notice'>You remove [cell].</span>")
user.visible_message("[user] removes [cell] from [src]!",span_notice("You remove [cell]."))
user.put_in_hands(cell)
cell.update_icon()
cell = null
@@ -83,16 +83,16 @@ var/global/list/light_type_cache = list()
src.add_fingerprint(user)
if(istype(W, /obj/item/cell/emergency_light))
if(!cell_connectors)
to_chat(user, "<span class='warning'>This [name] can't support a power cell!</span>")
to_chat(user, span_warning("This [name] can't support a power cell!"))
return
if(!user.unEquip(W))
to_chat(user, "<span class='warning'>[W] is stuck to your hand!</span>")
to_chat(user, span_warning("[W] is stuck to your hand!"))
return
if(cell)
to_chat(user, "<span class='warning'>There is a power cell already installed!</span>")
to_chat(user, span_warning("There is a power cell already installed!"))
else if(user.drop_from_inventory(W))
user.visible_message("<span class='notice'>[user] hooks up [W] to [src].</span>", \
"<span class='notice'>You add [W] to [src].</span>")
user.visible_message(span_notice("[user] hooks up [W] to [src]."), \
span_notice("You add [W] to [src]."))
playsound(src, 'sound/machines/click.ogg', 50, TRUE)
W.forceMove(src)
cell = W
@@ -508,7 +508,7 @@ var/global/list/light_type_cache = list()
return
if(!(status == LIGHT_OK||status == LIGHT_BURNED))
return
visible_message("<span class='danger'>[user] smashes the light!</span>")
visible_message(span_danger("[user] smashes the light!"))
user.do_attack_animation(src)
broken()
return 1
@@ -664,7 +664,7 @@ var/global/list/light_type_cache = list()
if(W.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src]."))
if(!lamp_shade)
if(istype(W, /obj/item/lampshade))
@@ -719,7 +719,7 @@ var/global/list/light_type_cache = list()
if(!has_emergency_power(pwr))
return FALSE
if(cell.charge > 300) //it's meant to handle 120 W, ya doofus
visible_message("<span class='warning'>[src] short-circuits from too powerful of a power cell!</span>")
visible_message(span_warning("[src] short-circuits from too powerful of a power cell!"))
status = LIGHT_BURNED
installed_light.status = status
return FALSE
@@ -746,7 +746,7 @@ var/global/list/light_type_cache = list()
// ai attack - turn on/off emergency lighting for a specific fixture
/obj/machinery/light/attack_ai(mob/user)
no_emergency = !no_emergency
to_chat(user, "<span class='notice'>Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"].</span>")
to_chat(user, span_notice("Emergency lights for this fixture have been [no_emergency ? "disabled" : "enabled"]."))
update(FALSE)
return
code/modules/power/lightswitch_vr.dm
+5 -5
View File
@@ -87,17 +87,17 @@
if(stage == FRAME_UNFASTENED)
var/obj/item/weldingtool/WT = W.get_welder()
if(!WT.remove_fuel(0, user))
to_chat(user, "<span class='warning'>\The [src] must be on to complete this task.</span>")
to_chat(user, span_warning("\The [src] must be on to complete this task."))
return
playsound(src, WT.usesound, 50, 1)
user.visible_message( \
"<span class='warning'>\The [user] begins deconstructing \the [src].</span>", \
"<span class='notice'>You start deconstructing \the [src].</span>")
span_warning("\The [user] begins deconstructing \the [src]."), \
span_notice("You start deconstructing \the [src]."))
if(do_after(user, 20 * WT.toolspeed, target = src) && WT.isOn())
new /obj/item/stack/material/steel(get_turf(src), 2)
user.visible_message( \
"<span class='warning'>\The [user] has deconstructed \the [src].</span>", \
"<span class='notice'>You deconstruct \the [src].</span>")
span_warning("\The [user] has deconstructed \the [src]."), \
span_notice("You deconstruct \the [src]."))
playsound(src, 'sound/items/Deconstruct.ogg', 75, 1)
qdel(src)
else if (stage == FRAME_FASTENED)
code/modules/power/pacman2.dm
+1 -1
View File
@@ -45,7 +45,7 @@
examine(mob/user)
. = ..()
. += "<span class='notice'>The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle.</span>"
. += span_notice("The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle.")
handleInactive()
heat -= 2
code/modules/power/port_gen.dm
+8 -8
View File
@@ -67,9 +67,9 @@
. = ..()
if(Adjacent(user)) //It literally has a light on the sprite, are you sure this is necessary?
if(active)
. += "<span class='notice'>The generator is on.</span>"
. += span_notice("The generator is on.")
else
. += "<span class='notice'>The generator is off.</span>"
. += span_notice("The generator is off.")
/obj/machinery/power/port_gen/emp_act(severity)
var/duration = 6000 //ten minutes
@@ -156,9 +156,9 @@
. += "It appears to be producing [power_gen*power_output] W."
. += "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper."
if(IsBroken())
. += "<span class='warning'>It seems to have broken down.</span>"
. += span_warning("It seems to have broken down.")
if(overheating)
. += "<span class='danger'>It is overheating!</span>"
. += span_danger("It is overheating!")
/obj/machinery/power/port_gen/pacman/HasFuel()
var/needed_sheets = power_output / time_per_sheet
@@ -273,9 +273,9 @@
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.get_amount())
if(amount < 1)
to_chat(user, "<span class='warning'>The [src.name] is full!</span>")
to_chat(user, span_warning("The [src.name] is full!"))
return
to_chat(user, "<span class='notice'>You add [amount] sheet\s to the [src.name].</span>")
to_chat(user, span_notice("You add [amount] sheet\s to the [src.name]."))
sheets += amount
addstack.use(amount)
updateUsrDialog()
@@ -284,10 +284,10 @@
if(O.has_tool_quality(TOOL_WRENCH))
if(!anchored)
connect_to_network()
to_chat(user, "<span class='notice'>You secure the generator to the floor.</span>")
to_chat(user, span_notice("You secure the generator to the floor."))
else
disconnect_from_network()
to_chat(user, "<span class='notice'>You unsecure the generator from the floor.</span>")
to_chat(user, span_notice("You unsecure the generator from the floor."))
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
anchored = !anchored
return
code/modules/power/port_gen_vr.dm
+10 -10
View File
@@ -116,7 +116,7 @@
/obj/machinery/power/rtg/examine(mob/user)
. = ..()
if(Adjacent(user, src) || isobserver(user))
. += "<span class='notice'>The status display reads: Power generation now at <b>[power_gen*0.001]</b>kW.</span>"
. += span_notice("The status display reads: Power generation now at <b>[power_gen*0.001]</b>kW.")
/obj/machinery/power/rtg/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, I))
@@ -179,8 +179,8 @@
if(going_kaboom)
return
going_kaboom = TRUE
visible_message("<span class='danger'>\The [src] lets out an shower of sparks as it starts to lose stability!</span>",\
"<span class='italics'>You hear a loud electrical crack!</span>")
visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\
span_italics("You hear a loud electrical crack!"))
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_gen * 0.05)
addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
@@ -285,8 +285,8 @@
can_buckle = FALSE
/obj/machinery/power/rtg/kugelblitz/proc/asplod()
visible_message("<span class='danger'>\The [src] lets out an shower of sparks as it starts to lose stability!</span>",\
"<span class='italics'>You hear a loud electrical crack!</span>")
visible_message(span_danger("\The [src] lets out an shower of sparks as it starts to lose stability!"),\
span_italics("You hear a loud electrical crack!"))
playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
var/turf/T = get_turf(src)
qdel(src)
@@ -339,7 +339,7 @@
/obj/machinery/power/rtg/reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE)
. = ..()
M.pixel_y = 8
M.visible_message("<span class='notice'>\The [M], hops up onto \the [src] and begins running!</span>")
M.visible_message(span_notice("\The [M], hops up onto \the [src] and begins running!"))
/obj/machinery/power/rtg/reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE)
. = ..()
@@ -380,7 +380,7 @@
/obj/machinery/power/rtg/reg/proc/runner_process(var/mob/living/runner)
if(runner.stat != CONSCIOUS)
unbuckle_mob(runner)
runner.visible_message("<span class='warning'>\The [runner], topples off of \the [src]!</span>")
runner.visible_message(span_warning("\The [runner], topples off of \the [src]!"))
return
var/cool_rotations
if(ishuman(runner))
@@ -407,7 +407,7 @@
cool_rotations *= 0.25
else //TOO HUNGY IT TIME TO STOP!!!
unbuckle_mob(runner)
runner.visible_message("<span class='notice'>\The [runner], panting and exhausted hops off of \the [src]!</span>")
runner.visible_message(span_notice("\The [runner], panting and exhausted hops off of \the [src]!"))
if(part_mult > 1)
cool_rotations += (cool_rotations * (part_mult - 1)) / 4
power_gen = cool_rotations
@@ -497,9 +497,9 @@
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.get_amount())
if(amount < 1)
to_chat(user, "<span class='warning'>The [src.name] is full!</span>")
to_chat(user, span_warning("The [src.name] is full!"))
return
to_chat(user, "<span class='notice'>You add [amount] sheet\s to the [src.name].</span>")
to_chat(user, span_notice("You add [amount] sheet\s to the [src.name]."))
sheets += amount
addstack.use(amount)
update_icon()
code/modules/power/singularity/act.dm
+1 -1
View File
@@ -33,7 +33,7 @@
to_chat(src, "<span class = 'warning'>The [S] pulls \the [hand] from your grip!</span>")
if(!lying && (!shoes || !(shoes.item_flags & NOSLIP)) && (!species || !(species.flags & NOSLIP)) && prob(current_size*5))
to_chat(src, "<span class='danger'>A strong gravitational force slams you to the ground!</span>")
to_chat(src, span_danger("A strong gravitational force slams you to the ground!"))
Weaken(current_size)
..()
code/modules/power/singularity/emitter.dm
+22 -22
View File
@@ -93,9 +93,9 @@
investigate_log("turned <font color='green'>on</font> by [user.key]","singulo")
update_icon()
else
to_chat(user, "<span class='warning'>The controls are locked!</span>")
to_chat(user, span_warning("The controls are locked!"))
else
to_chat(user, "<span class='warning'>\The [src] needs to be firmly secured to the floor first.</span>")
to_chat(user, span_warning("\The [src] needs to be firmly secured to the floor first."))
return 1
@@ -177,7 +177,7 @@
src.anchored = FALSE
disconnect_from_network()
if(2)
to_chat(user, "<span class='warning'>\The [src] needs to be unwelded from the floor.</span>")
to_chat(user, span_warning("\The [src] needs to be unwelded from the floor."))
update_icon() // VOREStation Add
return
@@ -188,7 +188,7 @@
return
switch(state)
if(0)
to_chat(user, "<span class='warning'>\The [src] needs to be wrenched to the floor.</span>")
to_chat(user, span_warning("\The [src] needs to be wrenched to the floor."))
if(1)
if (WT.remove_fuel(0,user))
playsound(src, WT.usesound, 50, 1)
@@ -201,7 +201,7 @@
to_chat(user, "You weld [src] to the floor.")
connect_to_network()
else
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
to_chat(user, span_warning("You need more welding fuel to complete this task."))
if(2)
if (WT.remove_fuel(0,user))
playsound(src, WT.usesound, 50, 1)
@@ -214,39 +214,39 @@
to_chat(user, "You cut [src] free from the floor.")
disconnect_from_network()
else
to_chat(user, "<span class='warning'>You need more welding fuel to complete this task.</span>")
to_chat(user, span_warning("You need more welding fuel to complete this task."))
update_icon() // VOREStation Add
return
if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_STEEL)
var/amt = CEILING(( initial(integrity) - integrity)/10, 1)
if(!amt)
to_chat(user, "<span class='notice'>\The [src] is already fully repaired.</span>")
to_chat(user, span_notice("\The [src] is already fully repaired."))
return
var/obj/item/stack/P = W
if(!P.can_use(amt))
to_chat(user, "<span class='warning'>You don't have enough sheets to repair this! You need at least [amt] sheets.</span>")
to_chat(user, span_warning("You don't have enough sheets to repair this! You need at least [amt] sheets."))
return
to_chat(user, "<span class='notice'>You begin repairing \the [src]...</span>")
to_chat(user, span_notice("You begin repairing \the [src]..."))
if(do_after(user, 30))
if(P.use(amt))
to_chat(user, "<span class='notice'>You have repaired \the [src].</span>")
to_chat(user, span_notice("You have repaired \the [src]."))
integrity = initial(integrity)
return
else
to_chat(user, "<span class='warning'>You don't have enough sheets to repair this! You need at least [amt] sheets.</span>")
to_chat(user, span_warning("You don't have enough sheets to repair this! You need at least [amt] sheets."))
return
if(istype(W, /obj/item/card/id) || istype(W, /obj/item/pda))
if(emagged)
to_chat(user, "<span class='warning'>The lock seems to be broken.</span>")
to_chat(user, span_warning("The lock seems to be broken."))
return
if(src.allowed(user))
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
update_icon() // VOREStation Add
else
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, span_warning("Access denied."))
return
..()
return
@@ -255,7 +255,7 @@
if(!emagged)
locked = 0
emagged = 1
user.visible_message("[user.name] emags [src].","<span class='warning'>You short out the lock.</span>")
user.visible_message("[user.name] emags [src].",span_warning("You short out the lock."))
return 1
/obj/machinery/power/emitter/bullet_act(var/obj/item/projectile/P)
@@ -271,10 +271,10 @@
integrity = between(0, integrity + amount, initial(integrity))
if(integrity == 0)
if(powernet && avail(active_power_usage)) // If it's powered, it goes boom if killed.
visible_message(src, "<span class='danger'>\The [src] explodes violently!</span>", "<span class='danger'>You hear an explosion!</span>")
visible_message(src, span_danger("\The [src] explodes violently!"), span_danger("You hear an explosion!"))
explosion(get_turf(src), 1, 2, 4)
else
src.visible_message("<span class='danger'>\The [src] crumples apart!</span>", "<span class='warning'>You hear metal collapsing.</span>")
src.visible_message(span_danger("\The [src] crumples apart!"), span_warning("You hear metal collapsing."))
if(src)
qdel(src)
@@ -282,19 +282,19 @@
. = ..()
switch(state)
if(0)
. += "<span class='warning'>It is not secured in place!</span>"
. += span_warning("It is not secured in place!")
if(1)
. += "<span class='warning'>It has been bolted down securely, but not welded into place.</span>"
. += span_warning("It has been bolted down securely, but not welded into place.")
if(2)
. += "<span class='notice'>It has been bolted down securely and welded down into place.</span>"
. += span_notice("It has been bolted down securely and welded down into place.")
var/integrity_percentage = round((integrity / initial(integrity)) * 100)
switch(integrity_percentage)
if(0 to 30)
. += "<span class='danger'>It is close to falling apart!</span>"
. += span_danger("It is close to falling apart!")
if(31 to 70)
. += "<span class='danger'>It is damaged.</span>"
. += span_danger("It is damaged.")
if(77 to 99)
. += "<span class='warning'>It is slightly damaged.</span>"
. += span_warning("It is slightly damaged.")
//R-UST port
/obj/machinery/power/emitter/proc/get_initial_fire_delay()
code/modules/power/singularity/field_generator.dm
+3 -3
View File
@@ -44,11 +44,11 @@ field_generator power level display
. = ..()
switch(state)
if(0)
. += "<span class='warning'>It is not secured in place!</span>"
. += span_warning("It is not secured in place!")
if(1)
. += "<span class='warning'>It has been bolted down securely, but not welded into place.</span>"
. += span_warning("It has been bolted down securely, but not welded into place.")
if(2)
. += "<span class='notice'>It has been bolted down securely and welded down into place.</span>"
. += span_notice("It has been bolted down securely and welded down into place.")
/obj/machinery/field_generator/update_icon()
cut_overlays()
code/modules/power/singularity/generator.dm
+5 -5
View File
@@ -13,9 +13,9 @@
/obj/machinery/the_singularitygen/examine()
. = ..()
if(anchored)
. += "<span class='notice'>It has been securely bolted down and is ready for operation.</span>"
. += span_notice("It has been securely bolted down and is ready for operation.")
else
. += "<span class='warning'>It is not secured!</span>"
. += span_warning("It is not secured!")
/obj/machinery/the_singularitygen/process()
var/turf/T = get_turf(src)
@@ -41,12 +41,12 @@
playsound(src, W.usesound, 50, 1)
visible_message("<b>\The [user]</b> adjusts \the [src]'s mechanisms.")
if(panel_open && do_after(user, 30))
to_chat(user, "<span class='notice'>\The [src] looks like it could be modified.</span>")
to_chat(user, span_notice("\The [src] looks like it could be modified."))
if(panel_open && do_after(user, 80 * W.toolspeed)) // We don't have skills, so a delayed hint for engineers will have to do for now. (Panel open check for sanity)
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='cult'>\The [src] looks like it could be adapted to forge advanced materials via particle acceleration, somehow..</span>")
to_chat(user, span_cult("\The [src] looks like it could be adapted to forge advanced materials via particle acceleration, somehow.."))
else
to_chat(user, "<span class='notice'>\The [src]'s mechanisms look secure.</span>")
to_chat(user, span_notice("\The [src]'s mechanisms look secure."))
if(istype(W, /obj/item/smes_coil/super_io) && panel_open)
visible_message("<b>\The [user]</b> begins to modify \the [src] with \the [W].")
if(do_after(user, 300))
code/modules/power/singularity/particle_accelerator/particle_control.dm
+1 -1
View File
@@ -202,7 +202,7 @@
/obj/machinery/particle_accelerator/control_box/proc/is_interactive(mob/user)
if(!interface_control)
to_chat(user, "<span class='alert'>ERROR: Request timed out. Check wire contacts.</span>")
to_chat(user, span_alert("ERROR: Request timed out. Check wire contacts."))
return FALSE
if(construction_state != 3)
return FALSE
code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+8 -8
View File
@@ -42,12 +42,12 @@
/obj/machinery/particle_smasher/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "<span class='notice'>\The [src] contains:</span>"
. += span_notice("\The [src] contains:")
for(var/obj/item/I in contents)
. += "<span class='notice'>\the [I]</span>"
. += span_notice("\the [I]")
/obj/machinery/particle_smasher/atmosanalyze(var/mob/user)
return list("<span class='notice'>\The [src] reads an energy level of [energy].</span>")
return list(span_notice("\The [src] reads an energy level of [energy]."))
/obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob)
if(W.type == /obj/item/analyzer)
@@ -55,14 +55,14 @@
else if(istype(W, /obj/item/stack/material))
var/obj/item/stack/material/M = W
if(M.uses_charge)
to_chat(user, "<span class='notice'>You cannot fill \the [src] with a synthesizer!</span>")
to_chat(user, span_notice("You cannot fill \the [src] with a synthesizer!"))
return
target = M.split(1)
target.forceMove(src)
update_icon()
else if(istype(W, beaker_type))
if(reagent_container)
to_chat(user, "<span class='notice'>\The [src] already has a container attached.</span>")
to_chat(user, span_notice("\The [src] already has a container attached."))
return
if(isrobot(user) && istype(W.loc, /obj/item/gripper))
var/obj/item/gripper/G = W.loc
@@ -71,7 +71,7 @@
user.drop_from_inventory(W)
reagent_container = W
reagent_container.forceMove(src)
to_chat(user, "<span class='notice'>You add \the [reagent_container] to \the [src].</span>")
to_chat(user, span_notice("You add \the [reagent_container] to \the [src]."))
update_icon()
return
else if(W.has_tool_quality(TOOL_WRENCH))
@@ -88,7 +88,7 @@
update_icon()
return
else if(istype(W, /obj/item/card/id))
to_chat(user, "<span class='notice'>Swiping \the [W] on \the [src] doesn't seem to do anything...</span>")
to_chat(user, span_notice("Swiping \the [W] on \the [src] doesn't seem to do anything..."))
return ..()
else if(((isrobot(user) && istype(W.loc, /obj/item/gripper)) || (!isrobot(user) && W.canremove)) && storage.len < max_storage)
if(isrobot(user) && istype(W.loc, /obj/item/gripper))
@@ -182,7 +182,7 @@
return
if(successful_craft)
visible_message("<span class='warning'>\The [src] fizzles.</span>")
visible_message(span_warning("\The [src] fizzles."))
if(prob(33)) // Why are you blasting it after it's already done!
SSradiation.radiate(src, 10 + round(src.energy / 60, 1))
energy = max(0, energy - 30)
code/modules/power/singularity/singularity.dm
+12 -12
View File
@@ -135,7 +135,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
overlays = 0
if(chained)
overlays = "chain_s1"
visible_message("<span class='notice'>The singularity has shrunk to a rather pitiful size.</span>")
visible_message(span_notice("The singularity has shrunk to a rather pitiful size."))
if (STAGE_TWO) //1 to 3 does not check for the turfs if you put the gens right next to a 1x1 then its going to eat them.
name = "gravitational singularity"
desc = "A gravitational singularity."
@@ -153,9 +153,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if(chained)
overlays = "chain_s3"
if(growing)
visible_message("<span class='notice'>The singularity noticeably grows in size.</span>")
visible_message(span_notice("The singularity noticeably grows in size."))
else
visible_message("<span class='notice'>The singularity has shrunk to a less powerful size.</span>")
visible_message(span_notice("The singularity has shrunk to a less powerful size."))
if (STAGE_THREE)
if ((check_turfs_in(1, 2)) && (check_turfs_in(2, 2)) && (check_turfs_in(4, 2)) && (check_turfs_in(8, 2)))
name = "gravitational singularity"
@@ -174,9 +174,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if(chained)
overlays = "chain_s5"
if(growing)
visible_message("<span class='notice'>The singularity expands to a reasonable size.</span>")
visible_message(span_notice("The singularity expands to a reasonable size."))
else
visible_message("<span class='notice'>The singularity has returned to a safe size.</span>")
visible_message(span_notice("The singularity has returned to a safe size."))
if(STAGE_FOUR)
if ((check_turfs_in(1, 3)) && (check_turfs_in(2, 3)) && (check_turfs_in(4, 3)) && (check_turfs_in(8, 3)))
name = "gravitational singularity"
@@ -195,9 +195,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if(chained)
overlays = "chain_s7"
if(growing)
visible_message("<span class='warning'>The singularity expands to a dangerous size.</span>")
visible_message(span_warning("The singularity expands to a dangerous size."))
else
visible_message("<span class='notice'>Miraculously, the singularity reduces in size, and can be contained.</span>")
visible_message(span_notice("Miraculously, the singularity reduces in size, and can be contained."))
if(STAGE_FIVE) //This one also lacks a check for gens because it eats everything.
name = "gravitational singularity"
desc = "A gravitational singularity."
@@ -213,9 +213,9 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if(chained)
overlays = "chain_s9"
if(growing)
visible_message("<span class='danger'><font size='2'>The singularity has grown out of control!</font></span>")
visible_message(span_danger("<font size='2'>The singularity has grown out of control!</font>"))
else
visible_message("<span class='warning'>The singularity miraculously reduces in size and loses its supermatter properties.</span>")
visible_message(span_warning("The singularity miraculously reduces in size and loses its supermatter properties."))
if(STAGE_SUPER)//SUPERSINGULO
name = "super gravitational singularity"
desc = "A gravitational singularity with the properties of supermatter. <b>It has the power to destroy worlds.</b>"
@@ -230,7 +230,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
event_chance = 25 //Events will fire off more often.
if(chained)
overlays = "chain_s9"
visible_message("<span class='sinister'><font size='3'>You witness the creation of a destructive force that cannot possibly be stopped by human hands.</font></span>")
visible_message(span_sinister("<font size='3'>You witness the creation of a destructive force that cannot possibly be stopped by human hands.</font>"))
if (current_size == allowed_size)
investigate_log("<font color='red'>grew to size [current_size].</font>", I_SINGULO)
@@ -431,10 +431,10 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
return
else
to_chat(H, "<span class=\"warning\">You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!</span>")
to_chat(M, "<span class='danger'>You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"].</span>")
to_chat(M, span_danger("You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"]."))
M.apply_effect(3, STUN)
for(var/mob/O in viewers(M, null))
O.show_message(text("<span class='danger'>[] stares blankly at The []!</span>", M, src), 1)
O.show_message(span_danger("[M] stares blankly at The [src]!"), 1)
/obj/singularity/proc/emp_area()
if(current_size != STAGE_SUPER)
code/modules/power/smes.dm
+23 -23
View File
@@ -220,7 +220,7 @@ GLOBAL_LIST_EMPTY(smeses)
//Will return 1 on failure
/obj/machinery/power/smes/proc/make_terminal(const/mob/user)
if (user.loc == loc)
to_chat(user, "<span class='filter_notice'><span class='warning'>You must not be on the same tile as the [src].</span></span>")
to_chat(user, span_filter_notice(span_warning("You must not be on the same tile as the [src].")))
return 1
//Direction the terminal will face to
@@ -232,15 +232,15 @@ GLOBAL_LIST_EMPTY(smeses)
tempDir = WEST
var/turf/tempLoc = get_step(src, reverse_direction(tempDir))
if (istype(tempLoc, /turf/space))
to_chat(user, "<span class='filter_notice'><span class='warning'>You can't build a terminal on space.</span></span>")
to_chat(user, span_filter_notice(span_warning("You can't build a terminal on space.")))
return 1
else if (istype(tempLoc))
if(!tempLoc.is_plating())
to_chat(user, "<span class='filter_notice'><span class='warning'>You must remove the floor plating first.</span></span>")
to_chat(user, span_filter_notice(span_warning("You must remove the floor plating first.")))
return 1
if(check_terminal_exists(tempLoc, user, tempDir))
return 1
to_chat(user, "<span class='filter_notice'><span class='notice'>You start adding cable to the [src].</span></span>")
to_chat(user, span_filter_notice(span_notice("You start adding cable to the [src].")))
if(do_after(user, 50))
if(check_terminal_exists(tempLoc, user, tempDir))
return 1
@@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(smeses)
/obj/machinery/power/smes/proc/check_terminal_exists(var/turf/location, var/mob/user, var/direction)
for(var/obj/machinery/power/terminal/term in location)
if(term.dir == direction)
to_chat(user, "<span class='filter_notice'><span class='notice'>There is already a terminal here.</span></span>")
to_chat(user, span_filter_notice(span_notice("There is already a terminal here.")))
return 1
return 0
@@ -284,26 +284,26 @@ GLOBAL_LIST_EMPTY(smeses)
return FALSE
if (!panel_open)
to_chat(user, "<span class='filter_notice'><span class='warning'>You need to open access hatch on [src] first!</span></span>")
to_chat(user, span_filter_notice(span_warning("You need to open access hatch on [src] first!")))
return FALSE
if(W.has_tool_quality(TOOL_WELDER))
var/obj/item/weldingtool/WT = W.get_welder()
if(!WT.isOn())
to_chat(user, "<span class='filter_notice'>Turn on \the [WT] first!</span>")
to_chat(user, span_filter_notice("Turn on \the [WT] first!"))
return FALSE
if(!damage)
to_chat(user, "<span class='filter_notice'>\The [src] is already fully repaired.</span>")
to_chat(user, span_filter_notice("\The [src] is already fully repaired."))
return FALSE
if(WT.remove_fuel(0,user) && do_after(user, damage, src))
to_chat(user, "<span class='filter_notice'>You repair all structural damage to \the [src]</span>")
to_chat(user, span_filter_notice("You repair all structural damage to \the [src]"))
damage = 0
return FALSE
else if(istype(W, /obj/item/stack/cable_coil) && !building_terminal)
building_terminal = 1
var/obj/item/stack/cable_coil/CC = W
if (CC.get_amount() < 10)
to_chat(user, "<span class='filter_notice'><span class='warning'>You need more cables.</span></span>")
to_chat(user, span_filter_notice(span_warning("You need more cables.")))
building_terminal = 0
return FALSE
if (make_terminal(user))
@@ -312,8 +312,8 @@ GLOBAL_LIST_EMPTY(smeses)
building_terminal = 0
CC.use(10)
user.visible_message(\
"<span class='filter_notice'><span class='notice'>[user.name] has added cables to the [src].</span></span>",\
"<span class='filter_notice'><span class='notice'>You added cables to the [src].</span></span>")
span_filter_notice(span_notice("[user.name] has added cables to the [src].")),\
span_filter_notice(span_notice("You added cables to the [src].")))
stat = 0
if(!powernet)
connect_to_network()
@@ -327,15 +327,15 @@ GLOBAL_LIST_EMPTY(smeses)
term = T
break
if(!term)
to_chat(user, "<span class='filter_notice'><span class='warning'>There is no terminal on this tile.</span></span>")
to_chat(user, span_filter_notice(span_warning("There is no terminal on this tile.")))
building_terminal = FALSE
return FALSE
var/turf/tempTDir = get_turf(term)
if (istype(tempTDir))
if(!tempTDir.is_plating())
to_chat(user, "<span class='filter_notice'><span class='warning'>You must remove the floor plating first.</span></span>")
to_chat(user, span_filter_notice(span_warning("You must remove the floor plating first.")))
else
to_chat(user, "<span class='filter_notice'><span class='notice'>You begin to cut the cables...</span></span>")
to_chat(user, span_filter_notice(span_notice("You begin to cut the cables...")))
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50 * W.toolspeed))
if (prob(50) && electrocute_mob(usr, term.powernet, term))
@@ -347,8 +347,8 @@ GLOBAL_LIST_EMPTY(smeses)
return FALSE
new /obj/item/stack/cable_coil(loc,10)
user.visible_message(\
"<span class='filter_notice'><span class='notice'>[user.name] cut the cables and dismantled the power terminal.</span></span>",\
"<span class='filter_notice'><span class='notice'>You cut the cables and dismantle the power terminal.</span></span>")
span_filter_notice(span_notice("[user.name] cut the cables and dismantled the power terminal.")),\
span_filter_notice(span_notice("You cut the cables and dismantle the power terminal.")))
terminals -= term
qdel(term)
building_terminal = FALSE
@@ -438,7 +438,7 @@ GLOBAL_LIST_EMPTY(smeses)
amount = max(0, round(amount))
damage += amount
if(damage > maxdamage)
visible_message("<span class='filter_notice'><span class='danger'>\The [src] explodes in large shower of sparks and smoke!</span></span>")
visible_message(span_filter_notice(span_danger("\The [src] explodes in large shower of sparks and smoke!")))
// Depending on stored charge percentage cause damage.
switch(Percentage())
if(75 to INFINITY)
@@ -470,19 +470,19 @@ GLOBAL_LIST_EMPTY(smeses)
/obj/machinery/power/smes/examine(var/mob/user)
. = ..()
. += "<span class='filter_notice'>The service hatch is [panel_open ? "open" : "closed"].</span>"
. += span_filter_notice("The service hatch is [panel_open ? "open" : "closed"].")
if(!damage)
return
var/damage_percentage = round((damage / maxdamage) * 100)
switch(damage_percentage)
if(75 to INFINITY)
. += "<span class='filter_notice'><span class='danger'>It's casing is severely damaged, and sparking circuitry may be seen through the holes!</span></span>"
. += span_filter_notice(span_danger("It's casing is severely damaged, and sparking circuitry may be seen through the holes!"))
if(50 to 74)
. += "<span class='filter_notice'><span class='notice'>It's casing is considerably damaged, and some of the internal circuits appear to be exposed!</span></span>"
. += span_filter_notice(span_notice("It's casing is considerably damaged, and some of the internal circuits appear to be exposed!"))
if(25 to 49)
. += "<span class='filter_notice'><span class='notice'>It's casing is quite seriously damaged.</span></span>"
. += span_filter_notice(span_notice("It's casing is quite seriously damaged."))
if(0 to 24)
. += "<span class='filter_notice'>It's casing has some minor damage.</span>"
. += span_filter_notice("It's casing has some minor damage.")
// Proc: toggle_input()
code/modules/power/smes_construction.dm
+7 -7
View File
@@ -113,7 +113,7 @@
if(RCon)
..()
else // RCON wire cut
to_chat(usr, "<span class='warning'>Connection error: Destination Unreachable.</span>")
to_chat(usr, span_warning("Connection error: Destination Unreachable."))
// Cyborgs standing next to the SMES can play with the wiring.
if(istype(usr, /mob/living/silicon/robot) && Adjacent(usr) && panel_open)
@@ -303,7 +303,7 @@
/obj/machinery/power/smes/buildable/attackby(var/obj/item/W as obj, var/mob/user as mob)
// No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences.
if (failing)
to_chat(user, "<span class='warning'>The [src]'s indicator lights are flashing wildly. It seems to be overloaded! Touching it now is probably not a good idea.</span>")
to_chat(user, span_warning("The [src]'s indicator lights are flashing wildly. It seems to be overloaded! Touching it now is probably not a good idea."))
return
// If parent returned 1:
// - Hatch is open, so we can modify the SMES
@@ -316,15 +316,15 @@
newtag = sanitize(newtag,MAX_NAME_LEN)
if(newtag)
RCon_tag = newtag
to_chat(user, "<span class='notice'>You changed the RCON tag to: [newtag]</span>")
to_chat(user, span_notice("You changed the RCON tag to: [newtag]"))
return
// Charged above 1% and safeties are enabled.
if((charge > (capacity/100)) && safeties_enabled)
to_chat(user, "<span class='warning'>The safety circuit of [src] is preventing modifications while there is charge stored!</span>")
to_chat(user, span_warning("The safety circuit of [src] is preventing modifications while there is charge stored!"))
return
if (output_attempt || input_attempt)
to_chat(user, "<span class='warning'>Turn off the [src] first!</span>")
to_chat(user, span_warning("Turn off the [src] first!"))
return
// Probability of failure if safety circuit is disabled (in %)
@@ -337,11 +337,11 @@
// Crowbar - Disassemble the SMES.
if(W.has_tool_quality(TOOL_CROWBAR))
if (terminals.len)
to_chat(user, "<span class='warning'>You have to disassemble the terminal first!</span>")
to_chat(user, span_warning("You have to disassemble the terminal first!"))
return
playsound(src, W.usesound, 50, 1)
to_chat(user, "<span class='warning'>You begin to disassemble the [src]!</span>")
to_chat(user, span_warning("You begin to disassemble the [src]!"))
if (do_after(usr, (100 * cur_coils) * W.toolspeed)) // More coils = takes longer to disassemble. It's complex so largest one with 5 coils will take 50s with a normal crowbar
if (failure_probability && prob(failure_probability))
code/modules/power/smes_vr.dm
+2 -2
View File
@@ -7,7 +7,7 @@
/obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_WIRECUTTER))
to_chat(user,"<span class='warning'>\The [src] full of weird alien technology that's best not messed with.</span>")
to_chat(user,span_warning("\The [src] full of weird alien technology that's best not messed with."))
return 0
/obj/machinery/power/smes/buildable/hybrid/update_icon()
@@ -33,4 +33,4 @@
charge += min(recharge_rate, capacity - charge)
..()
//hey travis wake up
//hey travis wake up
code/modules/power/solar.dm
+8 -8
View File
@@ -60,13 +60,13 @@ GLOBAL_LIST_EMPTY(solars_list)
if(W.has_tool_quality(TOOL_CROWBAR))
playsound(src, 'sound/machines/click.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] begins to take the glass off the solar panel.</span>")
user.visible_message(span_notice("[user] begins to take the glass off the solar panel."))
if(do_after(user, 50))
var/obj/item/solar_assembly/S = new(loc)
S.anchored = TRUE
new glass_type(loc, 2)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] takes the glass off the solar panel.</span>")
user.visible_message(span_notice("[user] takes the glass off the solar panel."))
qdel(src)
return
else if (W)
@@ -209,13 +209,13 @@ GLOBAL_LIST_EMPTY(solars_list)
if(!anchored)
if(W.has_tool_quality(TOOL_WRENCH))
anchored = TRUE
user.visible_message("<span class='notice'>[user] wrenches the solar assembly into place.</span>")
user.visible_message(span_notice("[user] wrenches the solar assembly into place."))
playsound(src, W.usesound, 75, 1)
return 1
else
if(W.has_tool_quality(TOOL_WRENCH))
anchored = FALSE
user.visible_message("<span class='notice'>[user] unwrenches the solar assembly from it's place.</span>")
user.visible_message(span_notice("[user] unwrenches the solar assembly from it's place."))
playsound(src, W.usesound, 75, 1)
return 1
@@ -223,14 +223,14 @@ GLOBAL_LIST_EMPTY(solars_list)
var/obj/item/stack/material/S = W
if(S.use(2))
playsound(src, 'sound/machines/click.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] places the glass on the solar assembly.</span>")
user.visible_message(span_notice("[user] places the glass on the solar assembly."))
if(tracker)
new /obj/machinery/power/tracker(get_turf(src), W.type)
else
new /obj/machinery/power/solar(get_turf(src), W.type)
qdel(src)
else
to_chat(user, "<span class='warning'>You need two sheets of glass to put them into a solar panel.</span>")
to_chat(user, span_warning("You need two sheets of glass to put them into a solar panel."))
return
return 1
@@ -239,13 +239,13 @@ GLOBAL_LIST_EMPTY(solars_list)
tracker = 1
user.drop_item()
qdel(W)
user.visible_message("<span class='notice'>[user] inserts the electronics into the solar assembly.</span>")
user.visible_message(span_notice("[user] inserts the electronics into the solar assembly."))
return 1
else
if(W.has_tool_quality(TOOL_CROWBAR))
new /obj/item/tracker_electronics(src.loc)
tracker = 0
user.visible_message("<span class='notice'>[user] takes out the electronics from the solar assembly.</span>")
user.visible_message(span_notice("[user] takes out the electronics from the solar assembly."))
return 1
..()
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -188,7 +188,7 @@
continue
mob.Weaken(DETONATION_MOB_CONCUSSION)
to_chat(mob, "<span class='danger'>An invisible force slams you against the ground!</span>")
to_chat(mob, span_danger("An invisible force slams you against the ground!"))
// Effect 2: Z-level wide electrical pulse
for(var/obj/machinery/power/apc/A in GLOB.apcs)
code/modules/power/tesla/coil.dm
+4 -4
View File
@@ -25,9 +25,9 @@
/obj/machinery/power/tesla_coil/examine()
. = ..()
if(anchored)
. += "<span class='notice'>It has been securely bolted down and is ready for operation.</span>"
. += span_notice("It has been securely bolted down and is ready for operation.")
else
. += "<span class='warning'>It is not secured!</span>"
. += span_warning("It is not secured!")
/obj/machinery/power/tesla_coil/New()
..()
@@ -240,9 +240,9 @@
/obj/machinery/power/grounding_rod/examine()
. = ..()
if(anchored)
. += "<span class='notice'>It has been securely bolted down and is ready for operation.</span>"
. += span_notice("It has been securely bolted down and is ready for operation.")
else
. += "<span class='warning'>It is not secured!</span>"
. += span_warning("It is not secured!")
/obj/machinery/power/grounding_rod/pre_mapped
anchored = TRUE
code/modules/power/tesla/tesla_act.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/obj/structure/closet/tesla_act(var/power)
..() //extend the zap
visible_message("<span class='danger'>[src] is blown apart by the bolt of electricity!</span>", "<span class='danger'>You hear a metallic screeching sound.</span>")
visible_message(span_danger("[src] is blown apart by the bolt of electricity!"), span_danger("You hear a metallic screeching sound."))
dump_contents()
qdel(src)
code/modules/power/tracker.dm
+2 -2
View File
@@ -55,14 +55,14 @@
if(W.has_tool_quality(TOOL_CROWBAR))
playsound(src, 'sound/machines/click.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] begins to take the glass off the solar tracker.</span>")
user.visible_message(span_notice("[user] begins to take the glass off the solar tracker."))
if(do_after(user, 50))
var/obj/item/solar_assembly/S = new(loc)
S.tracker = TRUE
S.anchored = TRUE
new glass_type(loc, 2)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] takes the glass off the tracker.</span>")
user.visible_message(span_notice("[user] takes the glass off the tracker."))
qdel(src)
return
..()
code/modules/power/turbine.dm
+4 -4
View File
@@ -138,10 +138,10 @@
inturf = get_step(src, dir)
locate_machinery()
if(turbine)
to_chat(user, "<span class='notice'>Turbine connected.</span>")
to_chat(user, span_notice("Turbine connected."))
stat &= ~BROKEN
else
to_chat(user, "<span class='alert'>Turbine not connected.</span>")
to_chat(user, span_alert("Turbine not connected."))
stat |= BROKEN
/obj/machinery/compressor/process()
@@ -236,10 +236,10 @@
outturf = get_step(src, dir)
locate_machinery()
if(compressor)
to_chat(user, "<span class='notice'>Compressor connected.</span>")
to_chat(user, span_notice("Compressor connected."))
stat &= ~BROKEN
else
to_chat(user, "<span class='alert'>Compressor not connected.</span>")
to_chat(user, span_alert("Compressor not connected."))
stat |= BROKEN
/obj/machinery/power/turbine/process()