cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3540 from Nalarac/master

Browse Source 
Makes Engineer Borgs Great Again
This commit is contained in:
Neerti
2017-06-27 15:45:44 -04:00
committed by GitHub
parent 2dd8f33ecd 3a089ab8a6
commit 7164f8ed23
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/global.dm
+1 -1
View File
@@ -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"
)
code/modules/mob/living/silicon/robot/robot_modules.dm
+10 -1
View File
@@ -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()
..()
@@ -400,13 +403,18 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/weapon/inflatable_dispenser/robot(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(20000)
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)
@@ -698,6 +706,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)