Removes the broken parapen.

KasparoVy · Nov 10, 2017 · 6fbb3cf · 6fbb3cf
1 parent 7289f5b
commit 6fbb3cf
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 20 deletions.
diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm
@@ -47,7 +47,7 @@
 #define PROXMOVE           0x80  // Does this object require proximity checking in Enter()?
 
 //Flags for items (equipment)
-#define THICKMATERIAL          0x1  // Prevents syringes, parapens and hyposprays if equiped to slot_suit or slot_head.
+#define THICKMATERIAL          0x1  // Prevents syringes, reagent pens, and hyposprays if equiped to slot_suit or slot_head.
 #define STOPPRESSUREDAMAGE     0x2  // Counts towards pressure protection. Note that like temperature protection, body_parts_covered is considered here as well.
 #define AIRTIGHT               0x4  // Functions with internals.
 #define NOSLIP                 0x8  // Prevents from slipping on wet floors, in space, etc.

diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm
@@ -5,7 +5,6 @@
 	name = "Special Ops supplies"
 	contains = list(/obj/item/weapon/storage/box/emps,
 					/obj/item/weapon/grenade/smokebomb = 3,
-					/obj/item/weapon/pen/reagent/paralysis,
 					/obj/item/weapon/grenade/chem_grenade/incendiary)
 	cost = 20
 	containername = "\improper Special Ops crate"

diff --git a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm
@@ -27,9 +27,4 @@
 /datum/uplink_item/item/stealthy_weapons/detomatix
 	name = "Detomatix PDA Cartridge"
 	item_cost = 16
-	path = /obj/item/weapon/cartridge/syndicate
-
-/datum/uplink_item/item/stealthy_weapons/parapen
-	name = "Paralysis Pen"
-	item_cost = 24
-	path = /obj/item/weapon/pen/reagent/paralysis
+	path = /obj/item/weapon/cartridge/syndicate
diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm
@@ -55,7 +55,6 @@ var/list/uplink_random_selections_
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/soap, 5, 100)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/concealed_cane, 50, 10)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/detomatix, 20, 10)
-	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/parapen)
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealthy_weapons/cigarette_kit)
 
 	items += new/datum/uplink_random_item(/datum/uplink_item/item/stealth_items/id)

diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
@@ -104,17 +104,6 @@
 	reagents.add_reagent(/datum/reagent/chloralhydrate, 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
 
 
-/*
- * Parapens
- */
-/obj/item/weapon/pen/reagent/paralysis
-	origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
-
-/obj/item/weapon/pen/reagent/paralysis/New()
-	..()
-	reagents.add_reagent(/datum/reagent/toxin/zombiepowder, 10)
-	reagents.add_reagent(/datum/reagent/cryptobiolin, 15)
-
 /*
  * Chameleon pen
  */