cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge

Browse Source 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
This commit is contained in:
D3athrow
2015-04-12 16:40:59 -05:00
parent 9f2e2bb4e3
commit 01d2471fc9
534 changed files with 3273 additions and 3268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/WorkInProgress/Cael_Aislinn/Jungle/jungle_plants.dm
View File

@@ -30,12 +30,12 @@
if(istype(I, /obj/item/weapon/hatchet) && !stump)
if(indestructable)
//this bush marks the edge of the map, you can't destroy it
user << "\red You flail away at the undergrowth, but it's too thick here."
user << "<span class='warning'>You flail away at the undergrowth, but it's too thick here.</span>"
else
user.visible_message("\red <b>[user] begins clearing away [src].</b>","\red <b>You begin clearing away [src].</b>")
user.visible_message("<span class='danger'><b>[user] begins clearing away [src].</b>","<span class='warning'>You begin clearing away [src].</span></span>")
spawn(rand(15,30))
if(get_dist(user,src) < 2)
user << "\blue You clear away [src]."
user << "<span class='notice'>You clear away [src].</span>"
var/obj/item/stack/sheet/wood/W = new(src.loc)
W.amount = rand(3,15)
if(prob(50))
@@ -102,7 +102,7 @@ var/jungle_plants_init = 0
/obj/structure/jungle_plant/attack_hand(var/mob/user as mob)
if(fruits_left > 0)
fruits_left--
user << "\blue You pick a fruit off [src]."
user << "<span class='notice'>You pick a fruit off [src].</span>"
var/obj/item/weapon/reagent_containers/food/snacks/grown/jungle_fruit/J = new (src.loc)
J.potency = plant_strength
@@ -116,4 +116,4 @@ var/jungle_plants_init = 0
fruit_overlay.Blend(rgb(fruit_r, fruit_g, fruit_b), ICON_ADD)
overlays += fruit_overlay
else
user << "\red There are no fruit left on [src]."
user << "<span class='warning'>There are no fruit left on [src].</span>"

10
code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm
View File

@@ -142,13 +142,13 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
//have a max of 1000 moles suspended
if(held_plasma.toxins < transfer_ratio * 1000)
var/moles_covered = environment.return_pressure()*volume_covered/(environment.temperature * R_IDEAL_GAS_EQUATION)
//world << "\blue moles_covered: [moles_covered]"
//world << "<span class='notice'>moles_covered: [moles_covered]</span>"
//
var/datum/gas_mixture/gas_covered = environment.remove(moles_covered)
var/datum/gas_mixture/plasma_captured = new /datum/gas_mixture()
//
plasma_captured.toxins = round(gas_covered.toxins * transfer_ratio)
//world << "\blue[plasma_captured.toxins] moles of plasma captured"
//world << "<span class='warning'>[plasma_captured.toxins] moles of plasma captured</span>"
plasma_captured.temperature = gas_covered.temperature
plasma_captured.update_values()
//
@@ -327,7 +327,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
//pick one of the unprocessed reacting reagents randomly
var/cur_primary_reactant = pick(primary_reactant_pool)
primary_reactant_pool.Remove(cur_primary_reactant)
//world << "\blue primary reactant chosen: [cur_primary_reactant]"
//world << "<span class='notice'>primary reactant chosen: [cur_primary_reactant]</span>"
//grab all the possible reactants to have a reaction with
var/list/possible_secondary_reactants = reactants_reacting_pool.Copy()
@@ -343,12 +343,12 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
continue
var/datum/fusion_reaction/cur_reaction = get_fusion_reaction(cur_primary_reactant, cur_secondary_reactant)
if(cur_reaction)
//world << "\blue secondary reactant: [cur_secondary_reactant], [reaction_products.len]"
//world << "<span class='notice'>secondary reactant: [cur_secondary_reactant], [reaction_products.len]</span>"
possible_reactions.Add(cur_reaction)
//if there are no possible reactions here, abandon this primary reactant and move on
if(!possible_reactions.len)
//world << "\blue no reactions"
//world << "<span class='notice'>no reactions</span>"
continue
//split up the reacting atoms between the possible reactions

8
code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm
View File

