From 5893abc9bcff4788bfbb063ac0bd5964fd601754 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 10 Jun 2016 07:59:40 -0500 Subject: [PATCH] Standard Cyborg Gear --- .../mob/living/silicon/robot/robot_modules.dm | 20 ++++++++++++++----- .../reagents/reagent_containers/borghydro.dm | 8 ++++++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0d1154fa6c3..419aafce175 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -125,18 +125,28 @@ /obj/item/weapon/robot_module/standard/New() ..() - modules += new /obj/item/weapon/melee/baton/loaded(src) - modules += new /obj/item/weapon/extinguisher(src) + modules += new /obj/item/weapon/reagent_containers/borghypo/epi(src) + modules += new /obj/item/device/healthanalyzer(src) + + modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src) modules += new /obj/item/weapon/wrench/cyborg(src) modules += new /obj/item/weapon/crowbar/cyborg(src) - modules += new /obj/item/device/healthanalyzer(src) - modules += new /obj/item/toy/crayon/spraycan/borg(src) + add_module(new /obj/item/stack/sheet/metal/cyborg()) + modules += new /obj/item/weapon/extinguisher(src) + + modules += new /obj/item/weapon/pickaxe(src) + modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src) + + modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) + + modules += new /obj/item/weapon/soap/nanotrasen(src) + modules += new /obj/item/borg/cyborghug(src) + emag = new /obj/item/weapon/melee/energy/sword/cyborg(src) fix_modules() - /obj/item/weapon/robot_module/medical name = "medical robot module" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index c2b5ec35c6e..2fe2fb90f66 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -25,7 +25,6 @@ Borg Hypospray var/list/datum/reagents/reagent_list = list() var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "antitoxin", "epinephrine", "spaceacillin") - //var/list/reagent_ids = list("salbutamol", "salglu_solution", "salglu_solution", "charcoal", "ephedrine", "spaceacillin") var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values. //Used as list for input() in shakers. @@ -218,4 +217,9 @@ Borg Shaker /obj/item/weapon/reagent_containers/borghypo/peace/hacked desc = "Everything's peaceful in death!" icon_state = "borghypo_s" - reagent_ids = list("dizzysolution","tiresolution","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2") \ No newline at end of file + reagent_ids = list("dizzysolution","tiresolution","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2") + +/obj/item/weapon/reagent_containers/borghypo/epi + name = "epinephrine injector" + desc = "An advanced chemical synthesizer and injection system, designed to stabilize patients.." + reagent_ids = list("epinephrine") \ No newline at end of file