From a664384e81c1709bc2feaeb2d99c98f471cd756c Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 25 Oct 2017 03:04:51 +0000
Subject: [PATCH] Bhijn's touching dogborg balance again everyone panic (#3432)

* rebuffs everything and puts babyproof locks on scrubpup compactor

* lets it compile, removes things from the blacklist

* readds telegraphing due to popular vote, removes flash from scrubpups

* does githubs text editor work for basic thing on mobile

* reverts blacklist changes

* keeps spoolup, removes sounds + anime prepounce effects
---
 code/citadel/dogborgstuff.dm                  | 22 +++++++++----------
 .../mob/living/silicon/robot/robot_modules.dm |  7 +++---
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm
index ee67fe96a8..9a6a6581c9 100644
--- a/code/citadel/dogborgstuff.dm
+++ b/code/citadel/dogborgstuff.dm
@@ -768,8 +768,8 @@
 	icon_state = "compactor"
 	inject_amount = 0
 	min_health = -100
-	injection_chems = null
-	var/max_item_count = 48
+	injection_chems = null //So they don't have all the same chems as the medihound!
+	var/max_item_count = 30
 
 /obj/item/storage/attackby(obj/item/device/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO!
 	compactor.afterattack(src, user ,1)
@@ -848,8 +848,8 @@
 /mob/living/silicon/robot
 	var/leaping = 0
 	var/pounce_cooldown = 0
-	var/pounce_cooldown_time = 40 //Nearly doubled, u happy?
-	var/pounce_spoolup = 5
+	var/pounce_cooldown_time = 50 //Nearly doubled, u happy?
+	var/pounce_spoolup = 3
 	var/leap_at
 	var/disabler
 	var/laser
@@ -862,11 +862,10 @@
 	var/mob/living/silicon/robot/R = user
 	if(R && !R.pounce_cooldown)
 		R.pounce_cooldown = !R.pounce_cooldown
-		playsound(R, 'sound/items/jaws_pry.ogg', 50, 1)
-		playsound(R, 'sound/machines/buzz-sigh.ogg', 50, 1)
 		to_chat(R, "<span class ='warning'>Your targeting systems lock on to [A]...</span>")
-		A.visible_message("<span class ='warning'>[R]'s eyes flash brightly, staring directly at [A]!</span>", "<span class ='userdanger'>[R]'s eyes flash brightly, staring directly at you!'</span>")
 		addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup)
+		spawn(R.pounce_cooldown_time)
+			R.pounce_cooldown = !R.pounce_cooldown
 	else if(R && R.pounce_cooldown)
 		to_chat(R, "<span class='danger'>Your leg actuators are still recharging!</span>")
 
@@ -891,8 +890,6 @@
 		throw_at(A, MAX_K9_LEAP_DIST, 1, spin=0, diagonals_first = 1)
 		cell.use(500) //Doubled the energy consumption
 		weather_immunities -= "lava"
-		spawn(pounce_cooldown_time)
-			pounce_cooldown = !pounce_cooldown
 
 /mob/living/silicon/robot/throw_impact(atom/A)
 
@@ -909,19 +906,20 @@
 					blocked = 1
 			if(!blocked)
 				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
-				L.Knockdown(40)
+				L.Knockdown(45)
 				playsound(src, 'sound/weapons/Egloves.ogg', 50, 1)
 				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
 				step_towards(src,L)
 			else
-				Knockdown(40, 1, 1)
+				Knockdown(45, 1, 1)
 
 			pounce_cooldown = !pounce_cooldown
 			spawn(pounce_cooldown_time) //3s by default
 				pounce_cooldown = !pounce_cooldown
 		else if(A.density && !A.CanPass(src))
 			visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='userdanger'>You smash into [A]!</span>")
-			Knockdown(40, 1, 1)
+			playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
+			Knockdown(45, 1, 1)
 
 		if(leaping)
 			leaping = 0
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index e3d179b3ff..3758e73688 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -352,10 +352,9 @@
 		/obj/item/soap/tongue,
 		/obj/item/device/analyzer/nose,
 		/obj/item/device/dogborg/sleeper/K9,
-		/obj/item/pinpointer/crew)
-	emag_modules = list(/obj/item/gun/energy/laser/cyborg,
 		/obj/item/gun/energy/disabler/cyborg,
-		/obj/item/pinpointer/nuke)
+		/obj/item/pinpointer/crew)
+	emag_modules = list(/obj/item/gun/energy/laser/cyborg)
 	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "k9"
@@ -408,7 +407,6 @@
 /obj/item/robot_module/scrubpup
 	name = "Janitor"
 	basic_modules = list(
-		/obj/item/device/assembly/flash/cyborg,
 		/obj/item/dogborg/jaws/small,
 		/obj/item/device/analyzer/nose,
 		/obj/item/soap/tongue/scrubpup,
@@ -422,6 +420,7 @@
 	moduleselect_icon = "scrubpup"
 	feedback_key = "cyborg_scrubpup"
 	hat_offset = INFINITY
+	clean_on_move = TRUE
 
 /obj/item/robot_module/scrubpup/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
 	..()