@@ -96,7 +96,7 @@ max volume of plasma storeable by the field = the total volume of a number of ti
if(!emagged)
locked = 0
emagged = 1
user.visible_message("[user.name] emags the [src.name].","\red You short out the lock.")
user.visible_message("[user.name] emags the [src.name].","<span class='warning'>You short out the lock.</span>")
return
/obj/machinery/power/rust_core/attackby(obj/item/W, mob/user)
@@ -106,7 +106,7 @@ max volume of plasma storeable by the field = the total volume of a number of ti
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
user << "\red The lock seems to be broken"
user << "<span class='warning'>The lock seems to be broken</span>"
return
if(src.allowed(user))
if(owned_field)
@@ -114,9 +114,9 @@ max volume of plasma storeable by the field = the total volume of a number of ti
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
src.locked = 0 //just in case it somehow gets locked
user << "\red The controls can only be locked when the [src] is online"
user << "<span class='warning'>The controls can only be locked when the [src] is online</span>"
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
return
/obj/machinery/power/rust_core/attack_ai(mob/user)

14
code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dm
View File

@@ -15,12 +15,12 @@
/obj/machinery/rust_fuel_assembly_port/attackby(var/obj/item/I, var/mob/user)
if(istype(I,/obj/item/weapon/fuel_assembly) && !opened)
if(cur_assembly)
user << "\red There is already a fuel rod assembly in there!"
user << "<span class='warning'>There is already a fuel rod assembly in there!</span>"
else
cur_assembly = I
user.drop_item(I, src)
icon_state = "port1"
user << "\blue You insert [I] into [src]. Touch the panel again to insert [I] into the injector."
user << "<span class='notice'>You insert [I] into [src]. Touch the panel again to insert [I] into the injector.</span>"
/obj/machinery/rust_fuel_assembly_port/attack_hand(mob/user)
add_fingerprint(user)
@@ -29,16 +29,16 @@
if(cur_assembly)
if(try_insert_assembly())
user << "\blue \icon[src] [src] inserts it's fuel rod assembly into an injector."
user << "<span class='notice'>\icon[src] [src] inserts it's fuel rod assembly into an injector.</span>"
else
if(eject_assembly())
user << "\red \icon[src] [src] ejects it's fuel assembly. Check the fuel injector status."
user << "<span class='warning'>\icon[src] [src] ejects it's fuel assembly. Check the fuel injector status.</span>"
else if(try_draw_assembly())
user << "\blue \icon[src] [src] draws a fuel rod assembly from an injector."
user << "<span class='notice'>\icon[src] [src] draws a fuel rod assembly from an injector.</span>"
else if(try_draw_assembly())
user << "\blue \icon[src] [src] draws a fuel rod assembly from an injector."
user << "<span class='notice'>\icon[src] [src] draws a fuel rod assembly from an injector.</span>"
else
user << "\red \icon[src] [src] was unable to draw a fuel rod assembly from an injector."
user << "<span class='warning'>\icon[src] [src] was unable to draw a fuel rod assembly from an injector.</span>"
/obj/machinery/rust_fuel_assembly_port/proc/try_insert_assembly()
var/success = 0

22
code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm
View File

@@ -49,35 +49,35 @@
user << "You begin removing the circuitboard" //lpeters - fixed grammar issues
if(do_after(user, 50))
user.visible_message(\
"\red [user.name] has removed the circuitboard from [src.name]!",\
"\blue You remove the circuitboard.")
"<span class='warning'>[user.name] has removed the circuitboard from [src.name]!</span>",\
"<span class='notice'>You remove the circuitboard.</span>")
has_electronics = 0
new /obj/item/weapon/module/rust_fuel_port(loc)
has_electronics &= ~1
else
opened = 0
icon_state = "port0"
user << "\blue You close the maintenance cover."
user << "<span class='notice'>You close the maintenance cover.</span>"
else
if(cur_assembly)
user << "\red You cannot open the cover while there is a fuel assembly inside."
user << "<span class='warning'>You cannot open the cover while there is a fuel assembly inside.</span>"
else
opened = 1
user << "\blue You open the maintenance cover."
user << "<span class='notice'>You open the maintenance cover.</span>"
icon_state = "port2"
return
else if (istype(W, /obj/item/stack/cable_coil) && opened && !(has_electronics & 2))
var/obj/item/stack/cable_coil/C = W
if(C.amount < 10)
user << "\red You need more wires."
user << "<span class='warning'>You need more wires.</span>"
return
user << "You start adding cables to the frame..."
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20) && C.amount >= 10)
C.use(10)
user.visible_message(\
"\red [user.name] has added cables to the port frame!",\
"<span class='warning'>[user.name] has added cables to the port frame!</span>",\
"You add cables to the port frame.")
has_electronics &= 2
return
@@ -88,7 +88,7 @@
if(do_after(user, 50))
new /obj/item/stack/cable_coil(loc,10)
user.visible_message(\
"\red [user.name] cut the cabling inside the port.",\
"<span class='warning'>[user.name] cut the cabling inside the port.</span>",\
"You cut the cabling inside the port.")
has_electronics &= ~2
return
@@ -105,7 +105,7 @@
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
var/obj/item/weapon/weldingtool/WT = W
if (WT.get_fuel() < 3)
user << "\blue You need more welding fuel to complete this task."
user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
return
user << "You start welding the port frame..."
playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1)
@@ -113,9 +113,9 @@
if(!src || !WT.remove_fuel(3, user)) return
new /obj/item/mounted/frame/rust_fuel_assembly_port(loc)
user.visible_message(\
"\red [src] has been cut away from the wall by [user.name].",\
"<span class='warning'>[src] has been cut away from the wall by [user.name].</span>",\
"You detached the port frame.",\
"\red You hear welding.")
"<span class='warning'>You hear welding.</span>")
del(src)
return

