From 7dd9bd3e55209e46b84e8072804a2969aa1fcb2f Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 6 Jan 2018 23:36:32 -0500 Subject: [PATCH] New Science Dogborg --- code/global_vr.dm | 1 + .../silicon/robot/dogborg/dog_modules_vr.dm | 10 ++++++ .../silicon/robot/dogborg/dog_sleeper_vr.dm | 11 ++++++- .../silicon/robot/robot_modules/station_vr.dm | 31 ++++++++++++++++++- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/code/global_vr.dm b/code/global_vr.dm index de9aef8509f..a96af13dd60 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -2,4 +2,5 @@ robot_module_types += "Medihound" robot_module_types += "K9" robot_module_types += "Janihound" + robot_module_types += "Sci-borg" return 1 diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 69e38a0f480..603cdb98d50 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -140,6 +140,16 @@ combat = 1 attack_verb = list("batted", "pawed", "bopped", "whapped") chargecost = 500 + +/obj/item/weapon/shockpaddles/robot/hound/jumper + name = "paws of life" + icon = 'icons/mob/dogborg_vr.dmi' + icon_state = "defibpaddles0" + desc = "Zappy paws. For rebooting a full body prostetic." + combat = 1 + attack_verb = list("batted", "pawed", "bopped", "whapped") + chargecost = 500 + use_on_synthetic = 1 //Tongue stuff /obj/item/device/dogborg/tongue diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index d317328b4a7..ad20fa14731 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -496,6 +496,15 @@ injection_chems = null //So they don't have all the same chems as the medihound! var/max_item_count = 25 +/obj/item/device/dogborg/sleeper/analyzer //sci-borg gut. + name = "Dogborg Digestive Analyzer" + desc = "A mounted destructive analyzer unit with fuel processor." + icon = 'icons/mob/dogborg_vr.dmi' + icon_state = "analyzer" + inject_amount = 10 + min_health = -100 + injection_chems = null //So they don't have all the same chems as the medihound! + /obj/item/device/dogborg/sleeper/compactor/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)//GARBO NOMS hound = loc @@ -564,4 +573,4 @@ if(UI_open == 1) sleeperUI(usr) return - return \ No newline at end of file + return diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index c7d862b1ddd..dd829780ccb 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -40,6 +40,7 @@ robot_modules["K9"] = /obj/item/weapon/robot_module/robot/knine robot_modules["ERT"] = /obj/item/weapon/robot_module/robot/ert robot_modules["Janihound"] = /obj/item/weapon/robot_module/robot/scrubpup + robot_modules["Sci-borg"] = /obj/item/weapon/robot_module/robot/science return 1 //Just add a new proc with the robot_module type if you wish to run some other vore code @@ -111,7 +112,8 @@ can_be_pushed = 0 sprites = list( "Medical Hound" = "medihound", - "Dark Medical Hound (Static)" = "medihounddark" + "Dark Medical Hound (Static)" = "medihounddark", + "Mediborg model V-2" = "vale" ) /obj/item/weapon/robot_module/robot/medihound/New(var/mob/living/silicon/robot/R) @@ -188,3 +190,30 @@ /obj/item/weapon/robot_module/robot/scrubpup/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) var/obj/item/device/lightreplacer/LR = locate() in src.modules LR.Charge(R, amount) + +/obj/item/weapon/robot_module/robot/science + name = "Research Hound Module" + sprites = list( + "Research Hound" = "science", + ) + channels = list("Science" = 1) + can_be_pushed = 0 + +/obj/item/weapon/robot_module/robot/science/New(var/mob/living/silicon/robot/R) + src.modules += new /obj/item/weapon/dogborg/jaws/small(src) + src.modules += new /obj/item/device/dogborg/boop_module(src) + src.modules += new /obj/item/device/dogborg/tongue(src) + src.modules += new /obj/item/device/dogborg/sleeper/analyzer(src) //doesnt have a destructive analyzer in it yet + src.modules += new /obj/item/weapon/portable_destructive_analyzer(src) + src.modules += new /obj/item/weapon/gripper/research(src) + src.modules += new /obj/item/weapon/screwdriver/cyborg(src) + src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src) + src.modules += new /obj/item/weapon/storage/part_replacer(src) + src.emag = new /obj/item/weapon/hand_tele(src) + R.icon = 'icons/mob/widerobot_vr.dmi' + R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + //R.icon_state = "science" + R.pixel_x = -16 + R.old_x = -16 + ..() +