From 1444a768f30d97dc59a0ab168b296bd4e72c0b30 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Fri, 11 Mar 2022 21:27:40 -0500 Subject: [PATCH] Mineborg emag gear! --- code/__defines/exosuit_fab.dm | 2 +- .../mob/living/silicon/robot/robot_modules/station.dm | 7 +++++-- .../mob/living/silicon/robot/robot_modules/station_vr.dm | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/__defines/exosuit_fab.dm b/code/__defines/exosuit_fab.dm index 9cd6890d370..ccb05b93744 100644 --- a/code/__defines/exosuit_fab.dm +++ b/code/__defines/exosuit_fab.dm @@ -9,7 +9,7 @@ /// Module is compatible with Engineering Cyborg models #define BORG_MODULE_ENGINEERING (1<<4) /// Module is compatible with Science Cyborg models -#define BORG_MODULE_SCIENCE (1<<5) +#define BORG_MODULE_SCIENCE (1<<5) /// Module is compatible with Ripley Exosuit models #define EXOSUIT_MODULE_RIPLEY (1<<0) /// Module is compatible with Odyseeus Exosuit models diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index fd16ad484c5..a8a817b5486 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -741,8 +741,11 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src) src.modules += new /obj/item/weapon/gripper/miner(src) src.modules += new /obj/item/weapon/mining_scanner(src) - src.emag = new /obj/item/weapon/gun/energy/phasegun/mounted(src) // A phase gun for emags, gives a reason to emag without making it an obligation - // No reason for these, upgrade module replaces them. + // New Emag gear for the minebots! + src.emag = new /obj/item/borg/combat/shield(src) + src.emag = new /obj/item/weapon/kinetic_crusher/machete/dagger(src) + + // No reason for these, upgrade modules replace them. //src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) //src.emag = new /obj/item/weapon/pickaxe/diamonddrill(src) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index ece654e7e5b..0a0de744b20 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -788,7 +788,11 @@ src.modules += new /obj/item/weapon/gripper/miner(src) src.modules += new /obj/item/weapon/mining_scanner(src) src.modules += new /obj/item/weapon/dogborg/jaws/small(src) - src.emag = new /obj/item/weapon/gun/energy/phasegun/mounted(src) // A phase gun for emags, gives a reason to emag without making it an obligation + // New Emag gear for the minebots! + src.emag = new /obj/item/borg/combat/shield(src) + src.emag = new /obj/item/weapon/kinetic_crusher/machete/dagger(src) + + // No reason for these, upgrade modules replace them. //src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) //src.emag = new /obj/item/weapon/pickaxe/diamonddrill(src)