10
code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dm
View File

@@ -80,12 +80,12 @@ var/const/max_assembly_amount = 300
compressed_matter -= 10
ejected = 1
if(ejected)
usr << "\blue \icon[src] [src] ejects some compressed matter units."
usr << "<span class='notice'>\icon[src] [src] ejects some compressed matter units.</span>"
else
usr << "\red \icon[src] there are no more compressed matter units in [src]."
usr << "<span class='warning'>\icon[src] there are no more compressed matter units in [src].</span>"
if( href_list["activate"] )
//world << "\blue New fuel rod assembly"
//world << "<span class='notice'>New fuel rod assembly</span>"
var/obj/item/weapon/fuel_assembly/F = new(src)
var/fail = 0
var/old_matter = compressed_matter
@@ -102,11 +102,11 @@ var/const/max_assembly_amount = 300
: (req_matter < compressed_matter ? "req_matter < compressed_matter" : "req_matter == compressed_matter")]"*/
fail = 1
break
//world << "\blue [reagent]: new_assembly_quantities[reagent]<br>"
//world << "<span class='notice'>[reagent]: new_assembly_quantities[reagent]<br></span>"
if(fail)
del(F)
compressed_matter = old_matter
usr << "\red \icon[src] [src] flashes red: \'Out of matter.\'"
usr << "<span class='warning'>\icon[src] [src] flashes red: \'Out of matter.\'</span>"
else
F.loc = src.loc//get_step(get_turf(src), src.dir)
F.percent_depleted = 0

24
code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm
View File

@@ -50,21 +50,21 @@
user << "You begin removing the circuitboard" //lpeters - fixed grammar issues
if(do_after(user, 50))
user.visible_message(\
"\red [user.name] has removed the circuitboard from [src.name]!",\
"\blue You remove the circuitboard board.")
"<span class='warning'>[user.name] has removed the circuitboard from [src.name]!</span>",\
"<span class='notice'>You remove the circuitboard board.</span>")
has_electronics = 0
new /obj/item/weapon/module/rust_fuel_compressor(loc)
has_electronics &= ~1
else
opened = 0
icon_state = "fuel_compressor0"
user << "\blue You close the maintenance cover."
user << "<span class='notice'>You close the maintenance cover.</span>"
else
if(compressed_matter > 0)
user << "\red You cannot open the cover while there is compressed matter inside."
user << "<span class='warning'>You cannot open the cover while there is compressed matter inside.</span>"
else
opened = 1
user << "\blue You open the maintenance cover."
user << "<span class='notice'>You open the maintenance cover.</span>"
icon_state = "fuel_compressor1"
return
@@ -77,7 +77,7 @@
user << "You [ locked ? "lock" : "unlock"] the compressor interface."
update_icon()
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
return
else if (istype(W, /obj/item/weapon/card/emag) && !emagged) // trying to unlock with an emag card
@@ -97,14 +97,14 @@
else if (istype(W, /obj/item/stack/cable_coil) && opened && !(has_electronics & 2))
var/obj/item/stack/cable_coil/C = W
if(C.amount < 10)
user << "\red You need more wires."
user << "<span class='warning'>You need more wires.</span>"
return
user << "You start adding cables to the compressor frame..."
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20) && C.amount >= 10)
C.use(10)
user.visible_message(\
"\red [user.name] has added cables to the compressor frame!",\
"<span class='warning'>[user.name] has added cables to the compressor frame!</span>",\
"You add cables to the port frame.")
has_electronics &= 2
return
@@ -115,7 +115,7 @@
if(do_after(user, 50))
new /obj/item/stack/cable_coil(loc,10)
user.visible_message(\
"\red [user.name] cut the cabling inside the compressor.",\
"<span class='warning'>[user.name] cut the cabling inside the compressor.</span>",\
"You cut the cabling inside the port.")
has_electronics &= ~2
return
@@ -132,7 +132,7 @@
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
var/obj/item/weapon/weldingtool/WT = W
if (WT.get_fuel() < 3)
user << "\blue You need more welding fuel to complete this task."
user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
return
user << "You start welding the compressor frame..."
playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1)
@@ -140,9 +140,9 @@
if(!src || !WT.remove_fuel(3, user)) return
new /obj/item/mounted/frame/rust_fuel_assembly_port(loc)
user.visible_message(\
"\red [src] has been cut away from the wall by [user.name].",\
"<span class='warning'>[src] has been cut away from the wall by [user.name].</span>",\
"You detached the compressor frame.",\
"\red You hear welding.")
"<span class='warning'>You hear welding.</span>")
del(src)
return

