diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index e799fe14640..2bffdd4415f 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -255,6 +255,13 @@ /obj/item/reagent_containers/borghypo = /obj/item/reagent_containers/borghypo/abductor ) +/obj/item/borg/upgrade/abductor_medi/after_install(mob/living/silicon/robot/R) + . = ..() + if(!R.emagged) // Emagged Mediborgs that are upgraded need the evil chems. + return + for(var/obj/item/reagent_containers/borghypo/F in R.module.modules) + F.emag_act() + /obj/item/borg/upgrade/syndicate name = "safety override module" desc = "Unlocks the hidden, deadlier functions of a cyborg." diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index c80f2c69790..187df568bc6 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -335,11 +335,15 @@ . = ..() for(var/obj/item/borg_defib/F in modules) F.emag_act() + for(var/obj/item/reagent_containers/borghypo/F in modules) + F.emag_act() // Enable safeties on the borg's defib. /obj/item/robot_module/medical/unemag() for(var/obj/item/borg_defib/F in modules) F.emag_act() + for(var/obj/item/reagent_containers/borghypo/F in modules) + F.emag_act() return ..() // Fluorosulphuric acid spray bottle. diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 8881f2d7e29..ba94c399e5c 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -22,6 +22,7 @@ var/choosen_reagent = "salglu_solution" var/list/datum/reagents/reagent_list = list() var/list/reagent_ids = list("salglu_solution", "epinephrine", "spaceacillin", "charcoal", "hydrocodone", "mannitol", "salbutamol") + var/list/reagent_ids_emagged = list("tirizene") var/static/list/reagent_icons = list("salglu_solution" = image(icon = 'icons/goonstation/objects/iv.dmi', icon_state = "ivbag"), "epinephrine" = image(icon = 'icons/obj/hypo.dmi', icon_state = "autoinjector"), "spaceacillin" = image(icon = 'icons/obj/decals.dmi', icon_state = "bio"), @@ -34,7 +35,8 @@ "potass_iodide" = image(icon = 'icons/obj/decals.dmi', icon_state = "radiation"), "mannitol" = image(icon = 'icons/obj/chemical.dmi', icon_state = "pill19"), "salbutamol" = image(icon = 'icons/obj/chemical.dmi', icon_state = "pill8"), - "corazone" = image(icon = 'icons/obj/abductor.dmi', icon_state = "bed")) + "corazone" = image(icon = 'icons/obj/abductor.dmi', icon_state = "bed"), + "tirizene" = image(icon = 'icons/obj/aibots.dmi', icon_state = "pancbot")) /obj/item/reagent_containers/borghypo/surgeon reagent_ids = list("styptic_powder", "epinephrine", "salbutamol") @@ -122,6 +124,13 @@ var/datum/reagent/get_reagent_name = GLOB.chemical_reagents_list[choosen_reagent] . |= "It is currently dispensing [get_reagent_name.name]. Contains [total_reagents] units of various reagents." // We couldn't care less what actual reagent is in the container, just if there IS reagent in it +/obj/item/reagent_containers/borghypo/emag_act(mob/user) + if(!emagged) + emagged = TRUE + reagent_ids += reagent_ids_emagged + return + emagged = FALSE + reagent_ids -= reagent_ids_emagged /obj/item/reagent_containers/borghypo/basic name = "Basic Medical Hypospray" diff --git a/icons/obj/aibots.dmi b/icons/obj/aibots.dmi index 6b478c90f3d..d2f968492e8 100644 Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