diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index d980b469f94..e5d4d3675a8 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -31,7 +31,8 @@
/obj/item/toy/prize/seraph = 1,
/obj/item/toy/prize/mauler = 1,
/obj/item/toy/prize/odysseus = 1,
- /obj/item/toy/prize/phazon = 1
+ /obj/item/toy/prize/phazon = 1,
+ /obj/item/toy/waterflower = 1
)
/obj/machinery/computer/arcade
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 24e5479251c..13d58269ab7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -488,7 +488,7 @@
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
// you can't stab someone in the eyes wearing a mask!
- user << "\red You're going to need to remove that mask/helmet/glasses first."
+ user << "\red You're going to need to remove the eye covering first."
return
var/mob/living/carbon/monkey/Mo = M
@@ -496,7 +496,7 @@
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
// you can't stab someone in the eyes wearing a mask!
- user << "\red You're going to need to remove that mask/helmet/glasses first."
+ user << "\red You're going to need to remove the eye covering first."
return
if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N slimes also don't have eyes!
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index b47a2a30684..d1b39bf17b0 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -27,7 +27,7 @@
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
- light("\red [user] casually lights the [name] with [W], what a badass.")
+ light("\red [user] casually lights the [name] with [W].")
else if(istype(W, /obj/item/weapon/lighter))
var/obj/item/weapon/lighter/L = W
if(L.lit)
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index ee73d537d8e..b68e1e61cda 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -90,8 +90,8 @@
/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
if(M == user)
- user << "You take a bite of the crayon. Delicious!"
- user.nutrition += 5
+ user << "You take a bite of the crayon and swallow it."
+// user.nutrition += 5
if(uses)
uses -= 5
if(uses <= 0)
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 6e3a893c9be..556f3a52220 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -72,11 +72,11 @@
syndicate
icon_state = "target_s"
- desc = "A shooting target that looks like a syndicate scum."
+ desc = "A shooting target that looks like a hostile agent."
hp = 2600 // i guess syndie targets are sturdier?
alien
icon_state = "target_q"
- desc = "A shooting target that looks like a xenomorphic alien."
+ desc = "A shooting target with a threatening silhouette."
hp = 2350 // alium onest too kinda
/obj/item/target/bullet_act(var/obj/item/projectile/Proj)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index f02824576cb..b7c0cef238d 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -294,7 +294,7 @@
/obj/item/toy/ammo/crossbow
name = "foam dart"
- desc = "Its nerf or nothing! Ages 8 and up."
+ desc = "It's nerf or nothing! Ages 8 and up."
icon = 'icons/obj/toy.dmi'
icon_state = "foamdart"
flags = FPRINT | TABLEPASS
@@ -365,7 +365,7 @@
/obj/item/toy/crayon
name = "crayon"
- desc = "A colourful crayon. Looks tasty. Mmmm..."
+ desc = "A colourful crayon. Please refrain from eating it or putting it in your nose."
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonred"
w_class = 1.0
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index ac80658f27c..49dc148d410 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -82,17 +82,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.isOn())//Badasses dont get blinded while lighting their cig with a welding tool
- light("[user] casually lights the [name] with [W], what a badass.")
+ light("[user] casually lights the [name] with [W].")
else if(istype(W, /obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = W
if(Z.lit)
- light("With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.")
+ light("With a flick of their wrist, [user] lights their [name] with their [W].")
else if(istype(W, /obj/item/weapon/lighter))
var/obj/item/weapon/lighter/L = W
if(L.lit)
- light("After some fiddling, [user] manages to light their [name] with [W].")
+ light("[user] manages to light their [name] with [W].")
else if(istype(W, /obj/item/weapon/match))
var/obj/item/weapon/match/M = W
@@ -309,7 +309,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/pipe/cobpipe
name = "corn cob pipe"
- desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters."
+ desc = "A nicotine delivery system popularized by folksy backwoodsmen, kept popular in the modern age and beyond by space hipsters."
icon_state = "cobpipeoff"
item_state = "cobpipeoff"
icon_on = "cobpipeon" //Note - these are in masks.dmi
@@ -360,7 +360,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(istype(src, /obj/item/weapon/lighter/zippo) )
user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.")
else
- if(prob(75))
+ if(prob(95))
user.visible_message("After a few attempts, [user] manages to light the [src].")
else
user << "You burn yourself while lighting the lighter."
@@ -374,7 +374,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = icon_off
item_state = icon_off
if(istype(src, /obj/item/weapon/lighter/zippo) )
- user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.")
+ user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.")
else
user.visible_message("[user] quietly shuts off the [src].")
@@ -395,7 +395,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
cig.attackby(src, user)
else
if(istype(src, /obj/item/weapon/lighter/zippo))
- cig.light("[user] whips the [name] out and holds it for [M]. Their arm is as steady as the unflickering flame they light \the [cig] with.")
+ cig.light("[user] whips the [name] out and holds it for [M].")
else
cig.light("[user] holds the [name] out for [M], and lights the [cig.name].")
else
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index c06117a08bb..c3f3f11a98a 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -55,14 +55,14 @@ datum
empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
holder.clear_reagents()
return
-/*
+
silicate
name = "Silicate"
id = "silicate"
result = "silicate"
required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
result_amount = 3
-*/
+
stoxin
name = "Sleep Toxin"
id = "stoxin"