From cb9057befa763d20ac99a40cc4d5bcfc3fc72bb1 Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 13 Dec 2017 11:26:52 +0200 Subject: [PATCH] Some dogborg equipment fixes. -Fixes dogborgs and such not getting the basic starter tools. -Readds sec and med huds for accessing records and such. --- code/game/objects/items/trash_vr.dm | 2 +- .../living/silicon/robot/robot_modules_vr.dm | 30 ++++++++++--------- .../mob/living/silicon/robot/robot_vr.dm | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index 57d3bbbef0..edb90afcbf 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -21,7 +21,7 @@ if(isrobot(M)) var/mob/living/silicon/robot/R = M - if(R.module.type == /obj/item/weapon/robot_module/scrubpup) // You can now feed the trash borg yay. + if(R.module.type == /obj/item/weapon/robot_module/robot/scrubpup) // You can now feed the trash borg yay. playsound(R.loc,'sound/items/eatfood.ogg', rand(10,50), 1) user.drop_item() var/belly = R.vore_selected diff --git a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm index 5cddbb34a0..3d80c0d28c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm @@ -1,8 +1,8 @@ /hook/startup/proc/robot_modules_vr() - robot_modules["Medihound"] = /obj/item/weapon/robot_module/medihound - robot_modules["K9"] = /obj/item/weapon/robot_module/knine - robot_modules["ERT"] = /obj/item/weapon/robot_module/ert - robot_modules["Janihound"] = /obj/item/weapon/robot_module/scrubpup + robot_modules["Medihound"] = /obj/item/weapon/robot_module/robot/medihound + 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 return 1 //Just add a new proc with the robot_module type if you wish to run some other vore code @@ -17,7 +17,7 @@ src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people. . = ..() //Any Global vore modules will come from here -/obj/item/weapon/robot_module/knine +/obj/item/weapon/robot_module/robot/knine name = "k9 robot module" sprites = list( "K9 hound" = "k9", @@ -27,7 +27,7 @@ networks = list(NETWORK_SECURITY) can_be_pushed = 0 -/obj/item/weapon/robot_module/knine/New(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/robot/knine/New(var/mob/living/silicon/robot/R) src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/weapon/handcuffs/cyborg(src) //You need cuffs to be a proper sec borg! src.modules += new /obj/item/weapon/dogborg/jaws/big(src) //In case there's some kind of hostile mob. @@ -38,6 +38,7 @@ src.modules += new /obj/item/device/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig. src.modules += new /obj/item/weapon/gun/energy/taser/mounted/cyborg(src) //They /are/ a security borg, after all. src.modules += new /obj/item/weapon/dogborg/pounce(src) //Pounce + src.modules += new /obj/item/borg/sight/hud/sec(src) //Security hud to access crime records etc. src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem. R.icon = 'icons/mob/widerobot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' @@ -46,7 +47,7 @@ R.old_x = -16 ..() -/obj/item/weapon/robot_module/knine/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) +/obj/item/weapon/robot_module/robot/knine/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) var/obj/item/device/flash/F = locate() in src.modules if(F.broken) F.broken = 0 @@ -65,7 +66,7 @@ B.bcell.give(amount) -/obj/item/weapon/robot_module/medihound +/obj/item/weapon/robot_module/robot/medihound name = "MediHound module" channels = list("Medical" = 1) networks = list(NETWORK_MEDICAL) @@ -76,7 +77,7 @@ "Dark Medical Hound (Static)" = "medihounddark" ) -/obj/item/weapon/robot_module/medihound/New(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/robot/medihound/New(var/mob/living/silicon/robot/R) src.modules += new /obj/item/weapon/dogborg/jaws/small(src) //In case a patient is being attacked by carp. src.modules += new /obj/item/device/dogborg/boop_module(src) //Boop the crew. src.modules += new /obj/item/device/dogborg/tongue(src) //Clean up bloody items by licking them, and eat rubbish for minor energy. @@ -88,6 +89,7 @@ src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src)//For holding the chemicals when the chemist is nice src.modules += new /obj/item/device/sleevemate(src) //Lets them scan people. src.modules += new /obj/item/weapon/shockpaddles/robot/hound(src) //Paws of life + src.modules += new /obj/item/borg/sight/hud/med(src) //Medhud for accessing records and such. src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce R.icon = 'icons/mob/widerobot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' @@ -96,7 +98,7 @@ R.old_x = -16 ..() -/obj/item/weapon/robot_module/ert +/obj/item/weapon/robot_module/robot/ert name = "Emergency Responce module" channels = list("Security" = 1) networks = list(NETWORK_SECURITY) @@ -105,7 +107,7 @@ "Standard" = "ert" ) -/obj/item/weapon/robot_module/ert/New(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/robot/ert/New(var/mob/living/silicon/robot/R) src.modules += new /obj/item/device/flash(src) src.modules += new /obj/item/weapon/handcuffs/cyborg(src) src.modules += new /obj/item/weapon/dogborg/jaws/big(src) @@ -123,7 +125,7 @@ R.old_x = -16 ..() -/obj/item/weapon/robot_module/scrubpup +/obj/item/weapon/robot_module/robot/scrubpup name = "Custodial Hound module" sprites = list( "Custodial Hound" = "scrubpup", @@ -131,7 +133,7 @@ channels = list("Service" = 1) can_be_pushed = 0 -/obj/item/weapon/robot_module/scrubpup/New(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/robot/scrubpup/New(var/mob/living/silicon/robot/R) src.modules += new /obj/item/device/lightreplacer/dogborg(src) src.modules += new /obj/item/weapon/dogborg/jaws/small(src) src.modules += new /obj/item/device/dogborg/boop_module(src) @@ -145,6 +147,6 @@ R.old_x = -16 ..() -/obj/item/weapon/robot_module/scrubpup/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) +/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) diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 16db4b4df4..292c8272b4 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -41,7 +41,7 @@ . = ..() if(module) - if(module.type == /obj/item/weapon/robot_module/scrubpup)//no water reserve mechanics yet. + if(module.type == /obj/item/weapon/robot_module/robot/scrubpup)//no water reserve mechanics yet. var/turf/tile = loc if(isturf(tile)) tile.clean_blood()