From 3cd09cb5356fccb6645e7ba0856f4ea36c7bf2fa Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 10 Aug 2016 17:54:09 -0300 Subject: [PATCH] Combat module fixes and tweaks (#709) Fixes #708 Fixes #707 Removals thermals from wombat borgs, adds onto syndicate borgs. --- code/modules/mob/living/silicon/robot/robot_modules.dm | 7 ++++++- html/changelogs/alberyk-PR-709.yml | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-PR-709.yml diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index b7298aa3538..44851831549 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -641,6 +641,7 @@ var/global/list/robot_modules = list( ..() loc = R src.modules += new /obj/item/device/flash(src) + src.modules += new /obj/item/borg/sight/thermal(src) src.modules += new /obj/item/weapon/melee/energy/sword(src) src.modules += new /obj/item/weapon/gun/energy/mountedsmg(src) src.modules += new /obj/item/weapon/gun/energy/crossbow/cyborg(src) @@ -662,13 +663,17 @@ var/global/list/robot_modules = list( /obj/item/weapon/robot_module/combat name = "combat robot module" + channels = list("Security" = 1) + networks = list(NETWORK_SECURITY) + subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) sprites = list("Combat Android" = "droid-combat") + can_be_pushed = 0 supported_upgrades = list(/obj/item/robot_parts/robot_component/jetpack) /obj/item/weapon/robot_module/combat/New() ..() src.modules += new /obj/item/device/flash(src) - src.modules += new /obj/item/borg/sight/thermal(src) + src.modules += new /obj/item/borg/sight/hud/sec(src) src.modules += new /obj/item/weapon/gun/energy/laser/mounted(src) src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) src.modules += new /obj/item/borg/combat/shield(src) diff --git a/html/changelogs/alberyk-PR-709.yml b/html/changelogs/alberyk-PR-709.yml new file mode 100644 index 00000000000..ff893a878da --- /dev/null +++ b/html/changelogs/alberyk-PR-709.yml @@ -0,0 +1,8 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Combat cyborgs should have access to security channel, and be able to be tracked via cameras consoles." + - tweak: "Replaced the thermal vision module with a sechud." + - rscadd: "Added the thermal vision module to the syndicate borg."