From be1d527069302e9d80345081eb8c3df327421d35 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 10 Jan 2015 21:41:41 -0500 Subject: [PATCH] Borg Modules --- code/modules/mining/mine_items.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 22 +++----- .../mob/living/silicon/robot/robot_modules.dm | 55 ++++++++----------- .../living/silicon/robot/robot_movement.dm | 4 +- 4 files changed, 35 insertions(+), 50 deletions(-) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 13b4535ac20..b7d8ac6c05e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -93,7 +93,7 @@ name = "sonic jackhammer" icon_state = "jackhammer" item_state = "jackhammer" - digspeed = 20 //faster than drill, but cannot dig + digspeed = 15 //faster than drill, but cannot dig origin_tech = "materials=3;powerstorage=2;engineering=2" desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." @@ -140,7 +140,7 @@ borgdrill name = "cyborg mining drill" - icon_state = "diamonddrill" + icon_state = "jackhammer" item_state = "jackhammer" digspeed = 15 desc = "" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7329eb5b677..31c3de35fb6 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -72,7 +72,7 @@ var/base_icon = "" var/crisis = 0 var/hiddenborg = 0 - + var/obj/item/borg/sight/hud/sec/sechud = null var/obj/item/borg/sight/hud/med/healthhud = null @@ -188,7 +188,7 @@ /mob/living/silicon/robot/proc/pick_module() if(module) return - var/list/modules = list("Standard", "Engineering", "Construction", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security") + var/list/modules = list("Standard", "Engineering", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Security") if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis) src << "\red Crisis mode active. Combat module available." modules+="Combat" @@ -218,7 +218,7 @@ module_sprites["Bro"] = "Brobot" module_sprites["Rich"] = "maximillion" module_sprites["Default"] = "Service2" - +/* if("Clerical") module = new /obj/item/weapon/robot_module/clerical(src) channels = list("Service" = 1) @@ -227,7 +227,7 @@ module_sprites["Bro"] = "Brobot" module_sprites["Rich"] = "maximillion" module_sprites["Default"] = "Service2" - +*/ if("Miner") module = new /obj/item/weapon/robot_module/miner(src) channels = list("Supply" = 1) @@ -275,15 +275,6 @@ module_sprites["Antique"] = "engineerrobot" module_sprites["Landmate"] = "landmate" - if("Construction") - module = new /obj/item/weapon/robot_module/construction(src) - channels = list("Engineering" = 1) - if(camera && "Robots" in camera.network) - camera.network.Add("Engineering") - module_sprites["Basic"] = "Engineering" - module_sprites["Antique"] = "engineerrobot" - module_sprites["Landmate"] = "landmate" - if("Janitor") module = new /obj/item/weapon/robot_module/janitor(src) module_sprites["Basic"] = "JanBot2" @@ -294,6 +285,7 @@ module = new /obj/item/weapon/robot_module/combat(src) module_sprites["Combat Android"] = "droid-combat" channels = list("Security" = 1) + if("Hunter") updatename(module) module = new /obj/item/weapon/robot_module/alien/hunter(src) @@ -458,12 +450,12 @@ else C.toggled = 1 src << "\red You enable [C.name]." - + /mob/living/silicon/robot/verb/control_hud() set name = "Set Sensor Augmentation" set desc = "Augment visual feed with internal sensor overlays." set category = "Robot Commands" - toggle_sensor_mode() + toggle_sensor_mode() /mob/living/silicon/robot/blob_act() if (stat != 2) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 65eb6900e5e..2b71cc6ae88 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -68,7 +68,7 @@ src.modules += new /obj/item/weapon/wrench(src) src.modules += new /obj/item/weapon/crowbar(src) src.modules += new /obj/item/device/healthanalyzer(src) - src.emag = new /obj/item/weapon/melee/energy/sword(src) + src.emag = new /obj/item/weapon/melee/energy/sword/cyborg(src) return /obj/item/weapon/robot_module/surgeon @@ -155,26 +155,6 @@ ..() -/obj/item/weapon/robot_module/construction - name = "construction robot module" - - stacktypes = list( - /obj/item/stack/sheet/metal = 50, - /obj/item/stack/sheet/plasteel = 10, - /obj/item/stack/sheet/rglass = 50 - ) - - New() - src.modules += new /obj/item/device/flashlight(src) - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/borg/sight/meson(src) - src.modules += new /obj/item/weapon/extinguisher(src) - src.modules += new /obj/item/weapon/rcd/borg(src) - src.modules += new /obj/item/weapon/screwdriver(src) - src.modules += new /obj/item/weapon/wrench(src) - src.modules += new /obj/item/weapon/crowbar(src) - src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src) - /obj/item/weapon/robot_module/engineering name = "engineering robot module" @@ -191,6 +171,7 @@ src.modules += new /obj/item/device/flashlight(src) src.modules += new /obj/item/device/flash/cyborg(src) src.modules += new /obj/item/borg/sight/meson(src) + src.modules += new /obj/item/weapon/rcd/borg(src) src.modules += new /obj/item/weapon/extinguisher(src) src.modules += new /obj/item/weapon/weldingtool/largetank(src) src.modules += new /obj/item/weapon/screwdriver(src) @@ -222,6 +203,14 @@ W.amount = 50 src.modules += W + var/obj/item/stack/rods/Q = new /obj/item/stack/rods(src) + Q.amount = 15 + src.modules += Q + + var/obj/item/stack/tile/plasteel/F = new /obj/item/stack/tile/plasteel(src) //floor tiles not regular plasteel, calm down + F.amount = 15 + src.modules += F + return /obj/item/weapon/robot_module/security @@ -269,6 +258,9 @@ src.modules += new /obj/item/device/flash/cyborg(src) src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src) src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) + src.modules += new /obj/item/weapon/pen(src) + src.modules += new /obj/item/weapon/razor(src) + src.modules += new /obj/item/device/violin(src) var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) M.matter = 30 @@ -287,8 +279,15 @@ src.emag.name = "Mickey Finn's Special Brew" return +/obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R) + var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules + E.reagents.add_reagent("enzyme", 2) + if(src.emag) + var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = src.emag + B.reagents.add_reagent("beer2", 2) -/obj/item/weapon/robot_module/clerical +/* +/obj/item/weapon/robot_module/clerical //Whyyyyy? name = "clerical robot module" New() @@ -300,20 +299,14 @@ src.modules += new /obj/item/weapon/gripper/paperwork(src) src.emag = new /obj/item/weapon/stamp/denied(src) - -/obj/item/weapon/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R) - var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules - E.reagents.add_reagent("enzyme", 2) - if(src.emag) - var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = src.emag - B.reagents.add_reagent("beer2", 2) +*/ /obj/item/weapon/robot_module/miner name = "miner robot module" New() - src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/device/flashlight/lantern(src) src.modules += new /obj/item/device/flash/cyborg(src) src.modules += new /obj/item/borg/sight/meson(src) src.modules += new /obj/item/weapon/wrench(src) @@ -321,7 +314,7 @@ src.modules += new /obj/item/weapon/storage/bag/ore(src) src.modules += new /obj/item/weapon/pickaxe/borgdrill(src) src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src) - src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) + src.emag = new /obj/item/borg/stun(src) return /obj/item/weapon/robot_module/deathsquad diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index cd263240851..37172cd045d 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,5 +1,5 @@ /mob/living/silicon/robot/Process_Spaceslipping(var/prob_slip) - if(module && (istype(module,/obj/item/weapon/robot_module/construction) || istype(module,/obj/item/weapon/robot_module/drone))) + if(module && (istype(module,/obj/item/weapon/robot_module/drone))) return 0 ..(prob_slip) @@ -23,4 +23,4 @@ return tally+config.robot_delay /mob/living/silicon/robot/Move() - ..() \ No newline at end of file + ..() \ No newline at end of file