From de7bae13abaad667769c36792e0830b0550eb49a Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 19 Jun 2017 00:21:11 -0500 Subject: [PATCH 1/2] Makes Engineer Borgs Great Again Gives construction module exclusive items to the engineering module and comments out the construction module. --- code/global.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/code/global.dm b/code/global.dm index ea27e3f8233..05edcd38c93 100644 --- a/code/global.dm +++ b/code/global.dm @@ -167,7 +167,7 @@ var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J // Used by robots and robot preferences. var/list/robot_module_types = list( - "Standard", "Engineering", "Construction", "Surgeon", "Crisis", + "Standard", "Engineering", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security", "Research" ) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 1dc391f478b..204e39d05b1 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -9,7 +9,7 @@ var/global/list/robot_modules = list( "Security" = /obj/item/weapon/robot_module/robot/security/general, "Combat" = /obj/item/weapon/robot_module/robot/security/combat, "Engineering" = /obj/item/weapon/robot_module/robot/engineering/general, - "Construction" = /obj/item/weapon/robot_module/robot/engineering/construction, +// "Construction" = /obj/item/weapon/robot_module/robot/engineering/construction, "Janitor" = /obj/item/weapon/robot_module/robot/janitor ) @@ -342,6 +342,8 @@ var/global/list/robot_modules = list( name = "construction robot module" no_slip = 1 +/* Merged back into engineering (Hell, it's about time.) + /obj/item/weapon/robot_module/robot/engineering/construction/New() ..() src.modules += new /obj/item/borg/sight/meson(src) @@ -381,6 +383,7 @@ var/global/list/robot_modules = list( var/obj/item/stack/material/cyborg/glass/reinforced/RG = new (src) RG.synths = list(metal, glass) src.modules += RG +*/ /obj/item/weapon/robot_module/robot/engineering/general/New() ..() @@ -399,12 +402,17 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/device/floor_painter(src) src.emag = new /obj/item/weapon/melee/baton/robot/arm(src) src.modules += new /obj/item/device/geiger(src) + src.modules += new /obj/item/weapon/rcd/borg(src) + src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) + src.modules += new /obj/item/weapon/gripper/no_use/loader(src) var/datum/matter_synth/metal = new /datum/matter_synth/metal(40000) var/datum/matter_synth/glass = new /datum/matter_synth/glass(40000) + var/datum/matter_synth/plasteel = new /datum/matter_synth/plasteel() var/datum/matter_synth/wire = new /datum/matter_synth/wire() synths += metal synths += glass + synths += plasteel synths += wire var/obj/item/weapon/matter_decompiler/MD = new /obj/item/weapon/matter_decompiler(src) @@ -428,8 +436,12 @@ var/global/list/robot_modules = list( C.synths = list(wire) src.modules += C - var/obj/item/stack/tile/floor/cyborg/S = new /obj/item/stack/tile/floor/cyborg(src) - S.synths = list(metal) + var/obj/item/stack/tile/floor/cyborg/F = new /obj/item/stack/tile/floor/cyborg(src) + F.synths = list(metal) + src.modules += F + + var/obj/item/stack/material/cyborg/plasteel/S = new (src) + S.synths = list(plasteel) src.modules += S var/obj/item/stack/material/cyborg/glass/reinforced/RG = new (src) From 5c63a3ac71a03a6f1b535d0cae6a155add29300d Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 19 Jun 2017 17:52:06 -0500 Subject: [PATCH 2/2] Gives Research Borgs Rapid Part Exchanger Gives the research borg module the rapid part exchange device so it can easily upgrade machines without having to take it apart and slowly put the pieces back in (with some of these machines being bugged and unable to be deconstructed like the circuit imprinter). --- code/modules/mob/living/silicon/robot/robot_modules.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 204e39d05b1..47282e723ee 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -704,6 +704,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/surgical/circular_saw(src) src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src) + src.modules += new /obj/item/weapon/storage/part_replacer(src) src.emag = new /obj/item/weapon/hand_tele(src) var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000)