12
code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm
View File

@@ -53,7 +53,7 @@
if(!emagged)
locked = 0
emagged = 1
user.visible_message("[user.name] emags the [src.name].","\red You short out the lock.")
user.visible_message("[user.name] emags the [src.name].","<span class='warning'>You short out the lock.</span>")
return 1
return -1
/obj/machinery/power/rust_fuel_injector/attackby(obj/item/W, mob/user)
@@ -62,13 +62,13 @@
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
user << "\red The lock seems to be broken"
user << "<span class='warning'>The lock seems to be broken</span>"
return
if(src.allowed(user))
src.locked = !src.locked
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
return
if(istype(W, /obj/item/weapon/fuel_assembly) && !cur_assembly)
@@ -164,7 +164,7 @@
if( href_list["fuel_usage"] )
var/new_usage = text2num(input("Enter new fuel usage (0.01% - 100%)", "Modifying fuel usage", fuel_usage * 100))
if(!new_usage)
usr << "\red That's not a valid number."
usr << "<span class='warning'>That's not a valid number.</span>"
return
new_usage = max(new_usage, 0.01)
new_usage = min(new_usage, 100)
@@ -245,10 +245,10 @@
break
if(success)
src.visible_message("\blue \icon[src] a green light flashes on [src].")
src.visible_message("<span class='notice'>\icon[src] a green light flashes on [src].</span>")
updateDialog()
else
src.visible_message("\red \icon[src] a red light flashes on [src].")
src.visible_message("<span class='warning'>\icon[src] a red light flashes on [src].</span>")
/obj/machinery/power/rust_fuel_injector/verb/rotate_clock()
set category = "Object"

6
code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
View File

@@ -36,7 +36,7 @@
if( href_list["modifypower"] )
var/new_val = text2num(input("Enter new emission power level (0.001 - 0.01)", "Modifying power level (MeV)", mega_energy))
if(!new_val)
usr << "\red That's not a valid number."
usr << "<span class='warning'>That's not a valid number.</span>"
return
new_val = min(new_val,0.01)
new_val = max(new_val,0.001)
@@ -47,7 +47,7 @@
if( href_list["modifyrate"] )
var/new_val = text2num(input("Enter new emission rate (1 - 10)", "Modifying emission rate (sec)", rate))
if(!new_val)
usr << "\red That's not a valid number."
usr << "<span class='warning'>That's not a valid number.</span>"
return
new_val = min(new_val,1)
new_val = max(new_val,10)
@@ -58,7 +58,7 @@
if( href_list["modifyfreq"] )
var/new_val = text2num(input("Enter new emission frequency (1 - 50000)", "Modifying emission frequency (GHz)", frequency))
if(!new_val)
usr << "\red That's not a valid number."
usr << "<span class='warning'>That's not a valid number.</span>"
return
new_val = min(new_val,1)
new_val = max(new_val,50000)

2
code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm
View File

@@ -49,5 +49,5 @@
/obj/effect/rust_particle_catcher/Bumped(atom/AM)
if(ismob(AM) && density && prob(10))
AM << "\red A powerful force pushes you back."
AM << "<span class='warning'>A powerful force pushes you back.</span>"
..()

2
code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm
View File

@@ -73,7 +73,7 @@
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
updateDialog()
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
/obj/machinery/shield_capacitor/attack_paw(user as mob)
return src.attack_hand(user)

2
code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm
View File

@@ -82,7 +82,7 @@
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
updateDialog()
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
/obj/machinery/shield_gen/attack_paw(user as mob)
return src.attack_hand(user)

