From c0a90fe202c31dc8e579770baa98a2c460ae14a6 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Tue, 24 Sep 2019 19:02:54 +0200
Subject: [PATCH] removes shocker circuit (#7059)

---
 .../subtypes/manipulation.dm                  | 30 --------------
 html/changelogs/geeves-shockfuck.yml          | 41 +++++++++++++++++++
 2 files changed, 41 insertions(+), 30 deletions(-)
 create mode 100644 html/changelogs/geeves-shockfuck.yml

diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index 332b9629d0b..ec5771f5cda 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -186,36 +186,6 @@
 	origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_COMBAT = 10)
 	spawn_flags = null			// Used for world initializing, see the #defines above.
 
-/obj/item/integrated_circuit/manipulation/shocker
-	name = "shocker circuit"
-	desc = "Used to shock adjacent creatures with electricity."
-	icon_state = "shocker"
-	extended_desc = "The circuit accepts a reference to creature to shock. It can shock a target on adjacent tiles. \
-	Severity determines hardness of shock and its power consumption. It accepts values between 0 and 60."
-	w_class = ITEMSIZE_TINY
-	complexity = 10
-	inputs = list("target" = IC_PINTYPE_REF,"severity" = IC_PINTYPE_NUMBER)
-	outputs = list()
-	activators = list("shock" = IC_PINTYPE_PULSE_IN)
-	spawn_flags = IC_SPAWN_RESEARCH
-	power_draw_per_use = 0
-
-/obj/item/integrated_circuit/manipulation/shocker/on_data_written()
-	var/s = get_pin_data(IC_INPUT, 2)
-	power_draw_per_use = Clamp(s,0,60)*4
-
-/obj/item/integrated_circuit/manipulation/shocker/do_work()
-	..()
-	var/turf/T = get_turf(src)
-	var/mob/living/M = get_pin_data_as_type(IC_INPUT, 1, /mob/living)
-	if(!istype(M)) //Invalid input
-		return
-	if(!T.Adjacent(M))
-		return //Can't reach
-	to_chat(M, "<span class='danger'>You feel a sharp shock!</span>")
-	spark(get_turf(M), 3, 1)
-	M.stun_effect_act(0, Clamp(get_pin_data(IC_INPUT, 2),0,60), null)
-
 /obj/item/integrated_circuit/manipulation/grabber
 	name = "grabber"
 	desc = "A circuit with its own inventory for small/medium items, used to grab and store things."
diff --git a/html/changelogs/geeves-shockfuck.yml b/html/changelogs/geeves-shockfuck.yml
new file mode 100644
index 00000000000..ff14852d576
--- /dev/null
+++ b/html/changelogs/geeves-shockfuck.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Geeves
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscdel: "Removes the IE Shocker. Give 'em an inch and they take a mile."