cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Span classes.

Browse Source
This commit is contained in:
Zuhayr
2015-01-28 21:59:45 +10:30
parent 9dac693da1
commit e5935e01f1
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/hydroponics/hydro_tray.dm
View File

@@ -536,7 +536,7 @@ var/global/list/plant_icon_cache = list()
pestlevel = 0 pestlevel = 0
sampled = 0 sampled = 0
update_icon() update_icon()
visible_message("\blue [src] has been overtaken by [seed.display_name].") visible_message("<span class='notice'>[src] has been overtaken by [seed.display_name].</span>")
return return
@@ -593,7 +593,7 @@ var/global/list/plant_icon_cache = list()
weedlevel = 0 weedlevel = 0
update_icon() update_icon()
visible_message("\red The \blue [previous_plant] \red has suddenly mutated into \blue [seed.display_name]!") visible_message("<span class='danger'>The </span><span class='notice'>[previous_plant]</span><span class='danger'> has suddenly mutated into </span><span class='notice'>[seed.display_name]!</span>")
return return
@@ -682,16 +682,16 @@ var/global/list/plant_icon_cache = list()
update_icon() update_icon()
else else
user << "\red \The [src] already has seeds in it!" user << "<span class='danger'>\The [src] already has seeds in it!</span>"
else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe
if(weedlevel > 0) if(weedlevel > 0)
user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].") user.visible_message("<span class='danger'>[user] starts uprooting the weeds.</span>", "<span class='danger'>You remove the weeds from the [src].</span>")
weedlevel = 0 weedlevel = 0
update_icon() update_icon()
else else
user << "\red This plot is completely devoid of weeds. It doesn't need uprooting." user << "<span class='danger'>This plot is completely devoid of weeds. It doesn't need uprooting.</span>"
else if (istype(O, /obj/item/weapon/storage/bag/plants)) else if (istype(O, /obj/item/weapon/storage/bag/plants))
@@ -730,7 +730,7 @@ var/global/list/plant_icon_cache = list()
else if(istype(O, /obj/item/apiary)) else if(istype(O, /obj/item/apiary))
if(seed) if(seed)
user << "\red [src] is already occupied!" user << "<span class='danger'>[src] is already occupied!</span>"
else else
user.drop_item() user.drop_item()
del(O) del(O)
@@ -762,17 +762,17 @@ var/global/list/plant_icon_cache = list()
else else
if(seed && !dead) if(seed && !dead)
usr << "[src] has \blue [seed.display_name] \black planted." usr << "[src] has <span class='notice'>[seed.display_name]</span> planted."
if(health <= (seed.endurance / 2)) if(health <= (seed.endurance / 2))
usr << "The plant looks \red unhealthy." usr << "The plant looks <span class='danger'>unhealthy</span>."
else else
usr << "[src] is empty." usr << "[src] is empty."
usr << "Water: [round(waterlevel,0.1)]/100" usr << "Water: [round(waterlevel,0.1)]/100"
usr << "Nutrient: [round(nutrilevel,0.1)]/10" usr << "Nutrient: [round(nutrilevel,0.1)]/10"
if(weedlevel >= 5) if(weedlevel >= 5)
usr << "[src] is \red filled with weeds!" usr << "[src] is <span class='danger'>filled with weeds</span>!"
if(pestlevel >= 5) if(pestlevel >= 5)
usr << "[src] is \red filled with tiny worms!" usr << "[src] is <span class='danger'>filled with tiny worms</span>!"
if(!istype(src,/obj/machinery/portable_atmospherics/hydroponics/soil)) if(!istype(src,/obj/machinery/portable_atmospherics/hydroponics/soil))

2
code/modules/hydroponics/seed_mobs.dm
View File

@@ -14,7 +14,7 @@
if(!host.ckey && !host.client) if(!host.ckey && !host.client)
host.death() // This seems redundant, but a lot of mobs don't host.death() // This seems redundant, but a lot of mobs don't
host.stat = 2 // handle death() properly. Better safe than etc. host.stat = 2 // handle death() properly. Better safe than etc.
host.visible_message("\red <b>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.") host.visible_message("<span class='danger'>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.</span>")
var/total_yield = rand(1,3) var/total_yield = rand(1,3)
for(var/j = 0;j<=total_yield;j++) for(var/j = 0;j<=total_yield;j++)

4
code/modules/reagents/reagent_containers/food/snacks/grown.dm
View File

@@ -380,7 +380,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/orange /obj/item/weapon/reagent_containers/food/snacks/grown/orange
name = "orange" name = "orange"
desc = "It's an tangy fruit." desc = "It's a tangy fruit."
icon_state = "orange" icon_state = "orange"
potency = 20 potency = 20
filling_color = "#FAAD28" filling_color = "#FAAD28"
@@ -436,7 +436,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato /obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato
name = "blood-tomato" name = "blood-tomato"
desc = "So bloody...so...very...bloody....AHHHH!!!!" desc = "So juicy."
icon_state = "bloodtomato" icon_state = "bloodtomato"
potency = 10 potency = 10
filling_color = "#FF0000" filling_color = "#FF0000"