diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 13c7a44a9e7..0170f52251f 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -117,6 +117,7 @@ datum/game_mode/nations AI.add_inherent_law("Remain available to mediate all conflicts between the various nations when asked to.") AI.show_laws() for(var/mob/living/silicon/robot/R in AI.connected_robots) + R.change_mob_type( /mob/living/silicon/robot/combat , null, null, 1, 1 ) R.lawsync() R.show_laws() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 5c02b6aeb69..e3efa6b52b9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1409,3 +1409,24 @@ var/list/robot_verbs_default = list( connected_ai.connected_robots |= src notify_ai(1) sync() + + +/mob/living/silicon/robot/combat/New() + ..() + var/module_sprites[0] //Used to store the associations between sprite names and sprite index. + module = new /obj/item/weapon/robot_module/combat(src) + module.channels = list("Security" = 1) + module_sprites["Combat Android"] = "droidcombat" + //languages + module.add_languages(src) + //subsystems + module.add_subsystems(src) + + hands.icon_state = lowertext("Combat") + updatename() + + status_flags &= ~CANPUSH + + choose_icon(6,module_sprites) + radio.config(module.channels) + notify_ai(2)