diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index 62973585332..95d0d708d68 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -28,11 +28,11 @@
if (O:amount < 1)
del(O)
- user << "You insert [count] metal sheet\s into the fabricator."
+ user << "You insert [count] metal sheet\s into \the [src]."
src.overlays -= "fab-load-metal"
updateDialog()
else
- user << "The robot part maker is full. Please remove metal from the robot part maker in order to insert more."
+ user << "\The [src] is full."
/obj/machinery/robotic_fabricator/power_change()
if (powered())
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 86b038cc15a..53e6e6ab9be 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -191,7 +191,7 @@
for(var/ID in list(H.get_active_hand(), H.wear_id, H.belt))
if(src.check_access(ID))
return 1
- M << "You don't have required permissions to use [src]"
+ M << "You don't have the required permissions to use \the [src]!"
return 0
/obj/machinery/mecha_part_fabricator/check_access(obj/item/weapon/card/id/I)
@@ -210,19 +210,19 @@
switch(emagged)
if(0)
emagged = 0.5
- src.visible_message("\icon[src] [src] beeps: \"DB error \[Code 0x00F1\]\"")
+ src.visible_message("\icon[src] \The [src] beeps: \"DB error \[Code 0x00F1\]\"")
sleep(10)
- src.visible_message("\icon[src] [src] beeps: \"Attempting auto-repair\"")
+ src.visible_message("\icon[src] \The [src] beeps: \"Attempting auto-repair\"")
sleep(15)
- src.visible_message("\icon[src] [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"")
+ src.visible_message("\icon[src] \The [src] beeps: \"User DB corrupted \[Code 0x00FA\]. Truncating data structure...\"")
sleep(30)
- src.visible_message("\icon[src] [src] beeps: \"User DB truncated. Please contact your Nanotrasen system operator for future assistance.\"")
+ src.visible_message("\icon[src] \The [src] beeps: \"User DB truncated. Please contact your Nanotrasen system operator for future assistance.\"")
req_access = null
emagged = 1
if(0.5)
- src.visible_message("\icon[src] [src] beeps: \"DB not responding \[Code 0x0003\]...\"")
+ src.visible_message("\icon[src] \The [src] beeps: \"DB not responding \[Code 0x0003\]...\"")
if(1)
- src.visible_message("\icon[src] [src] beeps: \"No records in User DB\"")
+ src.visible_message("\icon[src] \The [src] beeps: \"No records in User DB\"")
return
/obj/machinery/mecha_part_fabricator/proc/convert_part_set(set_name as text)
@@ -354,7 +354,7 @@
/obj/machinery/mecha_part_fabricator/proc/build_part(var/obj/item/part)
if(!part) return
src.being_built = new part.type(src)
- src.desc = "It's building [src.being_built]."
+ src.desc = "It's building \a [src.being_built]."
src.remove_resources(part)
part.m_amt = get_resource_cost_w_coeff(part,"metal")
part.g_amt = get_resource_cost_w_coeff(part,"glass")
@@ -367,7 +367,7 @@
src.desc = initial(src.desc)
if(being_built)
src.being_built.loc = get_step(src,SOUTH)
- src.visible_message("\icon[src] [src] beeps, \"The [src.being_built] is complete\".")
+ src.visible_message("\icon[src] \The [src] beeps, \"\The [src.being_built] is complete.\"")
src.being_built = null
src.updateUsrDialog()
return 1
@@ -413,14 +413,14 @@
if(stat&(NOPOWER|BROKEN))
return 0
if(!check_resources(part))
- src.visible_message("\icon[src] [src] beeps, \"Not enough resources. Queue processing stopped\".")
- temp = {"Not enough resources to build next part.
+ src.visible_message("\icon[src] \The [src] beeps, \"Not enough resources. Queue processing stopped.\"")
+ temp = {"Not enough resources to build next part.
Try again | Return"}
return 0
remove_from_queue(1)
build_part(part)
part = listgetindex(src.queue, 1)
- src.visible_message("\icon[src] [src] beeps, \"Queue processing finished successfully\".")
+ src.visible_message("\icon[src] \The [src] beeps, \"Queue processing finished successfully.\"")
return 1
/obj/machinery/mecha_part_fabricator/proc/list_queue()
@@ -514,7 +514,7 @@
temp += "Return"
src.updateUsrDialog()
if(i || tech_output)
- src.visible_message("\icon[src] [src] beeps, \"Successfully synchronized with R&D server. New data processed.\"")
+ src.visible_message("\icon[src] \The [src] beeps, \"Successfully synchronized with R&D server. New data processed.\"")
if(!silent && !found)
temp = "Unable to connect to local R&D Database.
Please check your connections and try again.
Return"
src.updateUsrDialog()
@@ -550,7 +550,7 @@
user.set_machine(src)
var/turf/exit = get_step(src,SOUTH)
if(exit.density)
- src.visible_message("\icon[src] [src] beeps, \"Error! Part outlet is obstructed\".")
+ src.visible_message("\icon[src] \The [src] beeps, \"Error! Part outlet is obstructed.\"")
return
if(temp)
left_part = temp
@@ -739,7 +739,7 @@
default_deconstruction_crowbar(W)
return 1
else
- user << "\red You can't load the [src.name] while it's opened."
+ user << "\red You can't load \the [src.name] while it's opened."
return 1
if(istype(W, /obj/item/weapon/card/emag))
@@ -767,7 +767,7 @@
return ..()
if(src.being_built)
- user << "The fabricator is currently processing. Please wait until completion."
+ user << "\The [src] is currently processing. Please wait until completion."
return
var/obj/item/stack/sheet/stack = W
var/sname = "[stack.name]"
@@ -782,8 +782,8 @@
stack.use(1)
count++
src.overlays -= "fab-load-[material]"
- user << "You insert [count] [sname] into the fabricator."
+ user << "You insert [count] [sname] sheet\s into \the [src]."
src.updateUsrDialog()
else
- user << "The fabricator cannot hold more [sname]."
+ user << "\The [src] cannot hold more [sname] sheet\s."
return
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index a567f48edd2..ef07f61a195 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -50,6 +50,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
/obj/item/stack/sheet/mineral/diamond
name = "diamond"
icon_state = "sheet-diamond"
+ singular_name = "diamond"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -74,6 +75,7 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \
/obj/item/stack/sheet/mineral/uranium
name = "uranium"
icon_state = "sheet-uranium"
+ singular_name = "uranium sheet"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -99,6 +101,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
/obj/item/stack/sheet/mineral/plasma
name = "solid plasma"
icon_state = "sheet-plasma"
+ singular_name = "plasma sheet"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -124,6 +127,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
/obj/item/stack/sheet/mineral/gold
name = "gold"
icon_state = "sheet-gold"
+ singular_name = "gold bar"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -149,6 +153,7 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \
/obj/item/stack/sheet/mineral/silver
name = "silver"
icon_state = "sheet-silver"
+ singular_name = "silver bar"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -174,6 +179,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
/obj/item/stack/sheet/mineral/clown
name = "bananium"
icon_state = "sheet-clown"
+ singular_name = "bananium sheet"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -197,6 +203,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
/obj/item/stack/sheet/mineral/enruranium
name = "enriched uranium"
icon_state = "sheet-enruranium"
+ singular_name = "enriched uranium sheet"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -211,6 +218,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
/obj/item/stack/sheet/mineral/adamantine
name = "adamantine"
icon_state = "sheet-adamantine"
+ singular_name = "adamantine sheet"
force = 5.0
throwforce = 5
w_class = 3.0
@@ -225,6 +233,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
/obj/item/stack/sheet/mineral/mythril
name = "mythril"
icon_state = "sheet-mythril"
+ singular_name = "mythril sheet"
force = 5.0
throwforce = 5
w_class = 3.0
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 80543d59133..074192970f2 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -45,7 +45,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
/obj/item/stack/sheet/metal
name = "metal"
- desc = "Sheets made out of metal. They have been dubbed Metal Sheets."
+ desc = "Sheets made out of metal."
singular_name = "metal sheet"
icon_state = "sheet-metal"
m_amt = 3750
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 597f61856a7..3dd28e0fbb2 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -8,8 +8,8 @@
* Stacks
*/
/obj/item/stack
- gender = PLURAL
origin_tech = "materials=1"
+ gender = PLURAL
var/list/datum/stack_recipe/recipes
var/singular_name
var/amount = 1
@@ -29,7 +29,14 @@
/obj/item/stack/examine()
set src in view(1)
..()
- usr << "There are [src.amount] [src.singular_name]\s in the stack."
+ if(src.singular_name && src.amount>1)
+ usr << "There are [src.amount] [src.singular_name]\s in the stack."
+ else if(src.singular_name && src.amount==1)
+ usr << "There is [src.amount] [src.singular_name] in the stack."
+ else if(src.amount>1)
+ usr << "There are [src.amount] in the stack."
+ else
+ usr << "There is [src.amount] in the stack."
return
/obj/item/stack/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 7c0289be040..cf52eb78c46 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -216,7 +216,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/attack_self(mob/user as mob)
if(lit == 1)
- user.visible_message("[user] calmly drops and treads on the lit [src], putting it out instantly.")
+ user.visible_message("[user] calmly drops and treads on \the [src], putting it out instantly.")
var/turf/T = get_turf(src)
new type_butt(T)
new /obj/effect/decal/cleanable/ash(T)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 7f7be3d94af..0f445e5ed77 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -36,8 +36,8 @@
/obj/item/weapon/storage/belt/utility
- name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
- desc = "Can hold various tools."
+ name = "toolbelt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
+ desc = "Holds tools."
icon_state = "utilitybelt"
item_state = "utility"
can_hold = list(
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index b05fe1d7d47..ccdd272fb8b 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -23,11 +23,11 @@
var/fillevel = gulp_size
if(!R.total_volume || !R)
- user << "\red None of [src] left, oh no!"
+ user << " None of [src] left, oh no!"
return 0
if(M == user)
- M << "\blue You swallow a gulp of [src]."
+ M << "You swallow a gulp of [src]."
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index daf91b96f9b..5665dd3fa55 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -51,15 +51,15 @@
M << "You can't eat wrapped food!"
return 0
else if(fullness <= 50)
- M << "You hungrily [eatverb] some of the [src] and gobble it down!"
+ M << "You hungrily [eatverb] some of \the [src] and gobble it down!"
else if(fullness > 50 && fullness < 150)
- M << "You hungrily begin to [eatverb] the [src]."
+ M << "You hungrily begin to [eatverb] \the [src]."
else if(fullness > 150 && fullness < 350)
- M << "You [eatverb] the [src]."
+ M << "You [eatverb] \the [src]."
else if(fullness > 350 && fullness < 550)
- M << "You unwillingly [eatverb] a bit of the [src]."
+ M << "You unwillingly [eatverb] a bit of \the [src]."
else if(fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
- M << "You cannot force any more of the [src] to go down your throat."
+ M << "You cannot force any more of \the [src] to go down your throat."
return 0
else
if(! (isslime(M) || isbrain(M)) ) //If you're feeding it to someone else.