diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 1f461bc18e6..d99bad202d7 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -23,14 +23,12 @@ if(emag) emag.emp_act(severity) ..() - return /obj/item/weapon/robot_module/New() - src.modules += new /obj/item/device/flashlight(src) - src.modules += new /obj/item/device/flash/cyborg(src) - src.emag = new /obj/item/toy/sword(src) - src.emag.name = "Placeholder Emag Item" + modules += new /obj/item/device/flash/cyborg(src) + emag = new /obj/item/toy/sword(src) + emag.name = "Placeholder Emag Item" /obj/item/weapon/robot_module/Destroy() for(var/module in modules) @@ -48,18 +46,19 @@ emag.flags |= NODROP emag.mouse_opacity = 2 -/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R) - if(!stacktypes || !stacktypes.len) return +/obj/item/weapon/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R) + if(!stacktypes || !stacktypes.len) + return var/stack_respawned = 0 for(var/T in stacktypes) - var/O = locate(T) in src.modules + var/O = locate(T) in modules var/obj/item/stack/S = O if(!S) - src.modules -= null + modules -= null S = new T(src) - src.modules += S + modules += S S.amount = 1 stack_respawned = 1 @@ -75,7 +74,7 @@ if(O) modules += O -/obj/item/weapon/robot_module/proc/add_languages(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/proc/add_languages(mob/living/silicon/robot/R) //full set of languages R.add_language("Galactic Common", 1) R.add_language("Sol Common", 1) @@ -93,10 +92,10 @@ R.add_language("Orluum", 0) R.add_language("Clownish",0) -/obj/item/weapon/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/proc/add_subsystems(mob/living/silicon/robot/R) R.verbs |= subsystems -/obj/item/weapon/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R) +/obj/item/weapon/robot_module/proc/remove_subsystems(mob/living/silicon/robot/R) R.verbs -= subsystems /obj/item/weapon/robot_module/standard @@ -104,13 +103,13 @@ module_type = "Standard" /obj/item/weapon/robot_module/standard/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/melee/baton/loaded(src) - src.modules += new /obj/item/weapon/extinguisher(src) - 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/cyborg(src) + ..() + modules += new /obj/item/weapon/melee/baton/loaded(src) + modules += new /obj/item/weapon/extinguisher(src) + modules += new /obj/item/weapon/wrench(src) + modules += new /obj/item/weapon/crowbar(src) + modules += new /obj/item/device/healthanalyzer(src) + emag = new /obj/item/weapon/melee/energy/sword/cyborg(src) fix_modules() @@ -126,40 +125,40 @@ ) /obj/item/weapon/robot_module/medical/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/device/healthanalyzer/advanced(src) - src.modules += new /obj/item/device/reagent_scanner/adv(src) - src.modules += new /obj/item/weapon/borg_defib(src) - src.modules += new /obj/item/roller_holder(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo(src) - src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src) - src.modules += new /obj/item/weapon/reagent_containers/dropper(src) - src.modules += new /obj/item/weapon/reagent_containers/syringe(src) - src.modules += new /obj/item/weapon/extinguisher/mini(src) - src.modules += new /obj/item/stack/medical/bruise_pack/advanced(src) - src.modules += new /obj/item/stack/medical/ointment/advanced(src) - src.modules += new /obj/item/stack/medical/splint(src) - src.modules += new /obj/item/stack/nanopaste(src) - src.modules += new /obj/item/weapon/scalpel(src) - src.modules += new /obj/item/weapon/hemostat(src) - src.modules += new /obj/item/weapon/retractor(src) - src.modules += new /obj/item/weapon/cautery(src) - src.modules += new /obj/item/weapon/bonegel(src) - src.modules += new /obj/item/weapon/FixOVein(src) - src.modules += new /obj/item/weapon/bonesetter(src) - src.modules += new /obj/item/weapon/circular_saw(src) - src.modules += new /obj/item/weapon/surgicaldrill(src) + ..() + modules += new /obj/item/device/healthanalyzer/advanced(src) + modules += new /obj/item/device/reagent_scanner/adv(src) + modules += new /obj/item/weapon/borg_defib(src) + modules += new /obj/item/roller_holder(src) + modules += new /obj/item/weapon/reagent_containers/borghypo(src) + modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src) + modules += new /obj/item/weapon/reagent_containers/dropper(src) + modules += new /obj/item/weapon/reagent_containers/syringe(src) + modules += new /obj/item/weapon/extinguisher/mini(src) + modules += new /obj/item/stack/medical/bruise_pack/advanced(src) + modules += new /obj/item/stack/medical/ointment/advanced(src) + modules += new /obj/item/stack/medical/splint(src) + modules += new /obj/item/stack/nanopaste(src) + modules += new /obj/item/weapon/scalpel(src) + modules += new /obj/item/weapon/hemostat(src) + modules += new /obj/item/weapon/retractor(src) + modules += new /obj/item/weapon/cautery(src) + modules += new /obj/item/weapon/bonegel(src) + modules += new /obj/item/weapon/FixOVein(src) + modules += new /obj/item/weapon/bonesetter(src) + modules += new /obj/item/weapon/circular_saw(src) + modules += new /obj/item/weapon/surgicaldrill(src) - src.emag = new /obj/item/weapon/reagent_containers/spray(src) + emag = new /obj/item/weapon/reagent_containers/spray(src) - src.emag.reagents.add_reagent("facid", 250) - src.emag.name = "Polyacid spray" + emag.reagents.add_reagent("facid", 250) + emag.name = "Polyacid spray" fix_modules() -/obj/item/weapon/robot_module/medical/respawn_consumable(var/mob/living/silicon/robot/R) - if(src.emag) - var/obj/item/weapon/reagent_containers/spray/PS = src.emag +/obj/item/weapon/robot_module/medical/respawn_consumable(mob/living/silicon/robot/R) + if(emag) + var/obj/item/weapon/reagent_containers/spray/PS = emag PS.reagents.add_reagent("facid", 2) ..() @@ -178,29 +177,29 @@ ) /obj/item/weapon/robot_module/engineering/New() - 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/cyborg(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/wirecutters(src) - src.modules += new /obj/item/device/multitool(src) - src.modules += new /obj/item/device/t_scanner(src) - src.modules += new /obj/item/device/analyzer(src) - src.modules += new /obj/item/taperoll/engineering(src) - src.modules += new /obj/item/weapon/gripper(src) - src.modules += new /obj/item/weapon/matter_decompiler(src) - src.modules += new /obj/item/device/floor_painter(src) + ..() + modules += new /obj/item/borg/sight/meson(src) + modules += new /obj/item/weapon/rcd/borg(src) + modules += new /obj/item/weapon/extinguisher(src) + modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src) + modules += new /obj/item/weapon/screwdriver(src) + modules += new /obj/item/weapon/wrench(src) + modules += new /obj/item/weapon/crowbar(src) + modules += new /obj/item/weapon/wirecutters(src) + modules += new /obj/item/device/multitool(src) + modules += new /obj/item/device/t_scanner(src) + modules += new /obj/item/device/analyzer(src) + modules += new /obj/item/taperoll/engineering(src) + modules += new /obj/item/weapon/gripper(src) + modules += new /obj/item/weapon/matter_decompiler(src) + modules += new /obj/item/device/floor_painter(src) - src.emag = new /obj/item/borg/stun(src) + emag = new /obj/item/borg/stun(src) for(var/G in stacktypes) //Attempt to unify Engi-Borg material stacks into fewer lines. See Line 492 for example. Variables changed out of paranoia. var/obj/item/stack/sheet/M = new G(src) M.amount = stacktypes[G] - src.modules += M + modules += M fix_modules() @@ -210,13 +209,13 @@ subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) /obj/item/weapon/robot_module/security/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) - src.modules += new /obj/item/weapon/melee/baton/loaded/robot(src) - src.modules += new /obj/item/weapon/gun/energy/disabler/cyborg(src) - src.modules += new /obj/item/taperoll/police(src) - src.modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) - src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) + ..() + modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) + modules += new /obj/item/weapon/melee/baton/loaded/robot(src) + modules += new /obj/item/weapon/gun/energy/disabler/cyborg(src) + modules += new /obj/item/taperoll/police(src) + modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) + emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) fix_modules() @@ -225,16 +224,16 @@ module_type = "Janitor" /obj/item/weapon/robot_module/janitor/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/soap/nanotrasen(src) - src.modules += new /obj/item/weapon/storage/bag/trash/cyborg(src) - src.modules += new /obj/item/weapon/mop/advanced/cyborg(src) - src.modules += new /obj/item/device/lightreplacer(src) - src.modules += new /obj/item/weapon/holosign_creator(src) - src.emag = new /obj/item/weapon/reagent_containers/spray(src) + ..() + modules += new /obj/item/weapon/soap/nanotrasen(src) + modules += new /obj/item/weapon/storage/bag/trash/cyborg(src) + modules += new /obj/item/weapon/mop/advanced/cyborg(src) + modules += new /obj/item/device/lightreplacer(src) + modules += new /obj/item/weapon/holosign_creator(src) + emag = new /obj/item/weapon/reagent_containers/spray(src) - src.emag.reagents.add_reagent("lube", 250) - src.emag.name = "Lube spray" + emag.reagents.add_reagent("lube", 250) + emag.name = "Lube spray" fix_modules() @@ -243,37 +242,37 @@ module_type = "Service" /obj/item/weapon/robot_module/butler/New() - 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) - src.modules += new /obj/item/device/guitar(src) + ..() + modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src) + modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) + modules += new /obj/item/weapon/pen(src) + modules += new /obj/item/weapon/razor(src) + modules += new /obj/item/device/violin(src) + modules += new /obj/item/device/guitar(src) var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) M.matter = 30 - src.modules += M + modules += M - src.modules += new /obj/item/weapon/reagent_containers/dropper/cyborg(src) - src.modules += new /obj/item/weapon/lighter/zippo(src) - src.modules += new /obj/item/weapon/storage/bag/tray/cyborg(src) - src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) - src.emag = new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src) + modules += new /obj/item/weapon/reagent_containers/dropper/cyborg(src) + modules += new /obj/item/weapon/lighter/zippo(src) + modules += new /obj/item/weapon/storage/bag/tray/cyborg(src) + modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) + emag = new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src) var/datum/reagents/R = new/datum/reagents(50) - src.emag.reagents = R - R.my_atom = src.emag + emag.reagents = R + R.my_atom = emag R.add_reagent("beer2", 50) - src.emag.name = "Mickey Finn's Special Brew" + emag.name = "Mickey Finn's Special Brew" fix_modules() /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 + var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in modules E.reagents.add_reagent("enzyme", 2) - if(src.emag) - var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = src.emag + if(emag) + var/obj/item/weapon/reagent_containers/food/drinks/cans/beer/B = emag B.reagents.add_reagent("beer2", 2) ..() @@ -294,27 +293,13 @@ R.add_language("Bubblish", 1) R.add_language("Clownish",1) -/* -/obj/item/weapon/robot_module/clerical //Whyyyyy? - name = "clerical robot module" - - New() - src.modules += new /obj/item/device/flashlight(src) - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/pen/multi/robopen(src) - src.modules += new /obj/item/weapon/form_printer(src) - src.modules += new /obj/item/device/taperecorder(src) - src.modules += new /obj/item/weapon/gripper/paperwork(src) - - src.emag = new /obj/item/weapon/stamp/denied(src) -*/ /obj/item/weapon/robot_module/miner name = "miner robot module" module_type = "Miner" /obj/item/weapon/robot_module/miner/New() - modules += new /obj/item/device/flash/cyborg(src) + ..() modules += new /obj/item/borg/sight/meson(src) modules += new /obj/item/weapon/storage/bag/ore/cyborg(src) modules += new /obj/item/weapon/pickaxe/drill/cyborg(src) @@ -334,12 +319,12 @@ module_type = "Malf" /obj/item/weapon/robot_module/deathsquad/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/borg/sight/thermal(src) - src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src) - src.modules += new /obj/item/weapon/gun/energy/pulse/cyborg(src) - src.modules += new /obj/item/weapon/crowbar(src) - src.emag = null + ..() + modules += new /obj/item/borg/sight/thermal(src) + modules += new /obj/item/weapon/melee/energy/sword/cyborg(src) + modules += new /obj/item/weapon/gun/energy/pulse/cyborg(src) + modules += new /obj/item/weapon/crowbar(src) + emag = null fix_modules() @@ -348,14 +333,14 @@ module_type = "Malf" // cuz it looks cool /obj/item/weapon/robot_module/syndicate/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/melee/energy/sword/cyborg(src) - src.modules += new /obj/item/weapon/gun/energy/printer(src) - src.modules += new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi/cyborg(src) - src.modules += new /obj/item/weapon/card/emag(src) - src.modules += new /obj/item/weapon/crowbar(src) - src.modules += new /obj/item/weapon/pinpointer/operative(src) - src.emag = null + ..() + modules += new /obj/item/weapon/melee/energy/sword/cyborg(src) + modules += new /obj/item/weapon/gun/energy/printer(src) + modules += new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/multi/cyborg(src) + modules += new /obj/item/weapon/card/emag(src) + modules += new /obj/item/weapon/crowbar(src) + modules += new /obj/item/weapon/pinpointer/operative(src) + emag = null fix_modules() @@ -370,30 +355,30 @@ ) /obj/item/weapon/robot_module/syndicate_medical/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/device/healthanalyzer/advanced(src) - src.modules += new /obj/item/device/reagent_scanner/adv(src) - src.modules += new /obj/item/weapon/borg_defib(src) - src.modules += new /obj/item/roller_holder(src) - src.modules += new /obj/item/weapon/reagent_containers/borghypo/syndicate(src) - src.modules += new /obj/item/weapon/extinguisher/mini(src) - src.modules += new /obj/item/stack/medical/bruise_pack/advanced(src) - src.modules += new /obj/item/stack/medical/ointment/advanced(src) - src.modules += new /obj/item/stack/medical/splint(src) - src.modules += new /obj/item/stack/nanopaste(src) - src.modules += new /obj/item/weapon/scalpel(src) - src.modules += new /obj/item/weapon/hemostat(src) - src.modules += new /obj/item/weapon/retractor(src) - src.modules += new /obj/item/weapon/cautery(src) - src.modules += new /obj/item/weapon/bonegel(src) - src.modules += new /obj/item/weapon/FixOVein(src) - src.modules += new /obj/item/weapon/bonesetter(src) - src.modules += new /obj/item/weapon/surgicaldrill(src) - src.modules += new /obj/item/weapon/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon - src.modules += new /obj/item/weapon/card/emag(src) - src.modules += new /obj/item/weapon/crowbar(src) - src.modules += new /obj/item/weapon/pinpointer/operative(src) - src.emag = null + ..() + modules += new /obj/item/device/healthanalyzer/advanced(src) + modules += new /obj/item/device/reagent_scanner/adv(src) + modules += new /obj/item/weapon/borg_defib(src) + modules += new /obj/item/roller_holder(src) + modules += new /obj/item/weapon/reagent_containers/borghypo/syndicate(src) + modules += new /obj/item/weapon/extinguisher/mini(src) + modules += new /obj/item/stack/medical/bruise_pack/advanced(src) + modules += new /obj/item/stack/medical/ointment/advanced(src) + modules += new /obj/item/stack/medical/splint(src) + modules += new /obj/item/stack/nanopaste(src) + modules += new /obj/item/weapon/scalpel(src) + modules += new /obj/item/weapon/hemostat(src) + modules += new /obj/item/weapon/retractor(src) + modules += new /obj/item/weapon/cautery(src) + modules += new /obj/item/weapon/bonegel(src) + modules += new /obj/item/weapon/FixOVein(src) + modules += new /obj/item/weapon/bonesetter(src) + modules += new /obj/item/weapon/surgicaldrill(src) + modules += new /obj/item/weapon/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon + modules += new /obj/item/weapon/card/emag(src) + modules += new /obj/item/weapon/crowbar(src) + modules += new /obj/item/weapon/pinpointer/operative(src) + emag = null fix_modules() @@ -402,15 +387,15 @@ module_type = "Malf" /obj/item/weapon/robot_module/combat/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) - src.modules += new /obj/item/borg/sight/thermal(src) - src.modules += new /obj/item/weapon/gun/energy/gun/cyborg(src) - src.modules += new /obj/item/weapon/pickaxe/drill/jackhammer(src) - src.modules += new /obj/item/borg/combat/shield(src) - src.modules += new /obj/item/borg/combat/mobility(src) - src.modules += new /obj/item/weapon/wrench(src) - src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src) + ..() + modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) + modules += new /obj/item/borg/sight/thermal(src) + modules += new /obj/item/weapon/gun/energy/gun/cyborg(src) + modules += new /obj/item/weapon/pickaxe/drill/jackhammer(src) + modules += new /obj/item/borg/combat/shield(src) + modules += new /obj/item/borg/combat/mobility(src) + modules += new /obj/item/weapon/wrench(src) + emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src) fix_modules() @@ -419,14 +404,14 @@ module_type = "Malf" /obj/item/weapon/robot_module/peacekeeper/New() - src.modules += new /obj/item/device/flash/cyborg(src) - src.modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) - src.modules += new /obj/item/weapon/gun/energy/gun/cyborg(src) - src.modules += new /obj/item/weapon/pickaxe/drill/jackhammer(src) - src.modules += new /obj/item/borg/combat/shield(src) - src.modules += new /obj/item/borg/combat/mobility(src) - src.modules += new /obj/item/weapon/wrench(src) - src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src) + ..() + modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) + modules += new /obj/item/weapon/gun/energy/gun/cyborg(src) + modules += new /obj/item/weapon/pickaxe/drill/jackhammer(src) + modules += new /obj/item/borg/combat/shield(src) + modules += new /obj/item/borg/combat/mobility(src) + modules += new /obj/item/weapon/wrench(src) + emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src) fix_modules() @@ -435,18 +420,18 @@ module_type = "Standard" /obj/item/weapon/robot_module/alien/hunter/New() - src.modules += new /obj/item/weapon/melee/energy/alien/claws(src) - src.modules += new /obj/item/device/flash/cyborg/alien(src) - src.modules += new /obj/item/borg/sight/thermal/alien(src) + modules += new /obj/item/weapon/melee/energy/alien/claws(src) + modules += new /obj/item/device/flash/cyborg/alien(src) + modules += new /obj/item/borg/sight/thermal/alien(src) var/obj/item/weapon/reagent_containers/spray/alien/stun/S = new /obj/item/weapon/reagent_containers/spray/alien/stun(src) S.reagents.add_reagent("ether",250) //nerfed to sleeptoxin to make it less instant drop. - src.modules += S + modules += S var/obj/item/weapon/reagent_containers/spray/alien/smoke/A = new /obj/item/weapon/reagent_containers/spray/alien/smoke(src) S.reagents.add_reagent("water",50) //Water is used as a dummy reagent for the smoke bombs. More of an ammo counter. - src.modules += A - src.emag = new /obj/item/weapon/reagent_containers/spray/alien/acid(src) - src.emag.reagents.add_reagent("facid", 125) - src.emag.reagents.add_reagent("sacid", 125) + modules += A + emag = new /obj/item/weapon/reagent_containers/spray/alien/acid(src) + emag.reagents.add_reagent("facid", 125) + emag.reagents.add_reagent("sacid", 125) fix_modules() @@ -469,44 +454,42 @@ ) /obj/item/weapon/robot_module/drone/New() - src.modules += new /obj/item/weapon/weldingtool/largetank/cyborg(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/wirecutters(src) - src.modules += new /obj/item/device/multitool(src) - src.modules += new /obj/item/device/lightreplacer(src) - src.modules += new /obj/item/weapon/gripper(src) - src.modules += new /obj/item/weapon/matter_decompiler(src) - src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src) - src.modules += new /obj/item/weapon/soap(src) - src.modules += new /obj/item/device/t_scanner(src) + modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src) + modules += new /obj/item/weapon/screwdriver(src) + modules += new /obj/item/weapon/wrench(src) + modules += new /obj/item/weapon/crowbar(src) + modules += new /obj/item/weapon/wirecutters(src) + modules += new /obj/item/device/multitool(src) + modules += new /obj/item/device/lightreplacer(src) + modules += new /obj/item/weapon/gripper(src) + modules += new /obj/item/weapon/matter_decompiler(src) + modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src) + modules += new /obj/item/weapon/soap(src) + modules += new /obj/item/device/t_scanner(src) - src.emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src) + emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src) for(var/T in stacktypes) var/obj/item/stack/sheet/W = new T(src) W.amount = stacktypes[T] - src.modules += W + modules += W fix_modules() -/obj/item/weapon/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R) - var/obj/item/weapon/reagent_containers/spray/cleaner/C = locate() in src.modules +/obj/item/weapon/robot_module/drone/respawn_consumable(mob/living/silicon/robot/R) + var/obj/item/weapon/reagent_containers/spray/cleaner/C = locate() in modules C.reagents.add_reagent("cleaner", 3) - var/obj/item/device/lightreplacer/LR = locate() in src.modules + var/obj/item/device/lightreplacer/LR = locate() in modules LR.Charge(R) ..() - return - //checks whether this item is a module of the robot it is located in. /obj/item/proc/is_robot_module() - if(!istype(src.loc, /mob/living/silicon/robot)) + if(!istype(loc, /mob/living/silicon/robot)) return 0 - var/mob/living/silicon/robot/R = src.loc + var/mob/living/silicon/robot/R = loc return (src in R.module.modules)