From dfd58ef28942400ed43f8ede20301871f8acc7d5 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Tue, 8 Oct 2019 21:38:28 +0200
Subject: [PATCH] Adds powersink to default ninja rig (#7092)

---
 code/datums/uplink/ninja_modules.dm           |  6 ---
 .../clothing/spacesuits/rig/suits/light.dm    |  1 +
 html/changelogs/geeves-ninjaPowerCreep2.yml   | 42 +++++++++++++++++++
 3 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/geeves-ninjaPowerCreep2.yml

diff --git a/code/datums/uplink/ninja_modules.dm b/code/datums/uplink/ninja_modules.dm
index b9552c016f8..3231efbfff1 100644
--- a/code/datums/uplink/ninja_modules.dm
+++ b/code/datums/uplink/ninja_modules.dm
@@ -40,12 +40,6 @@
 	item_cost = 4
 	path = /obj/item/rig_module/fabricator
 
-/datum/uplink_item/item/ninja_modules/sink
-	name = "Power Sink"
-	desc = "A module that sucks power out of powered items and into the users suit."
-	item_cost = 4
-	path = /obj/item/rig_module/power_sink
-
 /datum/uplink_item/item/ninja_modules/emag_hand
 	name = "EMAG Hand Module"
 	desc = "A module that allows the user to apply an EMAG effect to the targeted item."
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index a767a9d1219..1f31609907a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -93,6 +93,7 @@
 	initial_modules = list(
 		/obj/item/rig_module/vision,
 		/obj/item/rig_module/voice,
+		/obj/item/rig_module/power_sink,
 		/obj/item/rig_module/teleporter,
 		/obj/item/rig_module/stealth_field,
 		/obj/item/rig_module/electrowarfare_suite,
diff --git a/html/changelogs/geeves-ninjaPowerCreep2.yml b/html/changelogs/geeves-ninjaPowerCreep2.yml
new file mode 100644
index 00000000000..dd0f871dbef
--- /dev/null
+++ b/html/changelogs/geeves-ninjaPowerCreep2.yml
@@ -0,0 +1,42 @@
+################################
+# 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: 
+  - rscadd: "The ninja's suit now comes with a powersink by default, have fun!"
+  - tweak: "Removed powersink from infiltrator uplink."