2
code/WorkInProgress/Cael_Aislinn/Supermatter/LaserComputer.dm
View File

@@ -51,7 +51,7 @@
var/obj/machinery/engine/laser/laser = src.laser[1]
if(!laser)
t += "\red No laser found"
t += "<span class='warning'>No laser found</span>"
else

12
code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
View File

@@ -64,9 +64,9 @@
src.use_power = 2
update_icon()
else
user << "\red The controls are locked!"
user << "<span class='warning'>The controls are locked!</span>"
else
user << "\red The [src] needs to be firmly secured to the floor first."
user << "<span class='warning'>The [src] needs to be firmly secured to the floor first.</span>"
return 1
@@ -119,7 +119,7 @@
if(!emagged)
locked = 0
emagged = 1
user.visible_message("[user.name] emags the [src.name].","\red You short out the lock.")
user.visible_message("[user.name] emags the [src.name].","<span class='warning'>You short out the lock.</span>")
return 1
return -1
@@ -129,7 +129,7 @@
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
user << "\red The lock seems to be broken"
user << "<span class='warning'>The lock seems to be broken</span>"
return
if(src.allowed(user))
if(active)
@@ -137,9 +137,9 @@
user << "The controls are now [src.locked ? "locked." : "unlocked."]"
else
src.locked = 0 //just in case it somehow gets locked
user << "\red The controls can only be locked when the [src] is online"
user << "<span class='warning'>The controls can only be locked when the [src] is online</span>"
else
user << "\red Access denied."
user << "<span class='warning'>Access denied.</span>"
return
return

6
code/WorkInProgress/Cael_Aislinn/meteor_battery.dm
View File

@@ -139,7 +139,7 @@
spawn(rand(4,120) * 10)
M.explode()
for(var/mob/P in view(7))
P.visible_message("\red The missile skids to a halt, vibrating and sparking ominously!")
P.visible_message("<span class='warning'>The missile skids to a halt, vibrating and sparking ominously!</span>")
if(!cur_target)
cur_target = get_new_target() //get new target
@@ -252,10 +252,10 @@
playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if ((O.client && !( O.blinded )))
O.show_message(text("\red <B>[] has slashed at []!</B>", M, src), 1)
O.show_message(text("<span class='warning'><B>[] has slashed at []!</B></span>", M, src), 1)
src.health -= 15
if (src.health <= 0)
src.die()
else
M << "\green That object is useless to you."
M << "<span class='good'>That object is useless to you.</span>"
return

4
code/WorkInProgress/Chinsky/ashtray.dm
View File

@@ -54,7 +54,7 @@
die()
return
if (contents.len)
src.visible_message("\red [src] slams into [hit_atom] spilling its contents!")
src.visible_message("<span class='warning'>[src] slams into [hit_atom] spilling its contents!</span>")
for (var/obj/item/clothing/mask/cigarette/O in contents)
contents -= O
O.loc = src.loc
@@ -62,7 +62,7 @@
return ..()
/obj/item/ashtray/proc/die()
src.visible_message("\red [src] shatters spilling its contents!")
src.visible_message("<span class='warning'>[src] shatters spilling its contents!</span>")
for (var/obj/item/clothing/mask/cigarette/O in contents)
contents -= O
O.loc = src.loc

8
code/WorkInProgress/Cib/MedicalSideEffects.dm
View File

@@ -71,7 +71,7 @@
/datum/medical_effect/headache/cure(mob/living/carbon/human/H)
if(H.reagents.has_reagent("alkysine") || H.reagents.has_reagent("tramadol"))
//H << "\red Your head stops throbbing.." // Halt spam.
//H << "<span class='warning'>Your head stops throbbing..</span>" // Halt spam.
return 1
return 0
@@ -93,7 +93,7 @@
/datum/medical_effect/bad_stomach/cure(mob/living/carbon/human/H)
if(H.reagents.has_reagent("anti_toxin"))
H << "\red Your stomach feels a little better now.."
H << "<span class='warning'>Your stomach feels a little better now..</span>"
return 1
return 0
@@ -118,7 +118,7 @@
/datum/medical_effect/cramps/cure(mob/living/carbon/human/H)
if(H.reagents.has_reagent("inaprovaline"))
H << "\red The cramps let up.."
H << "<span class='warning'>The cramps let up..</span>"
return 1
return 0
@@ -143,6 +143,6 @@
/datum/medical_effect/itch/cure(mob/living/carbon/human/H)
if(H.reagents.has_reagent("inaprovaline"))
H << "\red The itching stops.."
H << "<span class='warning'>The itching stops..</span>"
return 1
return 0

