From 4eb83ed54680f08fc96ff329f58e8c3e4eabe7c9 Mon Sep 17 00:00:00 2001
From: Miauw <gilles.coremans@gmail.com>
Date: Sat, 12 Jul 2014 17:48:33 +0200
Subject: [PATCH] Oh, not in cruelty, not in wrath   The Reaper came that day;
 An angel visited this damned sat,   And took the parapen away.

Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.

Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
---
 code/datums/uplink_item.dm                       |  6 +++---
 code/modules/mob/living/carbon/carbon_defines.dm |  2 +-
 code/modules/paperwork/pen.dm                    |  9 ++++-----
 code/modules/reagents/Chemistry-Reagents.dm      | 11 +++++++++++
 code/modules/reagents/Chemistry-Recipes.dm       |  7 +++++++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index bfdfb312732..8e6ab324e31 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -237,9 +237,9 @@ var/list/uplink_items = list()
 	category = "Stealthy and Inconspicuous Weapons"
 
 /datum/uplink_item/stealthy_weapons/para_pen
-	name = "Paralysis Pen"
-	desc = "A syringe disguised as a functional pen, filled with a neuromuscular-blocking drug that renders a target immobile on injection and makes them seem dead to observers. \
-	Side effects of the drug include noticeable drooling. The pen holds one dose of paralyzing agent, and cannot be refilled."
+	name = "Sleepy Pen"
+	desc = "A syringe disguised as a functional pen, filled with a drug that temporarily blocks the vocal cords and sleeptoxin. \
+	The pen holds one dose of the mixture, and cannot be refilled."
 	item = /obj/item/weapon/pen/paralysis
 	cost = 3
 	excludefrom = list(/datum/game_mode/nuclear)
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 52a95dbc45f..edfd3102e9a 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -3,7 +3,7 @@
 	var/list/stomach_contents	= list()
 	var/list/internal_organs	= list()	//List of /obj/item/organ in the mob. they don't go in the contents.
 
-	var/silent = null 		//Can't talk. Value goes down every life proc.
+	var/silent = 0 		//Can't talk. Value goes down every life proc. //NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
 
 	var/obj/item/handcuffed = null //Whether or not the mob is handcuffed
 	var/obj/item/legcuffed = null  //Same as handcuffs but for legs. Bear traps use this.
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index ffa2ca5d801..0b707cdac34 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -55,7 +55,7 @@
 /*
  * Parapens
  */
- /obj/item/weapon/pen/paralysis
+/obj/item/weapon/pen/paralysis
 	origin_tech = "materials=2;syndicate=5"
 
 
@@ -69,8 +69,7 @@
 
 
 /obj/item/weapon/pen/paralysis/New()
-	create_reagents(50)
-	reagents.add_reagent("zombiepowder", 10)
-	reagents.add_reagent("impedrezene", 25)
-	reagents.add_reagent("cryptobiolin", 15)
+	create_reagents(60)
+	reagents.add_reagent("stoxin", 30)
+	reagents.add_reagent("mutetoxin", 30)
 	..()
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 152750d600b..fb4776d7d83 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1710,6 +1710,17 @@ datum
 			color = "#7F8400" // rgb: 127, 132, 0
 			toxpwr = 0.5
 
+		toxin/mutetoxin //the new zombie powder.
+			name = "Mute Toxin"
+			id = "mutetoxin"
+			reagent_state = LIQUID
+			color = "#F0F8FF" // rgb: 240, 248, 255
+			toxpwr = 0
+
+			on_mob_life(mob/living/carbon/M)
+				M.silent += 2 * REM + 1 //If this var is increased by one or less, it will have no effect since silent is decreased right after reagents are handled in Life(). Hence the + 1.
+				..()
+
 /////////////////////////Coloured Crayon Powder////////////////////////////
 //For colouring in /proc/mix_color_from_reagents
 
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index b292cc855f0..92dc11e2b18 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -408,6 +408,13 @@ silicate
 	required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
 	result_amount = 1
 
+/datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v
+	name = "Mute toxin"
+	id = "mutetoxin"
+	result = "mutetoxin"
+	required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1)
+	result_amount = 2
+
 /datum/chemical_reaction/zombiepowder
 	name = "Zombie Powder"
 	id = "zombiepowder"