mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-22 12:46:40 +01:00
Macro Replacements. (#3574)
* A preface to my madness Travis failed one of my PR's because I copied old code that used /red /blue /green. Because of this, I am going to find and replace every instance of it that I find. Also this is a test commit to make sure I'm comitting to the correct branch. * /blue /green /red replacements Dear god. A slow and painful death from acid is more fun than this. I wouldn't wish this torture on my worst enemy. And this is only the beginning * Replace part 2. Time to fix the human error. * Fixes mismatches * Sets macro count to 220 One above the current number of macros in the code. * Fixes last of the mismatches. * Removes spaces, replaces \black Removes spaces Replaces \black in a few areas where seen Replaces \bold with <B> </B> where seen * Updating macro count again * More fixes! * Issues fixed! For real this time! I swear! * Fixing all the merge conflict files.
This commit is contained in:
@@ -156,12 +156,12 @@
|
||||
src.anchored = 0
|
||||
disconnect_from_network()
|
||||
else
|
||||
user << "\red Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!"
|
||||
user << "<font color='red'>Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!</font>"
|
||||
return
|
||||
|
||||
if(istype(W, /obj/item/weapon/am_containment))
|
||||
if(fueljar)
|
||||
user << "\red There is already a [fueljar] inside!"
|
||||
user << "<font color='red'>There is already a [fueljar] inside!</font>"
|
||||
return
|
||||
fueljar = W
|
||||
user.remove_from_mob(W)
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
antiH_fuel = residual_matter
|
||||
|
||||
for(var/mob/M in hearers(src, null))
|
||||
M.show_message(text("\red You hear a loud bang!"))
|
||||
M.show_message(text("<font color='red'>You hear a loud bang!</font>"))
|
||||
|
||||
//Q = k x (delta T)
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
|
||||
if(energy > convert2energy(8e-12)) //TOO MUCH ENERGY
|
||||
for(var/mob/M in hearers(src, null))
|
||||
M.show_message(text("\red You hear a loud whirring!"))
|
||||
M.show_message(text("<font color='red'>You hear a loud whirring!</font>"))
|
||||
sleep(20)
|
||||
|
||||
//Q = k x (delta T)
|
||||
@@ -180,7 +180,7 @@
|
||||
|
||||
if(energy > convert2energy(8e-12)) //FAR TOO MUCH ENERGY STILL
|
||||
for(var/mob/M in hearers(src, null))
|
||||
M.show_message(text("\red <big>BANG!</big>"))
|
||||
M.show_message(text("<font color='red'><big>BANG!</big></font>"))
|
||||
new /obj/effect/bhole(src.loc)
|
||||
|
||||
else //this amount of energy is okay so it does the proper output thing
|
||||
|
||||
@@ -74,9 +74,9 @@
|
||||
/obj/item/weapon/fuel/proc/injest(mob/M as mob)
|
||||
switch(content)
|
||||
if("Anti-Hydrogen")
|
||||
M.gib()
|
||||
M.gib() //Yikes!
|
||||
if("Hydrogen")
|
||||
M << "\blue You feel very light, as if you might just float away..."
|
||||
M << "<font color='blue'>You feel very light, as if you might just float away...</font>"
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
@@ -95,5 +95,5 @@
|
||||
return
|
||||
else
|
||||
for(var/mob/O in viewers(M, null))
|
||||
O.show_message(text("\red [M] ate the [content ? content : "empty canister"]!"), 1)
|
||||
O.show_message(text("<font color='red'>[M] ate the [content ? content : "empty canister"]!</font>"), 1)
|
||||
src.injest(M)
|
||||
|
||||
@@ -68,7 +68,7 @@ proc/cardinalrange(var/center)
|
||||
/obj/machinery/am_shielding/Destroy()
|
||||
if(control_unit) control_unit.remove_shielding(src)
|
||||
if(processing) shutdown_core()
|
||||
visible_message("\red The [src.name] melts!")
|
||||
visible_message("<font color='red'>The [src.name] melts!</font>")
|
||||
//Might want to have it leave a mess on the floor but no sprites for now
|
||||
..()
|
||||
return
|
||||
|
||||
@@ -34,24 +34,24 @@
|
||||
/obj/machinery/power/breakerbox/examine(mob/user)
|
||||
user << "Large machine with heavy duty switching circuits used for advanced grid control"
|
||||
if(on)
|
||||
user << "\green It seems to be online."
|
||||
user << "<font color='green'>It seems to be online.</font>"
|
||||
else
|
||||
user << "\red It seems to be offline"
|
||||
user << "<font color='red'>It seems to be offline.</font>"
|
||||
|
||||
/obj/machinery/power/breakerbox/attack_ai(mob/user)
|
||||
if(update_locked)
|
||||
user << "\red System locked. Please try again later."
|
||||
user << "<font color='red'>System locked. Please try again later.</font>"
|
||||
return
|
||||
|
||||
if(busy)
|
||||
user << "\red System is busy. Please wait until current operation is finished before changing power settings."
|
||||
user << "<font color='red'>System is busy. Please wait until current operation is finished before changing power settings.</font>"
|
||||
return
|
||||
|
||||
busy = 1
|
||||
user << "\green Updating power settings.."
|
||||
user << "<font color='green'>Updating power settings...</font>"
|
||||
if(do_after(user, 50))
|
||||
set_state(!on)
|
||||
user << "\green Update Completed. New setting:[on ? "on": "off"]"
|
||||
user << "<font color='green'>Update Completed. New setting:[on ? "on": "off"]</font>"
|
||||
update_locked = 1
|
||||
spawn(600)
|
||||
update_locked = 0
|
||||
@@ -60,16 +60,16 @@
|
||||
|
||||
/obj/machinery/power/breakerbox/attack_hand(mob/user)
|
||||
if(update_locked)
|
||||
user << "\red System locked. Please try again later."
|
||||
user << "<font color='red'>System locked. Please try again later.</font>"
|
||||
return
|
||||
|
||||
if(busy)
|
||||
user << "\red System is busy. Please wait until current operation is finished before changing power settings."
|
||||
user << "<font color='red'>System is busy. Please wait until current operation is finished before changing power settings.</font>"
|
||||
return
|
||||
|
||||
busy = 1
|
||||
for(var/mob/O in viewers(user))
|
||||
O.show_message(text("\red [user] started reprogramming [src]!"), 1)
|
||||
O.show_message(text("<font color='red'>[user] started reprogramming [src]!</font>"), 1)
|
||||
|
||||
if(do_after(user, 50))
|
||||
set_state(!on)
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
/obj/machinery/power/fractal_reactor/New()
|
||||
..()
|
||||
if(!mapped_in)
|
||||
world << "<b>\red WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]</b>"
|
||||
world << "<b><font color='red'>WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]</font></b>"
|
||||
|
||||
/obj/machinery/power/fractal_reactor/process()
|
||||
if(!powernet && !powernet_connection_failed)
|
||||
|
||||
@@ -529,7 +529,7 @@
|
||||
if(H.species.can_shred(H))
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
for(var/mob/M in viewers(src))
|
||||
M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
|
||||
M.show_message("<font color='red'>[user.name] smashed the light!</font>", 3, "You hear a tinkle of breaking glass", 2)
|
||||
broken()
|
||||
return
|
||||
|
||||
@@ -815,7 +815,7 @@
|
||||
|
||||
/obj/item/weapon/light/proc/shatter()
|
||||
if(status == LIGHT_OK || status == LIGHT_BURNED)
|
||||
src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
|
||||
src.visible_message("<font color='red'>[name] shatters.</font>","<font color='red'> You hear a small glass object shatter.</font>")
|
||||
status = LIGHT_BROKEN
|
||||
force = 5
|
||||
sharp = 1
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
examine(mob/user)
|
||||
..(user)
|
||||
user << "\blue The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle."
|
||||
user << "<font color='blue'>The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle.</font>"
|
||||
|
||||
handleInactive()
|
||||
heat -= 2
|
||||
@@ -70,28 +70,28 @@
|
||||
attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
if(istype(O, /obj/item/weapon/tank/phoron))
|
||||
if(P)
|
||||
user << "\red The generator already has a phoron tank loaded!"
|
||||
user << "<font color='red'>The generator already has a phoron tank loaded!</font>"
|
||||
return
|
||||
P = O
|
||||
user.drop_item()
|
||||
O.loc = src
|
||||
user << "\blue You add the phoron tank to the generator."
|
||||
user << "<font color='blue'>You add the phoron tank to the generator.</font>"
|
||||
else if(!active)
|
||||
if(istype(O, /obj/item/weapon/wrench))
|
||||
anchored = !anchored
|
||||
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
|
||||
if(anchored)
|
||||
user << "\blue You secure the generator to the floor."
|
||||
user << "<font color='blue'>You secure the generator to the floor.</font>"
|
||||
else
|
||||
user << "\blue You unsecure the generator from the floor."
|
||||
user << "<font color='blue'>You unsecure the generator from the floor.</font>"
|
||||
makepowernets()
|
||||
else if(istype(O, /obj/item/weapon/screwdriver))
|
||||
open = !open
|
||||
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
if(open)
|
||||
user << "\blue You open the access panel."
|
||||
user << "<font color='blue'>You open the access panel.</font>"
|
||||
else
|
||||
user << "\blue You close the access panel."
|
||||
user << "<font color='blue'>You close the access panel.</font>"
|
||||
else if(istype(O, /obj/item/weapon/crowbar) && !open)
|
||||
var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc)
|
||||
for(var/obj/item/I in component_parts)
|
||||
@@ -165,7 +165,7 @@
|
||||
usr << browse(null, "window=port_gen")
|
||||
usr.machine = null
|
||||
|
||||
/obj/machinery/power/port_gen/pacman2/emag_act(var/remaining_uses, var/mob/user)
|
||||
/obj/machinery/power/port_gen/pacman2/emag_act(var/remaining_uses, var/mob/user)
|
||||
emagged = 1
|
||||
emp_act(1)
|
||||
return 1
|
||||
|
||||
@@ -119,13 +119,13 @@ field_generator power level display
|
||||
"You hear ratchet")
|
||||
src.anchored = 0
|
||||
if(2)
|
||||
user << "\red The [src.name] needs to be unwelded from the floor."
|
||||
user << "<font color='red'>The [src.name] needs to be unwelded from the floor.</font>"
|
||||
return
|
||||
else if(istype(W, /obj/item/weapon/weldingtool))
|
||||
var/obj/item/weapon/weldingtool/WT = W
|
||||
switch(state)
|
||||
if(0)
|
||||
user << "\red The [src.name] needs to be wrenched to the floor."
|
||||
user << "<font color='red'>The [src.name] needs to be wrenched to the floor.</font>"
|
||||
return
|
||||
if(1)
|
||||
if (WT.remove_fuel(0,user))
|
||||
@@ -211,7 +211,7 @@ field_generator power level display
|
||||
return 1
|
||||
else
|
||||
for(var/mob/M in viewers(src))
|
||||
M.show_message("\red \The [src] shuts down!")
|
||||
M.show_message("<font color='red'>\The [src] shuts down!</font>")
|
||||
turn_off()
|
||||
investigate_log("ran out of power and <font color='red'>deactivated</font>","singulo")
|
||||
src.power = 0
|
||||
|
||||
@@ -343,7 +343,7 @@
|
||||
total_system_failure(failure_probability, user)
|
||||
return
|
||||
|
||||
usr << "\red You have disassembled the SMES cell!"
|
||||
usr << "<font color='red'>You have disassembled the SMES cell!</font>"
|
||||
var/obj/structure/frame/M = new /obj/structure/frame(src.loc)
|
||||
M.frame_type = new /datum/frame/frame_types/machine
|
||||
M.anchored = 1
|
||||
@@ -372,7 +372,7 @@
|
||||
W.loc = src
|
||||
recalc_coils()
|
||||
else
|
||||
usr << "\red You can't insert more coils to this SMES unit!"
|
||||
usr << "<font color='red'>You can't insert more coils to this SMES unit!</font>"
|
||||
|
||||
// Proc: toggle_input()
|
||||
// Parameters: None
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
return
|
||||
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
|
||||
if(!istype(usr, /mob/living/silicon/ai))
|
||||
usr << "\red You don't have the dexterity to do this!"
|
||||
usr << "<font color='red'>You don't have the dexterity to do this!</font>"
|
||||
return
|
||||
|
||||
if (( usr.machine==src && ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
|
||||
@@ -232,7 +232,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 << "<font color='blue'>The broken glass falls out.</font>"
|
||||
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
|
||||
new /obj/item/weapon/material/shard( src.loc )
|
||||
var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A )
|
||||
@@ -245,7 +245,7 @@
|
||||
A.anchored = 1
|
||||
qdel(src)
|
||||
else
|
||||
user << "\blue You disconnect the monitor."
|
||||
user << "<font color='blue'>You disconnect the monitor.</font>"
|
||||
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
|
||||
var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A )
|
||||
for (var/obj/C in src)
|
||||
|
||||
Reference in New Issue
Block a user