30
code/WorkInProgress/Cutelilduck/human_resources.dm
View File

@@ -46,7 +46,7 @@
target_name = str
name = "[target_name]'s demotion microchip"
desc = desc + " Stamped by:"
user << "\blue The demotion microchip for [src.target_name] is now ready to be stamped."
user << "<span class='notice'>The demotion microchip for [src.target_name] is now ready to be stamped.</span>"
/obj/item/demote_chip/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/stamp))
@@ -56,39 +56,39 @@
if(cap == 0)
desc = desc + "/Captain"
cap = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
if(istype(S, /obj/item/weapon/stamp/hop))
if(hop == 0)
desc = desc + "/HoP"
hop = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
if(istype(S, /obj/item/weapon/stamp/hos))
if(hos == 0)
desc = desc + "/HoS"
hos = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
if(istype(S, /obj/item/weapon/stamp/ce))
if(ce == 0)
desc = desc + "/CE"
ce = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
if(istype(S, /obj/item/weapon/stamp/rd))
if(rd == 0)
desc = desc + "/RD"
rd = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
if(istype(S, /obj/item/weapon/stamp/cmo))
if(cmo == 0)
desc = desc + "/CMO"
cmo = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
if(istype(S, /obj/item/weapon/stamp/clown))
if(clown == 0)
desc = desc + "/HONK"
clown = 1
user << "\blue You stamp the demotion microchip of [target_name]."
user << "<span class='notice'>You stamp the demotion microchip of [target_name].</span>"
else
user << "\blue The chip has not been initialized."
user << "<span class='notice'>The chip has not been initialized.</span>"
else
return ..()
@@ -97,9 +97,9 @@
if(istype(I, /obj/item/demote_chip/))
var/obj/item/demote_chip/DE = I
if(registered_name != DE.target_name)
user << "\blue Failed to apply, names do not match."
user << "<span class='notice'>Failed to apply, names do not match.</span>"
else if(bans != null)
user << "\blue This card already has a microchip applied"
user << "<span class='notice'>This card already has a microchip applied</span>"
else
icon_state = "centcom_old"
bans = "9" //if get_region_accesses ever uses 9 we're fucked
@@ -112,11 +112,11 @@
if(istype(I, /obj/item/demote_chip))
var/obj/item/demote_chip/D = I
if(registered_name != D.target_name)
user << "\blue Failed to apply, names do not match."
user << "<span class='notice'>Failed to apply, names do not match.</span>"
else if(bans != null)
user << "\blue This card already has a microchip applied"
user << "<span class='notice'>This card already has a microchip applied</span>"
else if(icon_state == "gold")
user << "\blue This microchip cannot apply to this card type."
user << "<span class='notice'>This microchip cannot apply to this card type.</span>"
else
if(D.cap == 1)
@@ -139,7 +139,7 @@
access -= get_region_accesses(2)
bans = bans + "2"
if(bans == null)
user << "\blue You require at least one stamp."
user << "<span class='notice'>You require at least one stamp.</span>"
return
icon_state = "centcom_old"
del(D)

14
code/WorkInProgress/Mini/ATM.dm
View File

@@ -51,7 +51,7 @@ log transactions
if(linked_db && ( (linked_db.stat & NOPOWER) || !linked_db.activated ) )
linked_db = null
authenticated_account = null
src.visible_message("\red \icon[src] [src] buzzes rudely, \"Connection to remote database lost.\"")
src.visible_message("<span class='warning'>\icon[src] [src] buzzes rudely, \"Connection to remote database lost.\"</span>")
updateDialog()
if(ticks_left_timeout > 0)
@@ -122,7 +122,7 @@ log transactions
/obj/machinery/atm/attack_hand(mob/user as mob)
if(istype(user, /mob/living/silicon))
user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per NanoTrasen regulation #1005."
user << "<span class='warning'>Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per NanoTrasen regulation #1005.</span>"
return
if(get_dist(src,user) <= 1)
//check to see if the user has low security enabled
@@ -277,11 +277,11 @@ log transactions
T.time = worldtime2text()
failed_account.transaction_log.Add(T)
else
usr << "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."
usr << "<span class='warning'>\icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.</span>"
previous_account_number = tried_account_num
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
else
usr << "\red \icon[src] incorrect pin/account combination entered."
usr << "<span class='warning'>\icon[src] incorrect pin/account combination entered.</span>"
number_incorrect_tries = 0
else
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
@@ -297,7 +297,7 @@ log transactions
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
usr << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
usr << "<span class='notice'>\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'</span>"
previous_account_number = tried_account_num
if("withdrawal")
@@ -310,7 +310,7 @@ log transactions
//remove the money
if(amount > 10000) // prevent crashes
usr << "\blue The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'"
usr << "<span class='notice'>The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'</span>"
amount = 10000
authenticated_account.money -= amount
withdraw_arbitrary_sum(amount)
@@ -391,7 +391,7 @@ log transactions
if(I)
authenticated_account = linked_db.attempt_account_access(I.associated_account_number)
if(authenticated_account)
human_user << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
human_user << "<span class='notice'>\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'</span>"
//create a transaction log entry
var/datum/transaction/T = new()

