From 6ac3c0a90f4c8ae021b56bca49ae1216e81be74b Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Thu, 30 Mar 2023 16:45:16 -0500 Subject: [PATCH] xenoborgs can now select any normal borg module as well as the hunter module (#20423) * xenoborgs can now select any normal borg module and the hunter module * improved * no longer returns force modules if there are already force modules --- code/modules/mob/living/silicon/robot/robot_mob.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index 42938d5a284..1101665f569 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -334,7 +334,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( * * By default this returns the Engineering, Janitor, Medical, Mining, and Service modules. * If there are any [/mob/living/silicon/robot/var/force_modules] set, then they are returned instead. - * If the MMI has a xenomorph brain in it ([/obj/item/mmi/var/alien]), then only the "Hunter" module is returned. + * If the MMI has a xenomorph brain in it ([/obj/item/mmi/var/alien]), then only the "Hunter" and standard modules is returned. */ /mob/living/silicon/robot/proc/get_module_types() var/static/list/standard_modules = list( @@ -346,10 +346,12 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/static/list/special_modules = list( "Combat" = image('icons/mob/robots.dmi', "security-radial"), "Security" = image('icons/mob/robots.dmi', "security-radial"), - "Destroyer" = image('icons/mob/robots.dmi', "droidcombat")) + "Destroyer" = image('icons/mob/robots.dmi', "droidcombat"), + "Hunter" = image('icons/mob/robots.dmi', "xeno-radial")) if(mmi?.alien) - return list("Hunter" = image('icons/mob/robots.dmi', "xeno-radial")) + if(!length(force_modules)) + force_modules = list("Hunter") + standard_modules.Copy() // standard PLUS hunter // Return a list of `force_modules`, with the associated images from the other lists. if(length(force_modules))