cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert most spans to defines (#31080)

Browse Source 
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
This commit is contained in:
kyunkyunkyun
2025-12-13 23:55:48 +00:00
committed by GitHub
parent e5f0a6fffb
commit b0463d3c83
1624 changed files with 15737 additions and 15581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/smithing/machinery/casting_basin.dm
+30 -30
View File
@@ -37,32 +37,32 @@
/obj/machinery/smithing/casting_basin/examine(mob/user)
. = ..()
if(cast)
. += "<span class='notice'>You can activate the machine with your hand, or remove the cast by alt-clicking.</span>"
. += "<span class='notice'>There is a [cast] in the cast slot.</span>"
. += "<span class='notice'>Currently set to produce: [cast.selected_product.name]</span>"
. += SPAN_NOTICE("You can activate the machine with your hand, or remove the cast by alt-clicking.")
. += SPAN_NOTICE("There is a [cast] in the cast slot.")
. += SPAN_NOTICE("Currently set to produce: [cast.selected_product.name]")
if(istype(cast, /obj/item/smithing_cast/component) && !produced_item)
var/obj/item/temp_product = new cast.selected_product(src) // This is necessary due to selected_product being a type
var/obj/item/smithing_cast/component/comp_cast = cast
var/datum/smith_quality/quality = new comp_cast.quality
. += "<span class='notice'>Required Resources:</span>"
. += SPAN_NOTICE("Required Resources:")
var/MAT
// Get the materials the item needs and display
for(MAT in temp_product.materials)
. += "<span class='notice'> - [MAT]: [ROUND_UP(((temp_product.materials[MAT] * quality.material_mult) * efficiency) / MINERAL_MATERIAL_AMOUNT)] sheets.</span>"
. += SPAN_NOTICE(" - [MAT]: [ROUND_UP(((temp_product.materials[MAT] * quality.material_mult) * efficiency) / MINERAL_MATERIAL_AMOUNT)] sheets.")
// Get rid of the temp product
qdel(temp_product)
else if(istype(cast, /obj/item/smithing_cast/misc) && !produced_item)
var/obj/item/temp_product = new cast.selected_product(src) // This is necessary due to selected_product being a type
. += "<span class='notice'>Required Resources:</span>"
. += SPAN_NOTICE("Required Resources:")
var/MAT
// Get the materials the item needs and display
for(MAT in temp_product.materials)
. += "<span class='notice'> - [MAT]: [ROUND_UP((temp_product.materials[MAT] * efficiency) / MINERAL_MATERIAL_AMOUNT)] sheets.</span>"
. += SPAN_NOTICE(" - [MAT]: [ROUND_UP((temp_product.materials[MAT] * efficiency) / MINERAL_MATERIAL_AMOUNT)] sheets.")
// Get rid of the temp product
qdel(temp_product)
if(produced_item)
. += "<span class='notice'>There is a [produced_item] in the machine. You can pick it up with your hand.</span>"
. += SPAN_NOTICE("There is a [produced_item] in the machine. You can pick it up with your hand.")
/obj/machinery/smithing/casting_basin/RefreshParts()
var/operation_mult = 0
@@ -112,25 +112,25 @@
if(panel_open)
var/obj/item/multitool/multi = I
if(!istype(multi.buffer, /obj/machinery/magma_crucible))
to_chat(user, "<span class='notice'>You cannot link [src] to [multi.buffer]!</span>")
to_chat(user, SPAN_NOTICE("You cannot link [src] to [multi.buffer]!"))
return
linked_crucible = multi.buffer
linked_crucible.linked_machines |= src
to_chat(user, "<span class='notice'>You link [src] to [multi.buffer].</span>")
to_chat(user, SPAN_NOTICE("You link [src] to [multi.buffer]."))
/obj/machinery/smithing/casting_basin/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(!istype(used, /obj/item/smithing_cast))
to_chat(user, "<span class='warning'>[used] does not fit in [src]'s cast slot.</span>")
to_chat(user, SPAN_WARNING("[used] does not fit in [src]'s cast slot."))
return
if(used.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
if(cast)
user.put_in_active_hand(cast)
to_chat(user, "<span class='notice'>You swap [used] with [cast] in [src].</span>")
to_chat(user, SPAN_NOTICE("You swap [used] with [cast] in [src]."))
else
to_chat(user, "<span class='notice'>You insert [used] into [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [used] into [src]."))
cast = used
update_icon(UPDATE_OVERLAYS)
return ITEM_INTERACT_COMPLETE
@@ -139,18 +139,18 @@
if(!Adjacent(user))
return
if(!we_are_open)
to_chat(user, "<span class='notice'>You open [src].</span>")
to_chat(user, SPAN_NOTICE("You open [src]."))
we_are_open = TRUE
update_icon(UPDATE_OVERLAYS)
return
if(produced_item)
to_chat(user, "<span class='warning'>Remove the item first!</span>")
to_chat(user, SPAN_WARNING("Remove the item first!"))
return
if(!cast)
to_chat(user, "<span class='warning'>There is no cast to remove.</span>")
to_chat(user, SPAN_WARNING("There is no cast to remove."))
return
if(operating)
to_chat(user, "<span class='warning'>[src] is currently operating!</span>")
to_chat(user, SPAN_WARNING("[src] is currently operating!"))
return
user.put_in_hands(cast)
cast = null
@@ -158,7 +158,7 @@
/obj/machinery/smithing/casting_basin/attack_hand(mob/user)
if(!we_are_open)
to_chat(user, "<span class='notice'>You open [src].</span>")
to_chat(user, SPAN_NOTICE("You open [src]."))
we_are_open = TRUE
update_icon(UPDATE_OVERLAYS)
return FINISH_ATTACK
@@ -174,16 +174,16 @@
update_icon(UPDATE_OVERLAYS)
return FINISH_ATTACK
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, SPAN_WARNING("Access denied."))
return FINISH_ATTACK
if(!cast)
to_chat(user, "<span class='warning'>There is no cast inserted!</span>")
to_chat(user, SPAN_WARNING("There is no cast inserted!"))
return FINISH_ATTACK
if(!linked_crucible)
to_chat(user, "<span class='warning'>There is no linked magma crucible!</span>")
to_chat(user, SPAN_WARNING("There is no linked magma crucible!"))
return FINISH_ATTACK
if(operating)
to_chat(user, "<span class='warning'>[src] is currently operating!</span>")
to_chat(user, SPAN_WARNING("[src] is currently operating!"))
return FINISH_ATTACK
var/datum/component/material_container/materials = linked_crucible.GetComponent(/datum/component/material_container)
@@ -192,7 +192,7 @@
var/MAT
if(!istype(temp_product))
to_chat(user, "<span class='warning'>The product is not an item! This is a problem you should make an issue report about!</span>")
to_chat(user, SPAN_WARNING("The product is not an item! This is a problem you should make an issue report about!"))
log_debug("Attempted to make [temp_product] at a casting basin, product is not an item.")
return FINISH_ATTACK
@@ -206,11 +206,11 @@
used_mats[MAT] = (temp_product.materials[MAT] * quality.material_mult) * efficiency
if(!materials.has_materials(used_mats, 1))
to_chat(user, "<span class='warning'>Not enough materials in the crucible to smelt [temp_product.name]!</span>")
to_chat(user, SPAN_WARNING("Not enough materials in the crucible to smelt [temp_product.name]!"))
qdel(temp_product)
return FINISH_ATTACK
to_chat(user, "<span class='notice'>You begin to pour the liquid minerals into the [src]...</span>")
to_chat(user, SPAN_NOTICE("You begin to pour the liquid minerals into the [src]..."))
// Use the materials and create the item.
materials.use_amount(used_mats)
we_are_open = FALSE
@@ -241,11 +241,11 @@
if(istype(cast, /obj/item/smithing_cast/sheet))
amount = min(amount, stored, MAX_STACK_SIZE)
if(!amount)
to_chat(user, "<span class='warning'>Not enough materials in the crucible to smelt a sheet of [temp_product.name]!</span>")
to_chat(user, SPAN_WARNING("Not enough materials in the crucible to smelt a sheet of [temp_product.name]!"))
qdel(temp_product)
return FINISH_ATTACK
to_chat(user, "<span class='notice'>You begin to pour the liquid minerals into the [src]...</span>")
to_chat(user, SPAN_NOTICE("You begin to pour the liquid minerals into the [src]..."))
playsound(src, 'sound/machines/recycler.ogg', 50, FALSE)
// Use the materials and create the item.
materials.use_amount(temp_product.materials, amount)
@@ -267,11 +267,11 @@
used_mats[MAT] = temp_product.materials[MAT] * efficiency
if(!materials.has_materials(used_mats, 1))
to_chat(user, "<span class='warning'>Not enough materials in the crucible to smelt [temp_product.name]!</span>")
to_chat(user, SPAN_WARNING("Not enough materials in the crucible to smelt [temp_product.name]!"))
qdel(temp_product)
return FINISH_ATTACK
to_chat(user, "<span class='notice'>You begin to pour the liquid minerals into the [src]...</span>")
to_chat(user, SPAN_NOTICE("You begin to pour the liquid minerals into the [src]..."))
// Use the materials and create the item.
materials.use_amount(used_mats)
linked_crucible.animate_pour(operation_time SECONDS)
code/modules/smithing/machinery/kinetic_assembler.dm
+54 -54
View File
@@ -50,15 +50,15 @@
/obj/machinery/smithing/kinetic_assembler/examine(mob/user)
. = ..()
if(primary || secondary || trim)
. += "<span class='notice'>You can activate the machine with your hand, or remove a component by alt-clicking.</span>"
. += SPAN_NOTICE("You can activate the machine with your hand, or remove a component by alt-clicking.")
if(primary)
. += "<span class='notice'>There is a [primary] in the primary slot.</span>"
. += SPAN_NOTICE("There is a [primary] in the primary slot.")
if(secondary)
. += "<span class='notice'>There is a [secondary] in the secondary slot.</span>"
. += SPAN_NOTICE("There is a [secondary] in the secondary slot.")
if(trim)
. += "<span class='notice'>There is a [trim] in the trim slot.</span>"
. += SPAN_NOTICE("There is a [trim] in the trim slot.")
if(finished_product)
. += "<span class='notice'>There is a nearly-complete [finished_product] on the assembler. To complete the product, strike it with your hammer!</span>"
. += SPAN_NOTICE("There is a nearly-complete [finished_product] on the assembler. To complete the product, strike it with your hammer!")
/obj/machinery/smithing/kinetic_assembler/RefreshParts()
var/operation_mult = 0
@@ -88,7 +88,7 @@
if(!Adjacent(user))
return
if(!primary && !secondary && !trim)
to_chat(user, "<span class='warning'>There is no component to remove.</span>")
to_chat(user, SPAN_WARNING("There is no component to remove."))
return
var/list/components = list("Primary", "Secondary", "Trim")
var/removed = tgui_input_list(user, "Select a component to remove", src, components)
@@ -97,9 +97,9 @@
switch(removed)
if("Primary")
if(!primary)
to_chat(user, "<span class='warning'>There is no primary component to remove.</span>")
to_chat(user, SPAN_WARNING("There is no primary component to remove."))
return
to_chat(user, "<span class='notice'>You remove [primary] from the primary component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [primary] from the primary component slot of [src]."))
if(primary.burn_check(user))
primary.burn_user(user)
primary.forceMove(user.loc)
@@ -110,9 +110,9 @@
return
if("Secondary")
if(!secondary)
to_chat(user, "<span class='warning'>There is no secondary component to remove.</span>")
to_chat(user, SPAN_WARNING("There is no secondary component to remove."))
return
to_chat(user, "<span class='notice'>You remove [secondary] from the secondary component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [secondary] from the secondary component slot of [src]."))
if(secondary.burn_check(user))
secondary.burn_user(user)
secondary.forceMove(user.loc)
@@ -123,9 +123,9 @@
return
if("Trim")
if(!trim)
to_chat(user, "<span class='warning'>There is no trim component to remove.</span>")
to_chat(user, SPAN_WARNING("There is no trim component to remove."))
return
to_chat(user, "<span class='notice'>You remove [trim] from the trim component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [trim] from the trim component slot of [src]."))
if(trim.burn_check(user))
trim.burn_user(user)
trim.forceMove(user.loc)
@@ -140,83 +140,83 @@
return ..()
if(operating)
to_chat(user, "<span class='warning'>[src] is still operating!</span>")
to_chat(user, SPAN_WARNING("[src] is still operating!"))
return ITEM_INTERACT_COMPLETE
if(istype(used, /obj/item/hammer))
return ITEM_INTERACT_COMPLETE
if(!istype(used, /obj/item/smithed_item/component))
to_chat(user, "<span class='warning'>You feel like there's no reason to process [used].</span>")
to_chat(user, SPAN_WARNING("You feel like there's no reason to process [used]."))
return ITEM_INTERACT_COMPLETE
if(finished_product)
to_chat(user, "<span class='warning'>There is an almost finished [finished_product] in [src]!</span>")
to_chat(user, SPAN_WARNING("There is an almost finished [finished_product] in [src]!"))
return ITEM_INTERACT_COMPLETE
var/obj/item/smithed_item/component/comp = used
if(comp.hammer_time)
to_chat(user, "<span class='warning'>[used] is not complete yet!</span>")
to_chat(user, SPAN_WARNING("[used] is not complete yet!"))
return ITEM_INTERACT_COMPLETE
if(comp.part_type == PART_PRIMARY)
if(primary)
to_chat(user, "<span class='notice'>You remove [primary] from the primary component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [primary] from the primary component slot of [src]."))
primary.forceMove(src.loc)
primary = null
if(comp.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[comp] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[comp] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='notice'>You insert [comp] into the primary component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [comp] into the primary component slot of [src]."))
primary = comp
return ITEM_INTERACT_COMPLETE
if(comp.part_type == PART_SECONDARY)
if(secondary)
to_chat(user, "<span class='notice'>You remove [secondary] from the secondary component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [secondary] from the secondary component slot of [src]."))
secondary.forceMove(src.loc)
secondary = null
if(comp.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[comp] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[comp] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='notice'>You insert [comp] into the secondary component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [comp] into the secondary component slot of [src]."))
secondary = comp
return ITEM_INTERACT_COMPLETE
if(comp.part_type == PART_TRIM)
if(trim)
to_chat(user, "<span class='notice'>You remove [trim] from the trim component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [trim] from the trim component slot of [src]."))
trim.forceMove(src.loc)
trim = null
if(comp.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[comp] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[comp] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='notice'>You insert [comp] into the trim component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [comp] into the trim component slot of [src]."))
trim = comp
return ITEM_INTERACT_COMPLETE
/obj/machinery/smithing/kinetic_assembler/attack_hand(mob/user)
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, SPAN_WARNING("Access denied."))
return FINISH_ATTACK
if(finished_product)
to_chat(user, "<span class='warning'>[src] has a nearly-complete product!</span>")
to_chat(user, SPAN_WARNING("[src] has a nearly-complete product!"))
return FINISH_ATTACK
if(!primary)
to_chat(user, "<span class='warning'>[src] lacks a primary component!</span>")
to_chat(user, SPAN_WARNING("[src] lacks a primary component!"))
return FINISH_ATTACK
if(!secondary)
to_chat(user, "<span class='warning'>[src] lacks a secondary component!</span>")
to_chat(user, SPAN_WARNING("[src] lacks a secondary component!"))
return FINISH_ATTACK
if(!trim)
to_chat(user, "<span class='warning'>[src] lacks a trim component!</span>")
to_chat(user, SPAN_WARNING("[src] lacks a trim component!"))
return FINISH_ATTACK
if(primary.finished_product != secondary.finished_product)
to_chat(user, "<span class='warning'>[primary] does not match [secondary]!</span>")
to_chat(user, SPAN_WARNING("[primary] does not match [secondary]!"))
return FINISH_ATTACK
operate(operation_time, user)
@@ -254,10 +254,10 @@
/obj/machinery/smithing/kinetic_assembler/hammer_act(mob/user, obj/item/i)
if(operating)
to_chat(user, "<span class='warning'>[src] is still operating!</span>")
to_chat(user, SPAN_WARNING("[src] is still operating!"))
return
if(!finished_product)
to_chat(user, "<span class='warning'>There is no finished product ready!</span>")
to_chat(user, SPAN_WARNING("There is no finished product ready!"))
return
playsound(src, 'sound/magic/fellowship_armory.ogg', 50, TRUE)
finished_product.forceMove(src.loc)
@@ -323,13 +323,13 @@
/obj/machinery/smithing/scientific_assembler/examine(mob/user)
. = ..()
if(slime_core || parts || cell)
. += "<span class='notice'>You can activate the machine with your hand, or remove a component by alt-clicking.</span>"
. += SPAN_NOTICE("You can activate the machine with your hand, or remove a component by alt-clicking.")
if(slime_core)
. += "<span class='notice'>There is a [slime_core] in the core slot.</span>"
. += SPAN_NOTICE("There is a [slime_core] in the core slot.")
if(parts)
. += "<span class='notice'>There is a [parts] in the gun frame slot.</span>"
. += SPAN_NOTICE("There is a [parts] in the gun frame slot.")
if(cell)
. += "<span class='notice'>There is a [cell] in the power cell slot.</span>"
. += SPAN_NOTICE("There is a [cell] in the power cell slot.")
/obj/machinery/smithing/scientific_assembler/RefreshParts()
var/operation_mult = 0
@@ -360,70 +360,70 @@
return ..()
if(operating)
to_chat(user, "<span class='warning'>[src] is still operating!</span>")
to_chat(user, SPAN_WARNING("[src] is still operating!"))
return ITEM_INTERACT_COMPLETE
if(istype(used, /obj/item/slime_extract))
var/obj/item/slime_extract/core = used
if(!core.associated_gun_type)
to_chat(user, "<span class='notice'>[core] is not capable of producing an energy gun!</span>")
to_chat(user, SPAN_NOTICE("[core] is not capable of producing an energy gun!"))
return ITEM_INTERACT_COMPLETE
if(slime_core)
to_chat(user, "<span class='notice'>You remove [slime_core] from the core component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [slime_core] from the core component slot of [src]."))
slime_core.forceMove(src.loc)
slime_core = null
if(used.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='notice'>You insert [used] into the core component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [used] into the core component slot of [src]."))
slime_core = used
return ITEM_INTERACT_COMPLETE
if(istype(used, /obj/item/smithed_item/component/egun_parts))
if(parts)
to_chat(user, "<span class='notice'>You remove [parts] from the gun parts component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [parts] from the gun parts component slot of [src]."))
parts.forceMove(src.loc)
parts = null
if(used.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
var/obj/item/smithed_item/component/egun_parts/new_parts = used
if(new_parts.hammer_time)
to_chat(user, "<span class='warning'>[new_parts] is not complete yet!</span>")
to_chat(user, SPAN_WARNING("[new_parts] is not complete yet!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='notice'>You insert [used] into the gun parts component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [used] into the gun parts component slot of [src]."))
parts = used
return ITEM_INTERACT_COMPLETE
if(istype(used, /obj/item/stock_parts/cell))
if(cell)
to_chat(user, "<span class='notice'>You remove [cell] from the power cell component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You remove [cell] from the power cell component slot of [src]."))
cell.forceMove(src.loc)
cell = null
if(used.flags & NODROP || !user.transfer_item_to(used, src))
to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='notice'>You insert [used] into the power cell component slot of [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [used] into the power cell component slot of [src]."))
cell = used
return ITEM_INTERACT_COMPLETE
to_chat(user, "<span class='warning'>You feel like there's no reason to process [used].</span>")
to_chat(user, SPAN_WARNING("You feel like there's no reason to process [used]."))
return ITEM_INTERACT_COMPLETE
/obj/machinery/smithing/scientific_assembler/attack_hand(mob/user)
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, SPAN_WARNING("Access denied."))
return FINISH_ATTACK
if(!slime_core)
to_chat(user, "<span class='warning'>[src] lacks a slime core!</span>")
to_chat(user, SPAN_WARNING("[src] lacks a slime core!"))
return FINISH_ATTACK
if(!parts)
to_chat(user, "<span class='warning'>[src] lacks an energy gun frame!</span>")
to_chat(user, SPAN_WARNING("[src] lacks an energy gun frame!"))
return FINISH_ATTACK
if(!cell)
to_chat(user, "<span class='warning'>[src] lacks a power cell!</span>")
to_chat(user, SPAN_WARNING("[src] lacks a power cell!"))
return FINISH_ATTACK
operate(operation_time, user)
code/modules/smithing/machinery/lava_furnace.dm
+8 -8
View File
@@ -47,10 +47,10 @@
/obj/machinery/smithing/lava_furnace/operate(loops, mob/living/user)
if(working_component.heat > 10)
to_chat(user, "<span class='notice'>[working_component] is already well heated.</span>")
to_chat(user, SPAN_NOTICE("[working_component] is already well heated."))
return
if(working_component.hammer_time <= 0)
to_chat(user, "<span class='notice'>[working_component] is already fully shaped.</span>")
to_chat(user, SPAN_NOTICE("[working_component] is already fully shaped."))
return
..()
working_component.heat_up(heat_amount)
@@ -58,13 +58,13 @@
/obj/machinery/smithing/lava_furnace/attack_hand(mob/user)
. = ..()
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, SPAN_WARNING("Access denied."))
return FINISH_ATTACK
if(operating)
to_chat(user, "<span class='warning'>[src] is currently operating!</span>")
to_chat(user, SPAN_WARNING("[src] is currently operating!"))
return
if(!working_component)
to_chat(user, "<span class='warning'>There is nothing in [src]!</span>")
to_chat(user, SPAN_WARNING("There is nothing in [src]!"))
return
operate(operation_time, user)
@@ -73,10 +73,10 @@
/obj/machinery/smithing/lava_furnace/special_attack(mob/user, mob/living/target)
var/obj/item/organ/external/head/head = target.get_organ(BODY_ZONE_HEAD)
if(!istype(head))
to_chat(user, "<span class='warning'>This person doesn't have a head!</span>")
to_chat(user, SPAN_WARNING("This person doesn't have a head!"))
return FALSE
target.visible_message("<span class='danger'>[user] pushes [target]'s head into [src]!</span>", \
"<span class='userdanger'>[user] pushes your head into [src]! The heat is agonizing!</span>")
target.visible_message(SPAN_DANGER("[user] pushes [target]'s head into [src]!"), \
SPAN_USERDANGER("[user] pushes your head into [src]! The heat is agonizing!"))
var/armor = target.run_armor_check(def_zone = BODY_ZONE_HEAD, armor_type = MELEE, armor_penetration_percentage = 50)
target.apply_damage(40, BURN, BODY_ZONE_HEAD, armor)
target.adjust_fire_stacks(5)
code/modules/smithing/machinery/magma_crucible.dm
+3 -3
View File
@@ -41,7 +41,7 @@
/obj/machinery/magma_crucible/examine(mob/user)
. = ..()
. += "<span class='notice'>You can check the contents of [src] using a multitool.</span>"
. += SPAN_NOTICE("You can check the contents of [src] using a multitool.")
/obj/machinery/magma_crucible/screwdriver_act(mob/user, obj/item/I)
if(!I.use_tool(src, user, 0, volume = 0))
@@ -142,11 +142,11 @@
return
var/obj/item/multitool/multi = I
multi.set_multitool_buffer(user, src)
to_chat(user, "<span class='notice'>You save [src]'s linking data to the buffer.</span>")
to_chat(user, SPAN_NOTICE("You save [src]'s linking data to the buffer."))
return
var/list/msgs = list()
msgs += "<span class='notice'>Scanning contents of [src]:</span>"
msgs += SPAN_NOTICE("Scanning contents of [src]:")
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
for(var/MAT in materials.materials)
code/modules/smithing/machinery/power_hammer.dm
+12 -12
View File
@@ -18,8 +18,8 @@
/obj/machinery/smithing/power_hammer/examine(mob/user)
. = ..()
. += "<span class='notice'>You can set [src] to automatically continue hammering heated metal with a multitool.</span>"
. += "<span class='notice'>The autohammer light is currently [repeating ? "on" : "off"].</span>"
. += SPAN_NOTICE("You can set [src] to automatically continue hammering heated metal with a multitool.")
. += SPAN_NOTICE("The autohammer light is currently [repeating ? "on" : "off"].")
/obj/machinery/smithing/power_hammer/update_overlays()
. = ..()
@@ -46,13 +46,13 @@
/obj/machinery/smithing/power_hammer/operate(loops, mob/living/user)
if(!working_component)
to_chat(user, "<span class='notice'>There is no component to hammer!</span>")
to_chat(user, SPAN_NOTICE("There is no component to hammer!"))
return
if(!working_component.heat)
to_chat(user, "<span class='notice'>[working_component] is too cold to properly shape.</span>")
to_chat(user, SPAN_NOTICE("[working_component] is too cold to properly shape."))
return
if(working_component.hammer_time <= 0)
to_chat(user, "<span class='notice'>[working_component] is already fully shaped.</span>")
to_chat(user, SPAN_NOTICE("[working_component] is already fully shaped."))
return
..()
working_component.powerhammer()
@@ -70,18 +70,18 @@
return
if(!repeating)
repeating = TRUE
to_chat(user, "<span class='notice'>You set [src] to auto-repeat.</span>")
to_chat(user, SPAN_NOTICE("You set [src] to auto-repeat."))
else
repeating = FALSE
to_chat(user, "<span class='notice'>You set [src] to not auto-repeat.</span>")
to_chat(user, SPAN_NOTICE("You set [src] to not auto-repeat."))
/obj/machinery/smithing/power_hammer/attack_hand(mob/user)
. = ..()
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>Access denied.</span>")
to_chat(user, SPAN_WARNING("Access denied."))
return FINISH_ATTACK
if(operating)
to_chat(user, "<span class='warning'>[src] is currently operating!</span>")
to_chat(user, SPAN_WARNING("[src] is currently operating!"))
return
operate(operation_time, user)
update_icon(UPDATE_ICON_STATE)
@@ -90,10 +90,10 @@
/obj/machinery/smithing/power_hammer/special_attack(mob/user, mob/living/target)
var/obj/item/organ/external/head/head = target.get_organ(BODY_ZONE_HEAD)
if(!istype(head))
to_chat(user, "<span class='warning'>This person doesn't have a head!</span>")
to_chat(user, SPAN_WARNING("This person doesn't have a head!"))
return FALSE
target.visible_message("<span class='danger'>[user] hammers [target]'s head with [src]!</span>", \
"<span class='userdanger'>[user] hammers your head with [src]! Did somebody get the license plate on that car?</span>")
target.visible_message(SPAN_DANGER("[user] hammers [target]'s head with [src]!"), \
SPAN_USERDANGER("[user] hammers your head with [src]! Did somebody get the license plate on that car?"))
var/armor = target.run_armor_check(def_zone = BODY_ZONE_HEAD, armor_type = MELEE, armor_penetration_percentage = 50)
target.apply_damage(40, BRUTE, BODY_ZONE_HEAD, armor)
target.Weaken(4 SECONDS)
code/modules/smithing/machinery/smart_hopper.dm
+7 -7
View File
@@ -45,7 +45,7 @@
/obj/machinery/mineral/smart_hopper/examine(mob/user)
. = ..()
. += "<span class='notice'>There are currently [points] claimable points. [points ? "Swipe your ID to claim them." : ""]</span>"
. += SPAN_NOTICE("There are currently [points] claimable points. [points ? "Swipe your ID to claim them." : ""]")
/obj/machinery/mineral/smart_hopper/update_overlays()
. = ..()
@@ -99,19 +99,19 @@
if(istype(used, /obj/item/card/id))
var/obj/item/card/id/ID = used
if(!points)
to_chat(user, "<span class='warning'>There are no points to claim.</span>");
to_chat(user, SPAN_WARNING("There are no points to claim."));
return ITEM_INTERACT_COMPLETE
var/claimed = FALSE
for(var/access in req_access_claim)
if(anyone_claim || (access in ID.access))
ID.mining_points += points
ID.total_mining_points += points
to_chat(user, "<span class='notice'><b>[points] Mining Points</b> claimed. You have earned a total of <b>[ID.total_mining_points] Mining Points</b> this Shift!</span>")
to_chat(user, SPAN_NOTICE("<b>[points] Mining Points</b> claimed. You have earned a total of <b>[ID.total_mining_points] Mining Points</b> this Shift!"))
points = 0
claimed = TRUE
break
if(!claimed)
to_chat(user, "<span class='warning'>Required access not found.</span>")
to_chat(user, SPAN_WARNING("Required access not found."))
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
return ..()
@@ -125,11 +125,11 @@
if(panel_open)
var/obj/item/multitool/multi = I
if(!istype(multi.buffer, /obj/machinery/magma_crucible))
to_chat(user, "<span class='warning'>You cannot link [src] to [multi.buffer]!</span>")
to_chat(user, SPAN_WARNING("You cannot link [src] to [multi.buffer]!"))
return
linked_crucible = multi.buffer
linked_crucible.linked_machines |= src
to_chat(user, "<span class='notice'>You link [src] to [multi.buffer].</span>")
to_chat(user, SPAN_NOTICE("You link [src] to [multi.buffer]."))
/obj/machinery/mineral/smart_hopper/crowbar_act(mob/user, obj/item/I)
if(default_deconstruction_crowbar(user, I))
@@ -150,7 +150,7 @@
if(!I.tool_start_check(src, user, 0))
return
input_dir = turn(input_dir, -90)
to_chat(user, "<span class='notice'>You change [src]'s input, moving the input to [dir2text(input_dir)].</span>")
to_chat(user, SPAN_NOTICE("You change [src]'s input, moving the input to [dir2text(input_dir)]."))
/obj/machinery/mineral/smart_hopper/Destroy()
if(linked_crucible)
code/modules/smithing/smith_component.dm
+2 -2
View File
@@ -49,7 +49,7 @@
else
. += "It is complete."
if(heat)
. +="<span class='warning'>It is glowing hot!</span>"
. +=SPAN_WARNING("It is glowing hot!")
/obj/item/smithed_item/component/attack_hand(mob/user)
if(!heat)
@@ -84,7 +84,7 @@
var/mob/living/carbon/human/H = user
if(!istype(H))
return
to_chat(user, "<span class='warning'>You burn your hand as you try to pick up [src]!</span>")
to_chat(user, SPAN_WARNING("You burn your hand as you try to pick up [src]!"))
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
if(affecting.receive_damage(0, 10)) // 10 burn damage
H.UpdateDamageIcon()
code/modules/smithing/smith_item.dm
+1 -1
View File
@@ -45,4 +45,4 @@
/obj/item/smithed_item/examine(mob/user)
. = ..()
if(HAS_TRAIT(user.mind, TRAIT_SMITH))
. += "<span class='notice'>You can use <b>ALT + Click</b> while in-hand to determine specific statistics of this item.</span>"
. += SPAN_NOTICE("You can use <b>ALT + Click</b> while in-hand to determine specific statistics of this item.")
code/modules/smithing/smith_machinery.dm
+14 -14
View File
@@ -29,8 +29,8 @@
/obj/machinery/smithing/examine(mob/user)
. = ..()
if(working_component)
. += "<span class='notice'>You can activate the machine with your hand, or remove the component by alt-clicking.</span>"
. += "<span class='notice'>There is currently a [working_component] in [src].</span>"
. += SPAN_NOTICE("You can activate the machine with your hand, or remove the component by alt-clicking.")
. += SPAN_NOTICE("There is currently a [working_component] in [src].")
/obj/machinery/smithing/power_change()
if(!..())
@@ -49,25 +49,25 @@
if(istype(used, /obj/item/grab))
var/obj/item/grab/G = used
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='danger'>Putting [G.affecting] in [src] might hurt them!</span>")
to_chat(user, SPAN_DANGER("Putting [G.affecting] in [src] might hurt them!"))
return ITEM_INTERACT_COMPLETE
special_attack_grab(G, user)
return ITEM_INTERACT_COMPLETE
if(operating)
to_chat(user, "<span class='warning'>[src] is still operating!</span>")
to_chat(user, SPAN_WARNING("[src] is still operating!"))
return FINISH_ATTACK
if(istype(used, /obj/item/smithed_item/component))
if(used.flags & NODROP || !user.drop_item() || !used.forceMove(src))
to_chat(user, "<span class='warning'>[used] is stuck to your hand!</span>")
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
if(working_component)
user.put_in_active_hand(working_component)
to_chat(user, "<span class='notice'>You swap [used] with [working_component] in [src].</span>")
to_chat(user, SPAN_NOTICE("You swap [used] with [working_component] in [src]."))
else
to_chat(user, "<span class='notice'>You insert [used] into [src].</span>")
to_chat(user, SPAN_NOTICE("You insert [used] into [src]."))
working_component = used
return ITEM_INTERACT_COMPLETE
@@ -78,7 +78,7 @@
playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1)
req_one_access = list()
emagged = TRUE
to_chat(user, "<span class='notice'>You disable the security protocols</span>")
to_chat(user, SPAN_NOTICE("You disable the security protocols"))
return TRUE
/obj/machinery/smithing/proc/operate(loops, mob/living/user)
@@ -103,13 +103,13 @@
if(!istype(G))
return FALSE
if(!iscarbon(G.affecting))
to_chat(user, "<span class='warning'>You can't shove that in there!</span>")
to_chat(user, SPAN_WARNING("You can't shove that in there!"))
return FALSE
if(G.state < GRAB_NECK)
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
to_chat(user, SPAN_WARNING("You need a better grip to do that!"))
return FALSE
if(!allowed(user) && !isobserver(user))
to_chat(user, "<span class='warning'>You try to shove someone into the machine, but your access is denied!</span>")
to_chat(user, SPAN_WARNING("You try to shove someone into the machine, but your access is denied!"))
return FALSE
var/result = special_attack(user, G.affecting)
user.changeNext_move(CLICK_CD_MELEE)
@@ -128,10 +128,10 @@
if(!Adjacent(user))
return
if(!working_component)
to_chat(user, "<span class='notice'>There isn't anything in [src].</span>")
to_chat(user, SPAN_NOTICE("There isn't anything in [src]."))
return
if(operating)
to_chat(user, "<span class='warning'>[src] is currently operating!</span>")
to_chat(user, SPAN_WARNING("[src] is currently operating!"))
return
if(working_component.burn_check(user))
working_component.burn_user(user)
@@ -146,7 +146,7 @@
return
. = TRUE
if(operating)
to_chat(user, "<span class='alert'>[src] is busy. Please wait for completion of previous operation.</span>")
to_chat(user, SPAN_ALERT("[src] is busy. Please wait for completion of previous operation."))
return
default_deconstruction_screwdriver(user, icon_state, icon_state, I)
code/modules/smithing/smithed_items/knives.dm
+3 -3
View File
@@ -97,7 +97,7 @@
return ITEM_INTERACT_COMPLETE
var/obj/item/stack/stacked_item = used
if(wrap_type)
to_chat(user, "<span class='warning'>There is already a wrap on [src]!</span>")
to_chat(user, SPAN_WARNING("There is already a wrap on [src]!"))
return ITEM_INTERACT_COMPLETE
var/wrap_to_attach
if(istype(stacked_item, /obj/item/stack/cable_coil))
@@ -113,7 +113,7 @@
if(istype(stacked_item, /obj/item/stack/sheet/mothsilk))
wrap_to_attach = /datum/handle_wrapping/mothsilk
if(!wrap_to_attach)
to_chat(user, "<span class='warning'>You cannot wrap [stacked_item] around [src]!</span>")
to_chat(user, SPAN_WARNING("You cannot wrap [stacked_item] around [src]!"))
return ITEM_INTERACT_COMPLETE
if(do_after_once(user, 5 SECONDS, target = src))
if(stacked_item.use(5))
@@ -123,7 +123,7 @@
/obj/item/kitchen/knife/smithed/wirecutter_act(mob/living/user, obj/item/I)
. = ..()
if(wrap_type)
to_chat(user, "<span class='notice'>You cut off the wrap on [src].</span>")
to_chat(user, SPAN_NOTICE("You cut off the wrap on [src]."))
remove_wrapping()
/obj/item/kitchen/knife/smithed/utility
code/modules/smithing/smithed_items/lens.dm
+1 -1
View File
@@ -74,7 +74,7 @@
if(20 to 39)
. += "It's been heavily used."
if(0 to 19)
. += "<span class='warning'>It's falling apart!</span>"
. += SPAN_WARNING("It's falling apart!")
/obj/item/smithed_item/lens/proc/damage_lens()
durability--
code/modules/smithing/smithed_items/tool_bits.dm
+1 -1
View File
@@ -73,7 +73,7 @@
if(20 to 39)
. += "It's been heavily used."
if(0 to 19)
. += "<span class='warning'>It's falling apart!</span>"
. += SPAN_WARNING("It's falling apart!")
/obj/item/smithed_item/tool_bit/proc/damage_bit()
durability--
code/modules/smithing/smithing_cast.dm
+3 -3
View File
@@ -22,7 +22,7 @@
/obj/item/smithing_cast/examine(mob/user)
. = ..()
. += "It is currently configured to make [amount_to_make == 1 ? "a" : "[amount_to_make]"] [selected_product.name][amount_to_make == 1 ? "" : "s"]."
. += "<span class='notice'>You can select the desired product by using [src] in your hand.</span>"
. += SPAN_NOTICE("You can select the desired product by using [src] in your hand.")
/obj/item/smithing_cast/activate_self(mob/user)
. = ..()
@@ -57,7 +57,7 @@
/obj/item/smithing_cast/sheet/examine(mob/user)
. = ..()
. += "<span class='notice'>You can change the amount of sheets smelted by alt-clicking [src].</span>"
. += SPAN_NOTICE("You can change the amount of sheets smelted by alt-clicking [src].")
/obj/item/smithing_cast/sheet/populate_products()
possible_products = list(/obj/item/stack/sheet/metal,
@@ -101,7 +101,7 @@
/obj/item/smithing_cast/component/examine(mob/user)
. = ..()
. += "The current selected quality is [quality.name]."
. += "<span class='notice'>You can change the quality of the product by alt-clicking [src].</span>"
. += SPAN_NOTICE("You can change the quality of the product by alt-clicking [src].")
/obj/item/smithing_cast/component/AltClick(mob/user)
. = ..()