4
code/WorkInProgress/Mini/atmos_control.dm
View File

@@ -77,8 +77,8 @@ var/global/list/atmos_controllers = list()
/obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/card/emag) && !emagged)
user.visible_message("\red \The [user] swipes \a [I] through \the [src], causing the screen to flash!",\
"\red You swipe your [I] through \the [src], the screen flashing as you gain full control.",\
user.visible_message("<span class='warning'>\The [user] swipes \a [I] through \the [src], causing the screen to flash!</span>",\
"<span class='warning'>You swipe your [I] through \the [src], the screen flashing as you gain full control.</span>",\
"You hear the swipe of a card through a reader, and an electronic warble.")
emagged = 1
overridden = 1

6
code/WorkInProgress/autopsy.dm
View File

@@ -151,7 +151,7 @@
scan_data += "<br>"
for(var/mob/O in viewers(usr))
O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1)
O.show_message("<span class='warning'>\the [src] rattles and prints out a sheet of paper.</span>", 1)
sleep(10)
@@ -187,7 +187,7 @@
src.wdata = list()
src.chemtraces = list()
src.timeofdeath = null
user << "\red A new patient has been registered.. Purging data for previous patient."
user << "<span class='warning'>A new patient has been registered.. Purging data for previous patient.</span>"
src.timeofdeath = M.timeofdeath
@@ -199,7 +199,7 @@
usr << "<b>You have to cut the limb open first!</b>"
return
for(var/mob/O in viewers(M))
O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.display_name] with \the [src.name]", 1)
O.show_message("<span class='warning'>[user.name] scans the wounds on [M.name]'s [S.display_name] with \the [src.name]</span>", 1)
src.add_data(S)

52
code/WorkInProgress/buildmode.dm
View File

