From cb5ed2d2cd36e3accd13f262ac8217d87fae5ea6 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 30 Jun 2019 04:29:48 -0400 Subject: [PATCH] Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar --- code/game/objects/items/devices/dogborg_sleeper.dm | 6 ++++-- code/modules/mob/living/silicon/robot/robot.dm | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm index 9163fb0849..7f3c7f3bfc 100644 --- a/code/game/objects/items/devices/dogborg_sleeper.dm +++ b/code/game/objects/items/devices/dogborg_sleeper.dm @@ -17,7 +17,7 @@ var/eject_port = "ingestion" var/escape_in_progress = FALSE var/message_cooldown - var/breakout_time = 300 + var/breakout_time = 150 var/tmp/last_hearcheck = 0 var/tmp/list/hearing_mobs var/list/items_preserved = list() @@ -77,7 +77,7 @@ to_chat(user, "Your [src] is already occupied.") return user.visible_message("[hound.name] is carefully inserting [target.name] into their [src].", "You start placing [target] into your [src]...") - if(!patient && iscarbon(target) && !target.buckled && do_after (user, 50, target = target)) + if(!patient && iscarbon(target) && !target.buckled && do_after (user, 100, target = target)) 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. @@ -420,6 +420,7 @@ desc = "Equipment for medical hound. A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves." icon = 'icons/mob/dogborg.dmi' icon_state = "sleeper" + breakout_time = 30 //Medical sleepers should be designed to be as easy as possible to get out of. /obj/item/dogborg/sleeper/K9 //The K9 portabrig name = "Mobile Brig" @@ -429,6 +430,7 @@ inject_amount = 0 min_health = -100 injection_chems = null //So they don't have all the same chems as the medihound! + breakout_time = 300 /obj/item/storage/attackby(obj/item/dogborg/sleeper/K9, mob/user, proximity) if(istype(K9)) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e71e269222..ae735e88b3 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -580,6 +580,17 @@ else return ..() +/mob/living/silicon/robot/crowbar_act(mob/living/user, obj/item/I) //TODO: make fucking everything up there in that attackby() proc use the proper tool_act() procs. But honestly, who has time for that? 'cause I know for sure that you, the person reading this, sure as hell doesn't. + var/validbreakout = FALSE + for(var/obj/item/dogborg/sleeper/S in held_items) + if(!validbreakout) + visible_message("[user] wedges [I] into the crevice separating [S] from [src]'s chassis, and begins to pry...", "You wedge [I] into the crevice separating [S] from [src]'s chassis, and begin to pry...") + validbreakout = TRUE + S.go_out() + if(validbreakout) + return TRUE + return ..() + /mob/living/silicon/robot/verb/unlock_own_cover() set category = "Robot Commands" set name = "Unlock Cover"