cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] next set of spans (#9247)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-17 16:33:07 -07:00
committed by GitHub
parent bc6662ef9e
commit 7416cbea22
599 changed files with 2619 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/food/kitchen/cooking_machines/_appliance.dm
View File

@@ -116,11 +116,11 @@
if (progress < 0.75)
return span_notice("It's cooking away nicely.")
if (progress < 1)
return span_notice("<b>It's almost ready!</b>")
return span_boldnotice("It's almost ready!")
var/half_overcook = (CI.overcook_mult - 1)*0.5
if (progress < 1+half_overcook)
return span_soghun("<b>It is done !</b>")
return span_soghun(span_bold("It is done!"))
if (progress < CI.overcook_mult)
return span_warning("It looks overcooked, get it out!")
else
@@ -317,7 +317,7 @@
CI = new /datum/cooking_item/(CC)
I.forceMove(src)
cooking_objs.Add(CI)
user.visible_message("<b>\The [user]</b> puts \the [I] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " puts \the [I] into \the [src]."))
if (CC.check_contents() == 0)//If we're just putting an empty container in, then dont start any processing.
return TRUE
else
@@ -331,7 +331,7 @@
CI.combine_target = selected_option
// We can actually start cooking now.
user.visible_message("<b>\The [user]</b> puts \the [I] into \the [src].")
user.visible_message(span_infoplain(span_bold("\The [user]") + " puts \the [I] into \the [src]."))
get_cooking_work(CI)
cooking = TRUE
@@ -432,7 +432,7 @@
/obj/machinery/appliance/proc/finish_cooking(var/datum/cooking_item/CI)
src.visible_message("<b>\The [src]</b> pings!")
src.visible_message(span_infoplain(span_bold("\The [src]") + " pings!"))
if(cooked_sound)
playsound(get_turf(src), cooked_sound, 50, 1)
//Check recipes first, a valid recipe overrides other options
@@ -668,7 +668,7 @@
if(user)
user.visible_message(span_notice("\The [user] remove \the [thing] from \the [src]."))
else
src.visible_message("<b>\The [src]</b> pings as it automatically ejects its contents!")
src.visible_message(span_infoplain(span_bold("\The [src]") + " pings as it automatically ejects its contents!"))
if(cooked_sound)
playsound(get_turf(src), cooked_sound, 50, 1)
@@ -812,4 +812,4 @@
return
food_safety = !food_safety
to_chat(usr, "<span class = 'notice'>You flip \the [src]'s safe mode switch. Safe mode is now [food_safety ? "on" : "off"].</span>")
to_chat(usr, span_notice("You flip \the [src]'s safe mode switch. Safe mode is now [food_safety ? "on" : "off"]."))

2
code/modules/food/kitchen/cooking_machines/oven.dm
View File

@@ -148,7 +148,7 @@
/obj/machinery/appliance/cooker/oven/finish_cooking(var/datum/cooking_item/CI)
if(CI.combine_target)
CI.result_type = 3//Combination type. We're making something out of our ingredients
visible_message("<b>\The [src]</b> pings!")
visible_message(span_infoplain(span_bold("\The [src]") + " pings!"))
combination_cook(CI)
return
else

22
code/modules/food/kitchen/icecream.dm
View File

@@ -67,17 +67,17 @@
/obj/machinery/icecream_vat/interact(mob/user as mob)
var/dat
dat += "<b>ICECREAM</b><br><div class='statusDisplay'>"
dat += "<b>Dispensing: [flavour_name] icecream </b> <br><br>"
dat += "<b>Vanilla icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_VANILLA]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=5'><b>x5</b></a> [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)<br>"
dat += "<b>Strawberry icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_STRAWBERRY]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=5'><b>x5</b></a> [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)<br>"
dat += "<b>Chocolate icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_CHOCOLATE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=5'><b>x5</b></a> [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)<br>"
dat += "<b>Blue icecream:</b> <a href='?src=\ref[src];select=[ICECREAM_BLUE]'><b>Select</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=5'><b>x5</b></a> [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)<br></div>"
dat += "<br><b>CONES</b><br><div class='statusDisplay'>"
dat += "<b>Waffle cones:</b> <a href='?src=\ref[src];cone=[CONE_WAFFLE]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=5'><b>x5</b></a> [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)<br>"
dat += "<b>Chocolate cones:</b> <a href='?src=\ref[src];cone=[CONE_CHOC]'><b>Dispense</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=1'><b>Make</b></a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=5'><b>x5</b></a> [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)<br></div>"
dat += span_bold("ICECREAM") + "<br><div class='statusDisplay'>"
dat += span_bold("Dispensing: [flavour_name] icecream ") + " <br><br>"
dat += span_bold("Vanilla icecream:") + " <a href='?src=\ref[src];select=[ICECREAM_VANILLA]'>" + span_bold("Select") + "</a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=1'>" + span_bold("Make") + "</a> <a href='?src=\ref[src];make=[ICECREAM_VANILLA];amount=5'>" + span_bold("x5") + "</a> [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)<br>"
dat += span_bold("Strawberry icecream:") + " <a href='?src=\ref[src];select=[ICECREAM_STRAWBERRY]'>" + span_bold("Select") + "</a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=1'>" + span_bold("Make") + "</a> <a href='?src=\ref[src];make=[ICECREAM_STRAWBERRY];amount=5'>" + span_bold("x5") + "</a> [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)<br>"
dat += span_bold("Chocolate icecream:") + " <a href='?src=\ref[src];select=[ICECREAM_CHOCOLATE]'>" + span_bold("Select") + "</a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=1'>" + span_bold("Make") + "</a> <a href='?src=\ref[src];make=[ICECREAM_CHOCOLATE];amount=5'>" + span_bold("x5") + "</a> [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)<br>"
dat += span_bold("Blue icecream:") + " <a href='?src=\ref[src];select=[ICECREAM_BLUE]'>" + span_bold("Select") + "</a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=1'>" + span_bold("Make") + "</a> <a href='?src=\ref[src];make=[ICECREAM_BLUE];amount=5'>" + span_bold("x5") + "</a> [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)<br></div>"
dat += "<br>" + span_bold("CONES") + "<br><div class='statusDisplay'>"
dat += span_bold("Waffle cones:") + " <a href='?src=\ref[src];cone=[CONE_WAFFLE]'>" + span_bold("Dispense") + "</a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=1'>" + span_bold("Make") + "</a> <a href='?src=\ref[src];make=[CONE_WAFFLE];amount=5'>" + span_bold("x5") + "</a> [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)<br>"
dat += span_bold("Chocolate cones:") + " <a href='?src=\ref[src];cone=[CONE_CHOC]'>" + span_bold("Dispense") + "</a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=1'>" + span_bold("Make") + "</a> <a href='?src=\ref[src];make=[CONE_CHOC];amount=5'>" + span_bold("x5") + "</a> [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)<br></div>"
dat += "<br>"
dat += "<b>VAT CONTENT</b><br>"
dat += span_bold("VAT CONTENT") + "<br>"
for(var/datum/reagent/R in reagents.reagent_list)
dat += "[R.name]: [R.volume]"
dat += "<A href='?src=\ref[src];disposeI=[R.id]'>Purge</A><BR>"
@@ -98,7 +98,7 @@
var/obj/item/reagent_containers/food/snacks/icecream/I = O
if(!I.ice_creamed)
if(product_types[dispense_flavour] > 0)
src.visible_message("[icon2html(src,viewers(src))] <span class='info'>[user] scoops delicious [flavour_name] icecream into [I].</span>")
src.visible_message("[icon2html(src,viewers(src))] " + span_info("[user] scoops delicious [flavour_name] icecream into [I]."))
product_types[dispense_flavour] -= 1
I.add_ice_cream(flavour_name)
// if(beaker)

24
code/modules/food/kitchen/microwave.dm
View File

@@ -79,24 +79,24 @@
if(src.broken > 0)
if(src.broken == 2 && O.has_tool_quality(TOOL_SCREWDRIVER)) // If it's broken and they're using a screwdriver
user.visible_message( \
"<b>\The [user]</b> starts to fix part of the microwave.", \
span_infoplain(span_bold("\The [user]") + " starts to fix part of the microwave."), \
span_notice("You start to fix part of the microwave.") \
)
playsound(src, O.usesound, 50, 1)
if (do_after(user,20 * O.toolspeed))
user.visible_message( \
"<b>\The [user]</b> fixes part of the microwave.", \
span_infoplain(span_bold("\The [user]") + " fixes part of the microwave."), \
span_notice("You have fixed part of the microwave.") \
)
src.broken = 1 // Fix it a bit
else if(src.broken == 1 && O.has_tool_quality(TOOL_WRENCH)) // If it's broken and they're doing the wrench
user.visible_message( \
"<b>\The [user]</b> starts to fix part of the microwave.", \
span_infoplain(span_bold("\The [user]") + " starts to fix part of the microwave."), \
span_notice("You start to fix part of the microwave.") \
)
if (do_after(user,20 * O.toolspeed))
user.visible_message( \
"<b>\The [user]</b> fixes the microwave.", \
span_infoplain(span_bold("\The [user]") + " fixes the microwave."), \
span_notice("You have fixed the microwave.") \
)
src.icon_state = "mw"
@@ -110,7 +110,7 @@
else if(src.dirty==100) // The microwave is all dirty so can't be used!
if(istype(O, /obj/item/reagent_containers/spray/cleaner) || istype(O, /obj/item/soap)) // If they're trying to clean it then let them
user.visible_message( \
"<b>\The [user]</b> starts to clean the microwave.", \
span_infoplain(span_bold("\The [user]") + " starts to clean the microwave."), \
span_notice("You start to clean the microwave.") \
)
if (do_after(user,20))
@@ -357,23 +357,25 @@
for (var/O in items_counts)
var/N = items_counts[O]
if (!(O in items_measures))
dat += {"<B>[capitalize(O)]:</B> [N] [lowertext(O)]\s<BR>"}
dat += {span_bold("[capitalize(O)]:") + " [N] [lowertext(O)]\s<BR>"}
else
if (N==1)
dat += {"<B>[capitalize(O)]:</B> [N] [items_measures[O]]<BR>"}
dat +={span_bold("[capitalize(O)]:") + " [N] [items_measures[O]]<BR>"
else
dat += {"<B>[capitalize(O)]:</B> [N] [items_measures_p[O]]<BR>"}
dat += span_bold("[capitalize(O)]:") + " [N] [items_measures_p[O]]<BR>"
for (var/datum/reagent/R in reagents.reagent_list)
var/display_name = R.name
if (R.id == "capsaicin")
display_name = "Hotsauce"
if (R.id == "frostoil")
display_name = "Coldsauce"
dat += {"<B>[display_name]:</B> [R.volume] unit\s<BR>"}
dat += span_bold("[display_name]:") + " [R.volume] unit\s<BR>"
if (items_counts.len==0 && reagents.reagent_list.len==0)
dat = {"<B>The microwave is empty</B><BR>"}
dat = span_bold("The microwave is empty") + "<BR>"
else
dat = {"<b>Ingredients:</b><br>[dat]"}
dat = span_bold("Ingredients:") + "<br>[dat]"
dat += {"<HR><BR>\
<A href='?src=\ref[src];action=cook'>Turn on!<BR>\
<A href='?src=\ref[src];action=dispose'>Eject ingredients!<BR>\