From 47195cdbf08355130a77db137b74057c142afeaf Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 15 Oct 2017 00:30:22 -0400 Subject: [PATCH 1/6] INTENSE BORGO BALANCE TWEAKS --- code/citadel/dogborgstuff.dm | 22 ++++++++++++------- .../mob/living/silicon/robot/robot_modules.dm | 12 +++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index ee5cfd2fd9..86815fa98e 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -173,6 +173,9 @@ hitsound = 'sound/effects/attackblob.ogg' cleanspeed = 80 +/obj/item/soap/tongue/scrubpup + cleanspeed = 25 //slightly faster than a mop. + /obj/item/soap/tongue/New() ..() flags_1 |= NOBLUDGEON_1 //No more attack messages @@ -192,13 +195,13 @@ desc = "Your tongue has been upgraded successfully. Congratulations." icon = 'icons/mob/dogborg.dmi' icon_state = "syndietongue" - cleanspeed = 60 //(nerf'd)tator soap stat + cleanspeed = 10 //(nerf'd)tator soap stat else name = "synthetic tongue" desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face." icon = 'icons/mob/dogborg.dmi' icon_state = "synthtongue" - cleanspeed = 80 + cleanspeed = initial(cleanspeed) update_icon() /obj/item/soap/tongue/afterattack(atom/target, mob/user, proximity) @@ -803,7 +806,7 @@ inject_amount = 10 min_health = -100 injection_chems = null //So they don't have all the same chems as the medihound! - var/max_item_count = 32 + var/max_item_count = 48 /obj/item/storage/attackby(obj/item/device/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO! compactor.afterattack(src, user ,1) @@ -825,11 +828,11 @@ if(target_obj.type in important_items) to_chat(user,"\The [target] registers an error code to your [src.name]") return - if(target_obj.w_class > WEIGHT_CLASS_BULKY) + if(target_obj.w_class > WEIGHT_CLASS_SMALL) to_chat(user,"\The [target] is too large to fit into your [src.name]") return user.visible_message("[hound.name] is ingesting [target.name] into their [src.name].", "You start ingesting [target] into your [src.name]...") - if(do_after(user, 30, target = target) && length(contents) < max_item_count) + if(do_after(user, 15, target = target) && length(contents) < max_item_count) if(!in_range(src, target)) //Proximity is probably old news by now, do a new check. return //If they moved away, you can't eat them. This still applies to items, don't magically eat things I picked up already. target.forceMove(src) @@ -883,6 +886,7 @@ var/leaping = 0 var/pounce_cooldown = 0 var/pounce_cooldown_time = 40 //Nearly doubled, u happy? + var/pounce_spoolup = 5 var/leap_at var/disabler var/laser @@ -892,8 +896,10 @@ #define MAX_K9_LEAP_DIST 4 //because something's definitely borked the pounce functioning from a distance. /obj/item/dogborg/pounce/afterattack(atom/A, mob/user) - var/mob/living/silicon/robot.R = user - R.leap_at(A) + var/mob/living/silicon/robot/R = user + if(R) + visible_message("[R]'s eyes flash brightly, staring directly at [A]!", "Your targetting systems lock on to [A]...") + addtimer(CALLBACK(R, .proc/leap_at, A), pounce_spoolup) /mob/living/silicon/robot/proc/leap_at(atom/A) if(pounce_cooldown) @@ -938,7 +944,7 @@ blocked = 1 if(!blocked) L.visible_message("[src] pounces on [L]!", "[src] pounces on you!") - L.Knockdown(100) + L.Knockdown(40) sleep(2)//Runtime prevention (infinite bump() calls on hulks) step_towards(src,L) else diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index a4c215c259..d85ac96784 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -351,8 +351,10 @@ /obj/item/soap/tongue, /obj/item/device/analyzer/nose, /obj/item/device/dogborg/sleeper/K9, - /obj/item/gun/energy/disabler/cyborg) - emag_modules = list(/obj/item/gun/energy/laser/cyborg) + /obj/item/pinpointer/crew) + emag_modules = list(/obj/item/gun/energy/laser/cyborg, + /obj/item/gun/energy/disabler/cyborg, + /obj/item/pinpointer/nuke) ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security, /obj/item/clockwork/weapon/ratvarian_spear) cyborg_base_icon = "k9" @@ -386,6 +388,7 @@ /obj/item/device/healthanalyzer, /obj/item/device/dogborg/sleeper, /obj/item/twohanded/shockpaddles/hound, + /obj/item/reagent_containers/borghypo, /obj/item/device/sensor_device) emag_modules = list(/obj/item/dogborg/pounce) ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical, @@ -407,7 +410,7 @@ /obj/item/device/assembly/flash/cyborg, /obj/item/dogborg/jaws/small, /obj/item/device/analyzer/nose, - /obj/item/soap/tongue, + /obj/item/soap/tongue/scrubpup, /obj/item/device/lightreplacer/cyborg, /obj/item/device/dogborg/sleeper/compactor) emag_modules = list(/obj/item/dogborg/pounce) @@ -418,8 +421,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) ..() var/obj/item/device/lightreplacer/LR = locate(/obj/item/device/lightreplacer) in basic_modules From fe5db1194abdfd7fc7ffd0e9629f79a40706d610 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 15 Oct 2017 00:46:45 -0400 Subject: [PATCH 2/6] fuk --- code/citadel/dogborgstuff.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 86815fa98e..22848b27dd 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -899,7 +899,7 @@ var/mob/living/silicon/robot/R = user if(R) visible_message("[R]'s eyes flash brightly, staring directly at [A]!", "Your targetting systems lock on to [A]...") - addtimer(CALLBACK(R, .proc/leap_at, A), pounce_spoolup) + addtimer(CALLBACK(R, R.proc/leap_at, A), pounce_spoolup) /mob/living/silicon/robot/proc/leap_at(atom/A) if(pounce_cooldown) From 38d139205d8ac5d9fb79a924946d46729c09b4eb Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 15 Oct 2017 00:53:35 -0400 Subject: [PATCH 3/6] wooooooork --- code/citadel/dogborgstuff.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 22848b27dd..db45b6b081 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -899,7 +899,7 @@ var/mob/living/silicon/robot/R = user if(R) visible_message("[R]'s eyes flash brightly, staring directly at [A]!", "Your targetting systems lock on to [A]...") - addtimer(CALLBACK(R, R.proc/leap_at, A), pounce_spoolup) + addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), pounce_spoolup) /mob/living/silicon/robot/proc/leap_at(atom/A) if(pounce_cooldown) From d6d9c1e1a800d416381e9bcb381de3c89e9b9a14 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 15 Oct 2017 01:01:20 -0400 Subject: [PATCH 4/6] bluh --- code/citadel/dogborgstuff.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index db45b6b081..422fd62178 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -899,7 +899,7 @@ var/mob/living/silicon/robot/R = user if(R) visible_message("[R]'s eyes flash brightly, staring directly at [A]!", "Your targetting systems lock on to [A]...") - addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), pounce_spoolup) + addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup) /mob/living/silicon/robot/proc/leap_at(atom/A) if(pounce_cooldown) From bc12f646ed51e2a6c0b13a952bdaa084a1b0b409 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 15 Oct 2017 02:10:01 -0400 Subject: [PATCH 5/6] adds sounds to dogborg pounce --- code/citadel/dogborgstuff.dm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 422fd62178..4dc330b450 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -897,15 +897,17 @@ /obj/item/dogborg/pounce/afterattack(atom/A, mob/user) var/mob/living/silicon/robot/R = user - if(R) - visible_message("[R]'s eyes flash brightly, staring directly at [A]!", "Your targetting systems lock on to [A]...") + if(R && !R.pounce_cooldown) + pounce_cooldown = !pounce_cooldown + playsound(R, 'sound/items/jaws_pry.ogg', 50, 1) + playsound(R, 'sound/machines/buzz-sigh.ogg', 50, 1) + to_chat(R, "Your targeting systems lock on to [A]...") + A.visible_message("[R]'s eyes flash brightly, staring directly at [A]!", "[R]'s eyes flash brightly, staring directly at you!'") addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup) + else if(R && R.pounce_cooldown) + to_chat(R, "Your leg actuators are still recharging!") /mob/living/silicon/robot/proc/leap_at(atom/A) - if(pounce_cooldown) - to_chat(src,"Your leg actuators are still recharging!") - return - if(leaping || stat || buckled || lying) return @@ -925,7 +927,6 @@ throw_at(A, MAX_K9_LEAP_DIST, 1, spin=0, diagonals_first = 1) cell.use(500) //Doubled the energy consumption weather_immunities -= "lava" - pounce_cooldown = !pounce_cooldown spawn(pounce_cooldown_time) pounce_cooldown = !pounce_cooldown @@ -945,6 +946,7 @@ if(!blocked) L.visible_message("[src] pounces on [L]!", "[src] pounces on you!") L.Knockdown(40) + playsound(src, 'sound/weapons/Egloves.ogg', 50, 1) sleep(2)//Runtime prevention (infinite bump() calls on hulks) step_towards(src,L) else @@ -954,7 +956,7 @@ spawn(pounce_cooldown_time) //3s by default pounce_cooldown = !pounce_cooldown else if(A.density && !A.CanPass(src)) - visible_message("[src] smashes into [A]!", "[src] smashes into [A]!") + visible_message("[src] smashes into [A]!", "You smash into [A]!") Knockdown(40, 1, 1) if(leaping) From dc7f43d72cb9695711983d27b9c6dca2e5f3aa7a Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 15 Oct 2017 02:16:13 -0400 Subject: [PATCH 6/6] lets it actually compile --- code/citadel/dogborgstuff.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 4dc330b450..1323d7d412 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -898,7 +898,7 @@ /obj/item/dogborg/pounce/afterattack(atom/A, mob/user) var/mob/living/silicon/robot/R = user if(R && !R.pounce_cooldown) - pounce_cooldown = !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, "Your targeting systems lock on to [A]...")