@@ -79,35 +79,35 @@
Click()
switch(master.cl.buildmode)
if(1)
usr << "\blue ***********************************************************"
usr << "\blue Left Mouse Button = Construct / Upgrade"
usr << "\blue Right Mouse Button = Deconstruct / Delete / Downgrade"
usr << "\blue Left Mouse Button + ctrl = R-Window"
usr << "\blue Left Mouse Button + alt = Airlock"
usr << "<span class='notice'>***********************************************************</span>"
usr << "<span class='notice'>Left Mouse Button = Construct / Upgrade</span>"
usr << "<span class='notice'>Right Mouse Button = Deconstruct / Delete / Downgrade</span>"
usr << "<span class='notice'>Left Mouse Button + ctrl = R-Window</span>"
usr << "<span class='notice'>Left Mouse Button + alt = Airlock</span>"
usr << ""
usr << "\blue Use the button in the upper left corner to"
usr << "\blue change the direction of built objects."
usr << "\blue ***********************************************************"
usr << "<span class='notice'>Use the button in the upper left corner to</span>"
usr << "<span class='notice'>change the direction of built objects.</span>"
usr << "<span class='notice'>***********************************************************</span>"
if(2)
usr << "\blue ***********************************************************"
usr << "\blue Right Mouse Button on buildmode button = Set object type"
usr << "\blue Left Mouse Button on turf/obj = Place objects"
usr << "\blue Right Mouse Button = Delete objects"
usr << "<span class='notice'>***********************************************************</span>"
usr << "<span class='notice'>Right Mouse Button on buildmode button = Set object type</span>"
usr << "<span class='notice'>Left Mouse Button on turf/obj = Place objects</span>"
usr << "<span class='notice'>Right Mouse Button = Delete objects</span>"
usr << ""
usr << "\blue Use the button in the upper left corner to"
usr << "\blue change the direction of built objects."
usr << "\blue ***********************************************************"
usr << "<span class='notice'>Use the button in the upper left corner to</span>"
usr << "<span class='notice'>change the direction of built objects.</span>"
usr << "<span class='notice'>***********************************************************</span>"
if(3)
usr << "\blue ***********************************************************"
usr << "\blue Right Mouse Button on buildmode button = Select var(type) & value"
usr << "\blue Left Mouse Button on turf/obj/mob = Set var(type) & value"
usr << "\blue Right Mouse Button on turf/obj/mob = Reset var's value"
usr << "\blue ***********************************************************"
usr << "<span class='notice'>***********************************************************</span>"
usr << "<span class='notice'>Right Mouse Button on buildmode button = Select var(type) & value</span>"
usr << "<span class='notice'>Left Mouse Button on turf/obj/mob = Set var(type) & value</span>"
usr << "<span class='notice'>Right Mouse Button on turf/obj/mob = Reset var's value</span>"
usr << "<span class='notice'>***********************************************************</span>"
if(4)
usr << "\blue ***********************************************************"
usr << "\blue Left Mouse Button on turf/obj/mob = Select"
usr << "\blue Right Mouse Button on turf/obj/mob = Throw"
usr << "\blue ***********************************************************"
usr << "<span class='notice'>***********************************************************</span>"
usr << "<span class='notice'>Left Mouse Button on turf/obj/mob = Select</span>"
usr << "<span class='notice'>Right Mouse Button on turf/obj/mob = Throw</span>"
usr << "<span class='notice'>***********************************************************</span>"
return 1
/obj/effect/bmode/buildquit
@@ -272,13 +272,13 @@
log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]")
object.vars[holder.buildmode.varholder] = holder.buildmode.valueholder
else
usr << "\red [initial(object.name)] does not have a var called '[holder.buildmode.varholder]'"
usr << "<span class='warning'>[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'</span>"
if(pa.Find("right"))
if(object.vars.Find(holder.buildmode.varholder))
log_admin("[key_name(usr)] modified [object.name]'s [holder.buildmode.varholder] to [holder.buildmode.valueholder]")
object.vars[holder.buildmode.varholder] = initial(object.vars[holder.buildmode.varholder])
else
usr << "\red [initial(object.name)] does not have a var called '[holder.buildmode.varholder]'"
usr << "<span class='warning'>[initial(object.name)] does not have a var called '[holder.buildmode.varholder]'</span>"
if(4)
if(pa.Find("left"))

4
code/WorkInProgress/kilakk/fax.dm
View File

@@ -34,7 +34,7 @@ var/list/alldepartments = list("Central Command")
alldepartments += department
/obj/machinery/faxmachine/attack_ghost(mob/user as mob)
usr << "\red Nope."
usr << "<span class='warning'>Nope.</span>"
return 0
/obj/machinery/faxmachine/attack_ai(mob/user as mob)
@@ -189,7 +189,7 @@ var/list/alldepartments = list("Central Command")
/proc/Centcomm_fax(var/obj/item/weapon/paper/sent, var/sentname, var/mob/Sender)
var/msg = "\blue <b><font color='orange'>CENTCOMM FAX: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<a href='?_src_=holder;CentcommFaxReply=\ref[Sender]'>RPLY</a>)</b>: Receiving '[sentname]' via secure connection ... <a href='?_src_=holder;CentcommFaxView=\ref[sent]'>view message</a>"
var/msg = "<span class='notice'><b><font color='orange'>CENTCOMM FAX: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<a href='?_src_=holder;CentcommFaxReply=\ref[Sender]'>RPLY</a>)</b>: Receiving '[sentname]' via secure connection ... <a href='?_src_=holder;CentcommFaxView=\ref[sent]'>view message</a></span>"
admins << msg
admins << 'sound/effects/fax.ogg'

6
code/WorkInProgress/pomf/spacepods/spacepods.dm
View File

@@ -313,11 +313,11 @@
if (usr.stat || !ishuman(usr))
return
if (src.occupant)
usr << "\blue <B>The [src.name] is already occupied!</B>"
usr << "<span class='notice'><B>The [src.name] is already occupied!</B></span>"
return
/*
if (usr.abiotic())
usr << "\blue <B>Subject cannot have abiotic items on.</B>"
usr << "<span class='notice'><B>Subject cannot have abiotic items on.</B></span>"
return
*/
for(var/mob/living/carbon/slime/M in range(1,usr))
@@ -326,7 +326,7 @@
return
// usr << "You start climbing into [src.name]"
visible_message("\blue [usr] starts to climb into [src.name]")
visible_message("<span class='notice'>[usr] starts to climb into [src.name]</span>")
if(enter_after(40,usr))
if(!src.occupant)