From 08c895db65894c7d916087297724b9d32c48d520 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 25 Feb 2025 13:36:22 -0500 Subject: [PATCH] mech part repath (#7009) Tears apart the overloaded `/obj/item/mecha_parts` into a few different paths. `/obj/item/vehicle_chassis` for the base part that things attach on (this is the mech construction holder) `/obj/item/vehicle_part` for things you attach to chassis `/obj/item/vehicle_component` for integral components `/obj/item/vehicle_module` for equipment This is to prepare for further work on mecha as a system, and to get some of the massive line changes out of the way. Also: - tears apart a few files that were just too long to be handled and groups everything with their mechs - erases some code reuse --- citadel.dme | 139 +- code/__HELPERS/type_processing.dm | 8 +- code/datums/uplink/visible_weapons.dm | 2 +- .../items/circuitboards/machinery/ships.dm | 2 +- code/game/objects/items/contraband.dm | 74 +- code/game/objects/items/robot/gripper.dm | 8 +- .../shield_projector/shield_projector.dm | 2 +- code/game/objects/items/tools/weldingtool.dm | 4 +- code/game/objects/items/weapons/RCD.dm | 4 +- code/game/objects/random/misc.dm | 18 +- code/game/objects/random/underdark.dm | 18 +- .../structures/crates_lockers/largecrate.dm | 6 +- code/game/objects/structures/loot_piles.dm | 276 +- code/modules/admin/create_object.dm | 2 +- .../maps/away_missions/archive/labyrinth.dm | 12 +- .../modules/maps/overmap/space/debrisfield.dm | 12 +- code/modules/mining/mine_turfs.dm | 2 +- code/modules/mob/_modifiers/traits_phobias.dm | 2 +- .../research/designs/mechfab_designs.dm | 312 +- code/modules/vehicles/sealed/mecha/README.md | 8 + .../sealed/mecha/components/actuators.dm | 6 +- .../vehicles/sealed/mecha/components/armor.dm | 26 +- .../sealed/mecha/components/electrical.dm | 4 +- .../vehicles/sealed/mecha/components/hull.dm | 6 +- .../sealed/mecha/components/lifesupport.dm | 4 +- .../equipment/mecha_equipment_dynamicprocs.dm | 19 - .../sealed/mecha/equipment/tools/tools.dm | 2 - .../mecha/equipment/weapons/energy/energy.dm | 3 - .../modules/vehicles/sealed/mecha/mech_bay.dm | 1 - .../vehicles/sealed/mecha/mech_fabricator.dm | 4 +- .../vehicles/sealed/mecha/mech_sensor.dm | 2 +- code/modules/vehicles/sealed/mecha/mecha.dm | 136 +- .../vehicles/sealed/mecha/mecha_appearance.dm | 2 +- .../sealed/mecha/mecha_construction_paths.dm | 3723 +---------------- .../sealed/mecha/mecha_control_console.dm | 79 +- .../vehicles/sealed/mecha/mecha_parts.dm | 616 --- .../modules/vehicles/sealed/mecha/mecha_vr.dm | 3 - .../vehicles/sealed/mecha/mecha_wreckage.dm | 92 +- .../tools/armor_melee.dm | 14 +- .../tools/armor_ranged.dm | 20 +- .../tools/cable_layer.dm | 22 +- .../{equipment => modules}/tools/catapult.dm | 8 +- .../{equipment => modules}/tools/cloak.dm | 18 +- .../{equipment => modules}/tools/drill.dm | 16 +- .../tools/energy_relay.dm | 22 +- .../tools/extinguisher.dm | 10 +- .../{equipment => modules}/tools/generator.dm | 32 +- .../tools/hardpoint_actuator.dm | 8 +- .../tools/hydraulic_clamp.dm | 10 +- .../tools/inflatables.dm | 10 +- .../{equipment => modules}/tools/jetpack.dm | 24 +- .../tools/medigun_vr.dm | 2 +- .../tools/orescanner.dm | 10 +- .../{equipment => modules}/tools/passenger.dm | 24 +- .../{equipment => modules}/tools/powertool.dm | 14 +- .../mecha/{equipment => modules}/tools/rcd.dm | 14 +- .../tools/repair_droid.dm | 22 +- .../tools/running_board.dm | 6 +- .../{equipment => modules}/tools/shield.dm | 22 +- .../tools/shield_omni.dm | 18 +- .../{equipment => modules}/tools/sleeper.dm | 32 +- .../tools/speedboost.dm | 8 +- .../tools/syringe_gun.dm | 68 +- .../tools/teleporter.dm | 4 +- .../sealed/mecha/modules/tools/tools.dm | 2 + .../tools/weldinglaser.dm | 6 +- .../{equipment => modules}/tools/wormhole.dm | 4 +- .../weapons/ballistic/automatic.dm | 8 +- .../weapons/ballistic/ballistic.dm | 8 +- .../weapons/ballistic/mortar.dm | 4 +- .../weapons/ballistic/shotgun.dm | 4 +- .../weapons/defense/shocker.dm | 8 +- .../mecha/modules/weapons/energy/energy.dm | 3 + .../weapons/energy/ion.dm | 4 +- .../weapons/energy/laser.dm | 12 +- .../weapons/energy/phased.dm | 2 +- .../weapons/energy/pulse.dm | 2 +- .../weapons/energy/stun.dm | 4 +- .../weapons/explosive/grenade.dm | 18 +- .../weapons/explosive/missile.dm | 10 +- .../weapons/fire/flamethrower.dm | 4 +- .../weapons/fire/incendiary.dm | 2 +- .../{equipment => modules}/weapons/honk.dm | 8 +- .../weapons/reticent.dm | 16 +- .../{equipment => modules}/weapons/weapons.dm | 10 +- .../vehicles/sealed/mecha/subtypes/combat.dm | 10 +- .../subtypes/combat/durand-construction.dm | 323 ++ .../sealed/mecha/subtypes/combat/durand.dm | 10 +- .../sealed/mecha/subtypes/combat/fighter.dm | 335 +- .../mecha/subtypes/combat/fighter/allure.dm | 48 + .../combat/fighter/baron-construction.dm | 325 ++ .../mecha/subtypes/combat/fighter/baron.dm | 47 + .../mecha/subtypes/combat/fighter/cludge.dm | 35 + .../combat/fighter/duke-construction.dm | 325 ++ .../mecha/subtypes/combat/fighter/duke.dm | 86 + .../combat/fighter/pinnace-construction.dm | 325 ++ .../mecha/subtypes/combat/fighter/pinnace.dm | 38 + .../mecha/subtypes/combat/fighter/scoralis.dm | 33 + .../sealed/mecha/subtypes/combat/gorilla.dm | 16 +- .../subtypes/combat/gygax-construction.dm | 325 ++ .../sealed/mecha/subtypes/combat/gygax.dm | 54 +- .../combat/gygax/serenity-construction.dm | 286 ++ .../mecha/subtypes/combat/gygax/serenity.dm | 35 + .../subtypes/combat/honker-construction.dm | 325 ++ .../sealed/mecha/subtypes/combat/honker.dm | 20 +- .../sealed/mecha/subtypes/combat/marauder.dm | 28 +- .../subtypes/combat/phazon-construction.dm | 328 ++ .../sealed/mecha/subtypes/combat/phazon.dm | 89 +- .../combat/phazon/janus-construction.dm | 340 ++ .../mecha/subtypes/combat/phazon/janus.dm | 72 + .../subtypes/combat/reticent-construction.dm | 325 ++ .../sealed/mecha/subtypes/combat/reticent.dm | 18 +- .../vehicles/sealed/mecha/subtypes/medical.dm | 12 +- .../subtypes/medical/odysseus-construction.dm | 250 ++ .../sealed/mecha/subtypes/medical/odysseus.dm | 6 +- .../micro/mecha_construction_paths_vr.dm | 768 ---- .../mecha/subtypes/micro/mecha_parts_vr.dm | 143 - .../subtypes/micro/mechfab_designs_vr.dm | 66 +- .../mecha/subtypes/micro/micro_equipment.dm | 30 +- .../sealed/mecha/subtypes/micro/sec.dm | 9 + .../micro/sec/polecat-construction.dm | 318 ++ .../mecha/subtypes/micro/sec/polecat.dm | 23 + .../subtypes/micro/sec/weasel-construction.dm | 313 ++ .../sealed/mecha/subtypes/micro/sec/weasel.dm | 20 + .../sealed/mecha/subtypes/micro/security.dm | 54 - .../sealed/mecha/subtypes/micro/utility.dm | 25 +- .../micro/utility/gopher-construction.dm | 244 ++ .../mecha/subtypes/micro/utility/gopher.dm | 21 + .../vehicles/sealed/mecha/subtypes/working.dm | 2 +- .../sealed/mecha/subtypes/working/hoverpod.dm | 8 +- .../subtypes/working/ripley-construction.dm | 244 ++ .../sealed/mecha/subtypes/working/ripley.dm | 82 +- .../ripley/firefighter-construction.dm | 227 + .../subtypes/working/ripley/firefighter.dm | 15 + .../working/ripley/geiger-construction.dm | 218 + .../mecha/subtypes/working/ripley/geiger.dm | 19 + .../vehicles/sealed/mecha/vehicle_chassis.dm | 25 + .../_component.dm => vehicle_component.dm} | 26 +- .../mecha/vehicle_module-dynamicprocs.dm | 19 + .../mecha_equipment.dm => vehicle_module.dm} | 52 +- .../vehicles/sealed/mecha/vehicle_part.dm | 14 + .../sealed/mecha/vehicle_tracking_beacon.dm | 70 + code/modules/vore/fluffstuff/custom_mecha.dm | 4 +- code/modules/xenoarcheaology/boulder.dm | 2 +- maps/away_missions/140x140/carpfarm.dmm | 2 +- maps/away_missions/140x140/snow_outpost.dmm | 4 +- maps/away_missions/archive/spacebattle.dmm | 8 +- maps/endeavour/levels/deck3.dmm | 12 +- maps/minitest/levels/sector1.dmm | 2 +- maps/rift/levels/rift-04-surface1.dmm | 2 +- maps/rift/levels/rift-05-surface2.dmm | 2 +- .../piratebase_192/levels/piratebase_192.dmm | 6 +- .../class_d/Possesed_mech_cave.dmm | 2 +- .../class_h/AuxiliaryResearchFacility.dmm | 4 +- .../class_p/HeadscientistHQ.dmm | 6 +- .../level_specific/debrisfield/oldshuttle.dmm | 4 +- maps/submaps/level_specific/virgo2/Musk.dmm | 4 +- .../level_specific/virgo2/Rockybase.dmm | 18 +- maps/submaps/mountains/Scave1.dmm | 2 +- maps/submaps/mountains/cultmine.dmm | 6 +- maps/submaps/mountains/digsite.dmm | 2 +- maps/submaps/wilderness/Musk.dmm | 4 +- maps/submaps/wilderness/Rockybase.dmm | 20 +- maps/templates/admin/ert.dmm | 114 +- maps/templates/admin/kk_mercship.dmm | 22 +- maps/templates/admin/shipcave.dmm | 8 +- .../shuttles/overmaps/generic/curashuttle.dmm | 26 +- .../shuttles/overmaps/generic/ghostship.dmm | 16 +- maps/tether/levels/surface3.dmm | 2 +- maps/triumph/levels/deck4.dmm | 12 +- 170 files changed, 6953 insertions(+), 7123 deletions(-) create mode 100644 code/modules/vehicles/sealed/mecha/README.md delete mode 100644 code/modules/vehicles/sealed/mecha/equipment/mecha_equipment_dynamicprocs.dm delete mode 100644 code/modules/vehicles/sealed/mecha/equipment/tools/tools.dm delete mode 100644 code/modules/vehicles/sealed/mecha/equipment/weapons/energy/energy.dm delete mode 100644 code/modules/vehicles/sealed/mecha/mecha_parts.dm delete mode 100644 code/modules/vehicles/sealed/mecha/mecha_vr.dm rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/armor_melee.dm (74%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/armor_ranged.dm (78%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/cable_layer.dm (78%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/catapult.dm (89%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/cloak.dm (72%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/drill.dm (88%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/energy_relay.dm (74%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/extinguisher.dm (82%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/generator.dm (79%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/hardpoint_actuator.dm (79%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/hydraulic_clamp.dm (94%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/inflatables.dm (79%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/jetpack.dm (70%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/medigun_vr.dm (88%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/orescanner.dm (75%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/passenger.dm (84%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/powertool.dm (76%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/rcd.dm (74%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/repair_droid.dm (76%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/running_board.dm (75%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/shield.dm (70%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/shield_omni.dm (81%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/sleeper.dm (85%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/speedboost.dm (73%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/syringe_gun.dm (83%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/teleporter.dm (80%) create mode 100644 code/modules/vehicles/sealed/mecha/modules/tools/tools.dm rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/weldinglaser.dm (76%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/tools/wormhole.dm (89%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/ballistic/automatic.dm (87%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/ballistic/ballistic.dm (70%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/ballistic/mortar.dm (84%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/ballistic/shotgun.dm (83%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/defense/shocker.dm (67%) create mode 100644 code/modules/vehicles/sealed/mecha/modules/weapons/energy/energy.dm rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/energy/ion.dm (83%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/energy/laser.dm (86%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/energy/phased.dm (89%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/energy/pulse.dm (87%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/energy/stun.dm (81%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/explosive/grenade.dm (72%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/explosive/missile.dm (72%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/fire/flamethrower.dm (91%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/fire/incendiary.dm (92%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/honk.dm (85%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/reticent.dm (89%) rename code/modules/vehicles/sealed/mecha/{equipment => modules}/weapons/weapons.dm (88%) create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/durand-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/allure.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/baron-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/baron.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/cludge.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/duke-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/duke.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/pinnace-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/pinnace.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/fighter/scoralis.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/gygax-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/gygax/serenity-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/gygax/serenity.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/honker-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/phazon-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/phazon/janus-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/phazon/janus.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/combat/reticent-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/medical/odysseus-construction.dm delete mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/mecha_construction_paths_vr.dm delete mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/mecha_parts_vr.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/sec.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/sec/polecat-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/sec/polecat.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/sec/weasel-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/sec/weasel.dm delete mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/security.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/utility/gopher-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/micro/utility/gopher.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/working/ripley-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/working/ripley/firefighter-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/working/ripley/firefighter.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/working/ripley/geiger-construction.dm create mode 100644 code/modules/vehicles/sealed/mecha/subtypes/working/ripley/geiger.dm create mode 100644 code/modules/vehicles/sealed/mecha/vehicle_chassis.dm rename code/modules/vehicles/sealed/mecha/{components/_component.dm => vehicle_component.dm} (83%) create mode 100644 code/modules/vehicles/sealed/mecha/vehicle_module-dynamicprocs.dm rename code/modules/vehicles/sealed/mecha/{equipment/mecha_equipment.dm => vehicle_module.dm} (82%) create mode 100644 code/modules/vehicles/sealed/mecha/vehicle_part.dm create mode 100644 code/modules/vehicles/sealed/mecha/vehicle_tracking_beacon.dm diff --git a/citadel.dme b/citadel.dme index 8cd20fb10ef..4bc7bcf72bf 100644 --- a/citadel.dme +++ b/citadel.dme @@ -5260,87 +5260,116 @@ #include "code\modules\vehicles\sealed\mecha\mecha_construction_paths.dm" #include "code\modules\vehicles\sealed\mecha\mecha_control_console.dm" #include "code\modules\vehicles\sealed\mecha\mecha_helpers.dm" -#include "code\modules\vehicles\sealed\mecha\mecha_parts.dm" -#include "code\modules\vehicles\sealed\mecha\mecha_vr.dm" #include "code\modules\vehicles\sealed\mecha\mecha_wreckage.dm" -#include "code\modules\vehicles\sealed\mecha\components\_component.dm" +#include "code\modules\vehicles\sealed\mecha\vehicle_chassis.dm" +#include "code\modules\vehicles\sealed\mecha\vehicle_component.dm" +#include "code\modules\vehicles\sealed\mecha\vehicle_module-dynamicprocs.dm" +#include "code\modules\vehicles\sealed\mecha\vehicle_module.dm" +#include "code\modules\vehicles\sealed\mecha\vehicle_part.dm" +#include "code\modules\vehicles\sealed\mecha\vehicle_tracking_beacon.dm" #include "code\modules\vehicles\sealed\mecha\components\actuators.dm" #include "code\modules\vehicles\sealed\mecha\components\armor.dm" #include "code\modules\vehicles\sealed\mecha\components\electrical.dm" #include "code\modules\vehicles\sealed\mecha\components\hull.dm" #include "code\modules\vehicles\sealed\mecha\components\lifesupport.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\mecha_equipment.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\mecha_equipment_dynamicprocs.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\armor_melee.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\armor_ranged.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\cable_layer.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\catapult.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\cloak.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\drill.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\energy_relay.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\extinguisher.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\generator.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\hardpoint_actuator.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\hydraulic_clamp.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\inflatables.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\jetpack.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\medigun_vr.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\orescanner.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\passenger.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\powertool.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\rcd.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\repair_droid.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\running_board.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\shield.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\shield_omni.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\sleeper.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\speedboost.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\syringe_gun.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\teleporter.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\tools.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\weldinglaser.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\tools\wormhole.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\honk.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\reticent.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\weapons.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\automatic.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\ballistic.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\mortar.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\ballistic\shotgun.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\defense\shocker.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\energy.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\ion.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\laser.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\phased.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\pulse.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\energy\stun.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\explosive\grenade.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\explosive\missile.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\fire\flamethrower.dm" -#include "code\modules\vehicles\sealed\mecha\equipment\weapons\fire\incendiary.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\armor_melee.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\armor_ranged.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\cable_layer.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\catapult.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\cloak.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\drill.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\energy_relay.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\extinguisher.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\generator.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\hardpoint_actuator.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\hydraulic_clamp.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\inflatables.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\jetpack.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\medigun_vr.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\orescanner.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\passenger.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\powertool.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\rcd.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\repair_droid.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\running_board.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\shield.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\shield_omni.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\sleeper.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\speedboost.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\syringe_gun.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\teleporter.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\tools.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\weldinglaser.dm" +#include "code\modules\vehicles\sealed\mecha\modules\tools\wormhole.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\honk.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\reticent.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\weapons.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\automatic.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\ballistic.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\mortar.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\ballistic\shotgun.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\defense\shocker.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\energy.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\ion.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\laser.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\phased.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\pulse.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\energy\stun.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\explosive\grenade.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\explosive\missile.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\fire\flamethrower.dm" +#include "code\modules\vehicles\sealed\mecha\modules\weapons\fire\incendiary.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\medical.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\micro.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\working.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\durand-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\durand.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\gorilla.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\honker-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\honker.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\marauder.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\reticent-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\combat\reticent.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\allure.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\baron-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\baron.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\cludge.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\duke-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\duke.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\pinnace-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\pinnace.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\fighter\scoralis.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax\serenity-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\gygax\serenity.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon\janus-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\combat\phazon\janus.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\medical\odysseus-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\medical\odysseus.dm" -#include "code\modules\vehicles\sealed\mecha\subtypes\micro\mecha_construction_paths_vr.dm" -#include "code\modules\vehicles\sealed\mecha\subtypes\micro\mecha_parts_vr.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\micro\mecha_vr.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\micro\mechfab_designs_vr.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\micro\micro_equipment.dm" -#include "code\modules\vehicles\sealed\mecha\subtypes\micro\security.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\micro\utility.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\polecat-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\polecat.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\weasel-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\sec\weasel.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\utility\gopher-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\micro\utility\gopher.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\working\hoverpod.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley-construction.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley.dm" #include "code\modules\vehicles\sealed\mecha\subtypes\working\shuttle.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\firefighter-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\firefighter.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\geiger-construction.dm" +#include "code\modules\vehicles\sealed\mecha\subtypes\working\ripley\geiger.dm" #include "code\modules\vehicles_legacy\bike.dm" #include "code\modules\vehicles_legacy\cargo_train.dm" #include "code\modules\vehicles_legacy\construction.dm" diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm index fa3580ad1b6..0fbf493c134 100644 --- a/code/__HELPERS/type_processing.dm +++ b/code/__HELPERS/type_processing.dm @@ -16,8 +16,12 @@ /obj/item/reagent_containers/food = "//food", /obj/machinery/atmospherics = "//atmos", /obj/machinery/portable_atmospherics = "//port_atmos", - /obj/item/mecha_parts/mecha_equipment/weapon = "//mech_weapon", - /obj/item/mecha_parts = "//mech_part", + /obj/vehicle = "//vehicle", + /obj/item/vehicle_chassis = "//vehicle_chassis", + /obj/item/vehicle_part = "//vehicle_part", + /obj/item/vehicle_component = "//vehicle_component", + /obj/item/vehicle_module = "//vehicle_module", + /obj/item/vehicle_module/weapon = "//vehicle_weapon", /obj/item/organ = "//organ", /obj/item/gun_attachment = "//gun-attachment", /obj/item/gun_component = "//gun-component", diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 57f561477ba..4871a9d6446 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -62,7 +62,7 @@ /datum/uplink_item/item/visible_weapons/riggedlaser name = "Exosuit Rigged Laser" item_cost = 60 - path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser + path = /obj/item/vehicle_module/weapon/energy/riggedlaser /datum/uplink_item/item/visible_weapons/revolver name = "Revolver" diff --git a/code/game/objects/items/circuitboards/machinery/ships.dm b/code/game/objects/items/circuitboards/machinery/ships.dm index c533d1597f2..22e4afb5595 100644 --- a/code/game/objects/items/circuitboards/machinery/ships.dm +++ b/code/game/objects/items/circuitboards/machinery/ships.dm @@ -9,7 +9,7 @@ build_path = /obj/machinery/power/pointdefense origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2) req_components = list( - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 1, + /obj/item/vehicle_module/weapon/energy/laser = 1, /obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/manipulator = 2, ) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 52ed441d198..52b8c27982d 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -255,43 +255,43 @@ . = ..() if(.) return - var/loot = pick(/obj/item/mecha_parts/chassis/phazon, - /obj/item/mecha_parts/part/phazon_head, - /obj/item/mecha_parts/part/phazon_left_arm, - /obj/item/mecha_parts/part/phazon_left_leg, - /obj/item/mecha_parts/part/phazon_right_arm, - /obj/item/mecha_parts/part/phazon_right_leg, - /obj/item/mecha_parts/part/phazon_torso, - /obj/item/mecha_parts/part/honker_torso, - /obj/item/mecha_parts/part/honker_head, - /obj/item/mecha_parts/part/honker_left_arm, - /obj/item/mecha_parts/part/honker_left_leg, - /obj/item/mecha_parts/part/honker_right_arm, - /obj/item/mecha_parts/part/honker_right_leg, - /obj/item/mecha_parts/part/honker_armour, - /obj/item/mecha_parts/chassis/honker, - /obj/item/mecha_parts/part/reticent_torso, - /obj/item/mecha_parts/part/reticent_head, - /obj/item/mecha_parts/part/reticent_left_arm, - /obj/item/mecha_parts/part/reticent_left_leg, - /obj/item/mecha_parts/part/reticent_right_arm, - /obj/item/mecha_parts/part/reticent_right_leg, - /obj/item/mecha_parts/chassis/reticent, - /obj/item/mecha_parts/part/reticent_armour, - /obj/item/mecha_parts/part/durand_torso, - /obj/item/mecha_parts/part/durand_head, - /obj/item/mecha_parts/part/durand_left_arm, - /obj/item/mecha_parts/part/durand_left_leg, - /obj/item/mecha_parts/part/durand_right_arm, - /obj/item/mecha_parts/part/durand_right_leg, - /obj/item/mecha_parts/chassis/durand, - /obj/item/mecha_parts/part/gygax_torso, - /obj/item/mecha_parts/part/gygax_head, - /obj/item/mecha_parts/part/gygax_left_arm, - /obj/item/mecha_parts/part/gygax_left_leg, - /obj/item/mecha_parts/part/gygax_right_arm, - /obj/item/mecha_parts/part/gygax_right_leg, - /obj/item/mecha_parts/chassis/serenity) + var/loot = pick(/obj/item/vehicle_chassis/phazon, + /obj/item/vehicle_part/phazon_head, + /obj/item/vehicle_part/phazon_left_arm, + /obj/item/vehicle_part/phazon_left_leg, + /obj/item/vehicle_part/phazon_right_arm, + /obj/item/vehicle_part/phazon_right_leg, + /obj/item/vehicle_part/phazon_torso, + /obj/item/vehicle_part/honker_torso, + /obj/item/vehicle_part/honker_head, + /obj/item/vehicle_part/honker_left_arm, + /obj/item/vehicle_part/honker_left_leg, + /obj/item/vehicle_part/honker_right_arm, + /obj/item/vehicle_part/honker_right_leg, + /obj/item/vehicle_part/honker_armour, + /obj/item/vehicle_chassis/honker, + /obj/item/vehicle_part/reticent_torso, + /obj/item/vehicle_part/reticent_head, + /obj/item/vehicle_part/reticent_left_arm, + /obj/item/vehicle_part/reticent_left_leg, + /obj/item/vehicle_part/reticent_right_arm, + /obj/item/vehicle_part/reticent_right_leg, + /obj/item/vehicle_chassis/reticent, + /obj/item/vehicle_part/reticent_armour, + /obj/item/vehicle_part/durand_torso, + /obj/item/vehicle_part/durand_head, + /obj/item/vehicle_part/durand_left_arm, + /obj/item/vehicle_part/durand_left_leg, + /obj/item/vehicle_part/durand_right_arm, + /obj/item/vehicle_part/durand_right_leg, + /obj/item/vehicle_chassis/durand, + /obj/item/vehicle_part/gygax_torso, + /obj/item/vehicle_part/gygax_head, + /obj/item/vehicle_part/gygax_left_arm, + /obj/item/vehicle_part/gygax_left_leg, + /obj/item/vehicle_part/gygax_right_arm, + /obj/item/vehicle_part/gygax_right_leg, + /obj/item/vehicle_chassis/serenity) new loot(usr.drop_location()) to_chat(user, "You unwrap the package.") qdel(src) diff --git a/code/game/objects/items/robot/gripper.dm b/code/game/objects/items/robot/gripper.dm index e447ad81919..d5970b5940a 100644 --- a/code/game/objects/items/robot/gripper.dm +++ b/code/game/objects/items/robot/gripper.dm @@ -334,10 +334,10 @@ desc = "A large, heavy-duty grasping tool used in construction of mechs." can_hold = list( - /obj/item/mecha_parts/part, - /obj/item/mecha_parts/micro/part, - /obj/item/mecha_parts/mecha_equipment, - /obj/item/mecha_parts/mecha_tracking + /obj/item/vehicle_part, + /obj/item/vehicle_part/micro, + /obj/item/vehicle_module, + /obj/item/vehicle_tracking_beacon ) /obj/item/gripper/no_use/loader //This is used to disallow building with metal. diff --git a/code/game/objects/items/shield_projector/shield_projector.dm b/code/game/objects/items/shield_projector/shield_projector.dm index 8ff51ae8224..1306b2961ae 100644 --- a/code/game/objects/items/shield_projector/shield_projector.dm +++ b/code/game/objects/items/shield_projector/shield_projector.dm @@ -303,7 +303,7 @@ max_shield_health = 200 var/obj/vehicle/sealed/mecha/my_mecha = null - var/obj/item/mecha_parts/mecha_equipment/combat_shield/my_tool = null + var/obj/item/vehicle_module/combat_shield/my_tool = null /obj/item/shield_projector/line/exosuit/process() ..() diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 28e06c24b70..bc831b3bf41 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -713,7 +713,7 @@ desc = "If you're seeing this, someone did a dum-dum." /obj/item/weldingtool/electric/mounted/exosuit - var/obj/item/mecha_parts/mecha_equipment/equip_mount = null + var/obj/item/vehicle_module/equip_mount = null flame_intensity = 1 eye_safety_modifier = 2 always_process = TRUE @@ -721,7 +721,7 @@ /obj/item/weldingtool/electric/mounted/exosuit/Initialize(mapload) . = ..() - if(istype(loc, /obj/item/mecha_parts/mecha_equipment)) + if(istype(loc, /obj/item/vehicle_module)) equip_mount = loc /obj/item/weldingtool/electric/mounted/exosuit/process() diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 12eff7e01ba..1d0327170c3 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -334,8 +334,8 @@ var/obj/item/hardsuit_module/module = loc if(module.holder) // Is it attached to a HARDSUIT? return module.holder.cell - if(istype(loc, /obj/item/mecha_parts/mecha_equipment)) // In a mech. - var/obj/item/mecha_parts/mecha_equipment/ME = loc + if(istype(loc, /obj/item/vehicle_module)) // In a mech. + var/obj/item/vehicle_module/ME = loc if(ME.chassis) // Is the part attached to a mech? return ME.chassis.cell return null diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 52c53f90992..a800c3c4b89 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -1204,15 +1204,15 @@ /obj/random/multiple/mechtool/item_to_spawn() return pick( - prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill), - prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp), - prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator), - prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged), - prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid), - prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult), - prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser), - prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged), - prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill), + prob(12);list(/obj/item/vehicle_module/tool/drill), + prob(10);list(/obj/item/vehicle_module/tool/hydraulic_clamp), + prob(8);list(/obj/item/vehicle_module/generator), + prob(7);list(/obj/item/vehicle_module/weapon/ballistic/scattershot/rigged), + prob(6);list(/obj/item/vehicle_module/repair_droid), + prob(3);list(/obj/item/vehicle_module/gravcatapult), + prob(2);list(/obj/item/vehicle_module/weapon/energy/riggedlaser), + prob(2);list(/obj/item/vehicle_module/weapon/energy/flamer/rigged), + prob(1);list(/obj/item/vehicle_module/tool/drill/diamonddrill), ) //Random Bedsheet Spawner diff --git a/code/game/objects/random/underdark.dm b/code/game/objects/random/underdark.dm index 4b79d82da0c..293119bcc1b 100644 --- a/code/game/objects/random/underdark.dm +++ b/code/game/objects/random/underdark.dm @@ -174,14 +174,14 @@ /obj/random/multiple/underdark/mechtool/item_to_spawn() return pick( - prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill), - prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp), - prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator), - // prob(7);list(/obj/item/mecha_parts/mecha_equipment/ballistic/scattershot/rigged), - prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid), - prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult), - // prob(2);list(/obj/item/mecha_parts/mecha_equipment/energy/riggedlaser), - // prob(2);list(/obj/item/mecha_parts/mecha_equipment/energy/flamer/rigged), - prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill), + prob(12);list(/obj/item/vehicle_module/tool/drill), + prob(10);list(/obj/item/vehicle_module/tool/hydraulic_clamp), + prob(8);list(/obj/item/vehicle_module/generator), + // prob(7);list(/obj/item/vehicle_module/ballistic/scattershot/rigged), + prob(6);list(/obj/item/vehicle_module/repair_droid), + prob(3);list(/obj/item/vehicle_module/gravcatapult), + // prob(2);list(/obj/item/vehicle_module/energy/riggedlaser), + // prob(2);list(/obj/item/vehicle_module/energy/flamer/rigged), + prob(1);list(/obj/item/vehicle_module/tool/drill/diamonddrill), ) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 55812aecb09..5781584d8ed 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -93,12 +93,12 @@ /obj/structure/largecrate/hoverpod/attackby(obj/item/W as obj, mob/user as mob) if(W.is_crowbar()) - var/obj/item/mecha_parts/mecha_equipment/ME + var/obj/item/vehicle_module/ME var/obj/vehicle/sealed/mecha/working/hoverpod/H = new (loc) - ME = new /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp + ME = new /obj/item/vehicle_module/tool/hydraulic_clamp ME.attach(H) - ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger + ME = new /obj/item/vehicle_module/tool/passenger ME.attach(H) ..() diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index bab173378e4..741009ab4a9 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -398,13 +398,13 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/tool/screwdriver, /obj/item/tool/wirecutters, /obj/item/multitool, - /obj/item/mecha_parts/mecha_equipment/generator, - /obj/item/mecha_parts/mecha_equipment/tool/cable_layer, - /obj/item/mecha_parts/mecha_equipment/tool/drill, - /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, - /obj/item/mecha_parts/mecha_equipment/tool/passenger, - /obj/item/mecha_parts/mecha_equipment/tool/sleeper, - /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun, + /obj/item/vehicle_module/generator, + /obj/item/vehicle_module/tool/cable_layer, + /obj/item/vehicle_module/tool/drill, + /obj/item/vehicle_module/tool/hydraulic_clamp, + /obj/item/vehicle_module/tool/passenger, + /obj/item/vehicle_module/tool/sleeper, + /obj/item/vehicle_module/tool/syringe_gun, /obj/item/robot_parts/robot_component/binary_communication_device, /obj/item/robot_parts/robot_component/armour, /obj/item/robot_parts/robot_component/actuator, @@ -430,8 +430,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/borg/upgrade/advhealth, /obj/item/borg/upgrade/vtec, /obj/item/borg/upgrade/tasercooler, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, - /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill, + /obj/item/vehicle_module/weapon/energy/riggedlaser, + /obj/item/vehicle_module/tool/drill/diamonddrill, /obj/item/hardsuit_module/device/drill, /obj/item/hardsuit_module/device/plasmacutter, /obj/item/hardsuit_module/device/healthscanner, @@ -452,7 +452,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/aiModule/paladin, /obj/item/aiModule/safeguard, /obj/item/disposable_teleporter, - /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay + /obj/item/vehicle_module/tesla_energy_relay ) @@ -629,17 +629,17 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, - /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, - /obj/item/mecha_parts/mecha_equipment/tool/drill, - /obj/item/mecha_parts/mecha_equipment/generator + /obj/item/vehicle_module/weapon/energy/taser, + /obj/item/vehicle_module/weapon/energy/riggedlaser, + /obj/item/vehicle_module/tool/hydraulic_clamp, + /obj/item/vehicle_module/tool/drill, + /obj/item/vehicle_module/generator ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, - /obj/item/mecha_parts/mecha_equipment/generator/nuclear, - /obj/item/mecha_parts/mecha_equipment/tool/jetpack + /obj/item/vehicle_module/weapon/energy/laser, + /obj/item/vehicle_module/generator/nuclear, + /obj/item/vehicle_module/tool/jetpack ) //Stuff you may find attached to a ripley. @@ -656,28 +656,28 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 25}, /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, - /obj/item/mecha_parts/chassis/ripley, - /obj/item/mecha_parts/part/ripley_torso, - /obj/item/mecha_parts/part/ripley_left_arm, - /obj/item/mecha_parts/part/ripley_right_arm, - /obj/item/mecha_parts/part/ripley_left_leg, - /obj/item/mecha_parts/part/ripley_right_leg, + /obj/item/vehicle_chassis/ripley, + /obj/item/vehicle_part/ripley_torso, + /obj/item/vehicle_part/ripley_left_arm, + /obj/item/vehicle_part/ripley_right_arm, + /obj/item/vehicle_part/ripley_left_leg, + /obj/item/vehicle_part/ripley_right_leg, /obj/item/kit/paint/ripley, /obj/item/kit/paint/ripley/flames_red, /obj/item/kit/paint/ripley/flames_blue ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, - /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill, - /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, - /obj/item/mecha_parts/mecha_equipment/tool/extinguisher, + /obj/item/vehicle_module/tool/hydraulic_clamp, + /obj/item/vehicle_module/tool/drill/diamonddrill, + /obj/item/vehicle_module/antiproj_armor_booster, + /obj/item/vehicle_module/tool/extinguisher, ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/gravcatapult, - /obj/item/mecha_parts/mecha_equipment/tool/rcd, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged + /obj/item/vehicle_module/gravcatapult, + /obj/item/vehicle_module/tool/rcd, + /obj/item/vehicle_module/weapon/energy/flamer/rigged ) /obj/structure/loot_pile/mecha/ripley/firefighter @@ -702,26 +702,26 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 40}, /obj/item/stack/material/glass{amount = 20}, /obj/item/stack/material/plasteel{amount = 10}, - /obj/item/mecha_parts/chassis/ripley, - /obj/item/mecha_parts/part/ripley_torso, - /obj/item/mecha_parts/part/ripley_left_arm, - /obj/item/mecha_parts/part/ripley_right_arm, - /obj/item/mecha_parts/part/ripley_left_leg, - /obj/item/mecha_parts/part/ripley_right_leg, + /obj/item/vehicle_chassis/ripley, + /obj/item/vehicle_part/ripley_torso, + /obj/item/vehicle_part/ripley_left_arm, + /obj/item/vehicle_part/ripley_right_arm, + /obj/item/vehicle_part/ripley_left_leg, + /obj/item/vehicle_part/ripley_right_leg, /obj/random/paintkit, /obj/random/paintkit ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, - /obj/item/mecha_parts/mecha_equipment/repair_droid, - /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay + /obj/item/vehicle_module/weapon/energy/riggedlaser, + /obj/item/vehicle_module/repair_droid, + /obj/item/vehicle_module/tesla_energy_relay ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/tool/rcd, - /obj/item/mecha_parts/mecha_equipment/wormhole_generator, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged + /obj/item/vehicle_module/tool/rcd, + /obj/item/vehicle_module/wormhole_generator, + /obj/item/vehicle_module/weapon/energy/flamer/rigged ) /obj/structure/loot_pile/mecha/odysseus @@ -737,26 +737,26 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 25}, /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, - /obj/item/mecha_parts/chassis/odysseus, - /obj/item/mecha_parts/part/odysseus_head, - /obj/item/mecha_parts/part/odysseus_torso, - /obj/item/mecha_parts/part/odysseus_left_arm, - /obj/item/mecha_parts/part/odysseus_right_arm, - /obj/item/mecha_parts/part/odysseus_left_leg, - /obj/item/mecha_parts/part/odysseus_right_leg + /obj/item/vehicle_chassis/odysseus, + /obj/item/vehicle_part/odysseus_head, + /obj/item/vehicle_part/odysseus_torso, + /obj/item/vehicle_part/odysseus_left_arm, + /obj/item/vehicle_part/odysseus_right_arm, + /obj/item/vehicle_part/odysseus_left_leg, + /obj/item/vehicle_part/odysseus_right_leg ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/tool/sleeper, - /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun, - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flare, - /obj/item/mecha_parts/mecha_equipment/tool/extinguisher, + /obj/item/vehicle_module/tool/sleeper, + /obj/item/vehicle_module/tool/syringe_gun, + /obj/item/vehicle_module/weapon/ballistic/missile_rack/flare, + /obj/item/vehicle_module/tool/extinguisher, ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/gravcatapult, - /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, - /obj/item/mecha_parts/mecha_equipment/shocker + /obj/item/vehicle_module/gravcatapult, + /obj/item/vehicle_module/anticcw_armor_booster, + /obj/item/vehicle_module/shocker ) /obj/structure/loot_pile/mecha/odysseus/murdysseus @@ -780,30 +780,30 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 25}, /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, - /obj/item/mecha_parts/chassis/gygax, - /obj/item/mecha_parts/part/gygax_head, - /obj/item/mecha_parts/part/gygax_torso, - /obj/item/mecha_parts/part/gygax_left_arm, - /obj/item/mecha_parts/part/gygax_right_arm, - /obj/item/mecha_parts/part/gygax_left_leg, - /obj/item/mecha_parts/part/gygax_right_leg, - /obj/item/mecha_parts/part/gygax_armour + /obj/item/vehicle_chassis/gygax, + /obj/item/vehicle_part/gygax_head, + /obj/item/vehicle_part/gygax_torso, + /obj/item/vehicle_part/gygax_left_arm, + /obj/item/vehicle_part/gygax_right_arm, + /obj/item/vehicle_part/gygax_left_leg, + /obj/item/vehicle_part/gygax_right_leg, + /obj/item/vehicle_part/gygax_armour ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/shocker, - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, + /obj/item/vehicle_module/shocker, + /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade, + /obj/item/vehicle_module/weapon/energy/laser, + /obj/item/vehicle_module/weapon/energy/taser, /obj/random/paintkit/gygax, /obj/random/paintkit/gygax ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, - /obj/item/mecha_parts/mecha_equipment/repair_droid, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy + /obj/item/vehicle_module/tesla_energy_relay, + /obj/item/vehicle_module/weapon/ballistic/lmg, + /obj/item/vehicle_module/repair_droid, + /obj/item/vehicle_module/weapon/energy/laser/heavy ) /obj/structure/loot_pile/mecha/gygax/dark @@ -835,30 +835,30 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 25}, /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, - /obj/item/mecha_parts/chassis/durand, - /obj/item/mecha_parts/part/durand_head, - /obj/item/mecha_parts/part/durand_torso, - /obj/item/mecha_parts/part/durand_left_arm, - /obj/item/mecha_parts/part/durand_right_arm, - /obj/item/mecha_parts/part/durand_left_leg, - /obj/item/mecha_parts/part/durand_right_leg, - /obj/item/mecha_parts/part/durand_armour + /obj/item/vehicle_chassis/durand, + /obj/item/vehicle_part/durand_head, + /obj/item/vehicle_part/durand_torso, + /obj/item/vehicle_part/durand_left_arm, + /obj/item/vehicle_part/durand_right_arm, + /obj/item/vehicle_part/durand_left_leg, + /obj/item/vehicle_part/durand_right_leg, + /obj/item/vehicle_part/durand_armour ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/shocker, - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, - /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, + /obj/item/vehicle_module/shocker, + /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade, + /obj/item/vehicle_module/weapon/energy/laser, + /obj/item/vehicle_module/antiproj_armor_booster, /obj/random/paintkit/durand, /obj/random/paintkit/durand ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot, - /obj/item/mecha_parts/mecha_equipment/repair_droid, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy + /obj/item/vehicle_module/tesla_energy_relay, + /obj/item/vehicle_module/weapon/ballistic/scattershot, + /obj/item/vehicle_module/repair_droid, + /obj/item/vehicle_module/weapon/energy/laser/heavy ) /obj/structure/loot_pile/mecha/marauder @@ -886,27 +886,27 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/storage/toolbox/syndicate/powertools, /obj/item/stack/material/plasteel{amount = 20}, /obj/item/stack/material/durasteel{amount = 10}, - /obj/item/mecha_parts/chassis/phazon, - /obj/item/mecha_parts/part/phazon_head, - /obj/item/mecha_parts/part/phazon_torso, - /obj/item/mecha_parts/part/phazon_left_arm, - /obj/item/mecha_parts/part/phazon_right_arm, - /obj/item/mecha_parts/part/phazon_left_leg, - /obj/item/mecha_parts/part/phazon_right_leg + /obj/item/vehicle_chassis/phazon, + /obj/item/vehicle_part/phazon_head, + /obj/item/vehicle_part/phazon_torso, + /obj/item/vehicle_part/phazon_left_arm, + /obj/item/vehicle_part/phazon_right_arm, + /obj/item/vehicle_part/phazon_left_leg, + /obj/item/vehicle_part/phazon_right_leg ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/shocker, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy, - /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster + /obj/item/vehicle_module/shocker, + /obj/item/vehicle_module/weapon/energy/flamer/rigged, + /obj/item/vehicle_module/weapon/energy/laser/heavy, + /obj/item/vehicle_module/antiproj_armor_booster ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, - /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion, - /obj/item/mecha_parts/mecha_equipment/repair_droid, - /obj/item/mecha_parts/mecha_equipment/teleporter + /obj/item/vehicle_module/tesla_energy_relay, + /obj/item/vehicle_module/weapon/energy/ion, + /obj/item/vehicle_module/repair_droid, + /obj/item/vehicle_module/teleporter ) /obj/structure/loot_pile/mecha/honker @@ -923,24 +923,24 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, /obj/item/bikehorn, - /obj/item/mecha_parts/chassis/honker, - /obj/item/mecha_parts/part/honker_head, - /obj/item/mecha_parts/part/honker_torso, - /obj/item/mecha_parts/part/honker_left_arm, - /obj/item/mecha_parts/part/honker_right_arm, - /obj/item/mecha_parts/part/honker_left_leg, - /obj/item/mecha_parts/part/honker_right_leg + /obj/item/vehicle_chassis/honker, + /obj/item/vehicle_part/honker_head, + /obj/item/vehicle_part/honker_torso, + /obj/item/vehicle_part/honker_left_arm, + /obj/item/vehicle_part/honker_right_arm, + /obj/item/vehicle_part/honker_left_leg, + /obj/item/vehicle_part/honker_right_leg ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/banana, - /obj/item/mecha_parts/mecha_equipment/weapon/honker, - /obj/item/mecha_parts/part/honker_armour + /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/banana, + /obj/item/vehicle_module/weapon/honker, + /obj/item/vehicle_part/honker_armour ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay, - /obj/item/mecha_parts/mecha_equipment/repair_droid + /obj/item/vehicle_module/tesla_energy_relay, + /obj/item/vehicle_module/repair_droid ) /obj/structure/loot_pile/mecha/honker/cluwne @@ -961,24 +961,24 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/stack/material/steel{amount = 25}, /obj/item/stack/material/glass{amount = 10}, /obj/item/stack/material/plasteel{amount = 5}, - /obj/item/mecha_parts/chassis/reticent, - /obj/item/mecha_parts/part/reticent_head, - /obj/item/mecha_parts/part/reticent_torso, - /obj/item/mecha_parts/part/reticent_left_arm, - /obj/item/mecha_parts/part/reticent_right_arm, - /obj/item/mecha_parts/part/reticent_left_leg, - /obj/item/mecha_parts/part/reticent_right_leg + /obj/item/vehicle_chassis/reticent, + /obj/item/vehicle_part/reticent_head, + /obj/item/vehicle_part/reticent_torso, + /obj/item/vehicle_part/reticent_left_arm, + /obj/item/vehicle_part/reticent_right_arm, + /obj/item/vehicle_part/reticent_left_leg, + /obj/item/vehicle_part/reticent_right_leg ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/whisperblade, - /obj/item/mecha_parts/mecha_equipment/weapon/infernoblade, - /obj/item/mecha_parts/part/reticent_armour + /obj/item/vehicle_module/weapon/whisperblade, + /obj/item/vehicle_module/weapon/infernoblade, + /obj/item/vehicle_part/reticent_armour ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/combat_shield/reticent, - /obj/item/mecha_parts/mecha_equipment/cloak + /obj/item/vehicle_module/combat_shield/reticent, + /obj/item/vehicle_module/cloak ) /obj/structure/loot_pile/mecha/reticent/reticence @@ -1013,13 +1013,13 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/rigged, - /obj/item/mecha_parts/mecha_equipment/generator + /obj/item/vehicle_module/weapon/ballistic/lmg/rigged, + /obj/item/vehicle_module/generator ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, - /obj/item/mecha_parts/mecha_equipment/generator/nuclear + /obj/item/vehicle_module/weapon/ballistic/lmg, + /obj/item/vehicle_module/generator/nuclear ) /obj/structure/loot_pile/mecha/mouse_tank/livewire @@ -1048,13 +1048,13 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) uncommon_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged, - /obj/item/mecha_parts/mecha_equipment/tool/extinguisher + /obj/item/vehicle_module/weapon/energy/flamer/rigged, + /obj/item/vehicle_module/tool/extinguisher ) rare_loot = list( - /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer, - /obj/item/mecha_parts/mecha_equipment/generator + /obj/item/vehicle_module/weapon/energy/flamer, + /obj/item/vehicle_module/generator ) /obj/structure/loot_pile/mecha/mouse_tank/eraticator @@ -1085,12 +1085,12 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh uncommon_loot = list( /obj/item/ammo_magazine/a75, - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar + /obj/item/vehicle_module/weapon/ballistic/mortar ) rare_loot = list( /obj/item/gun/projectile/ballistic/gyropistol, - /obj/item/mecha_parts/mecha_equipment/generator/nuclear + /obj/item/vehicle_module/generator/nuclear ) //Drone loot diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index cc38ccb228e..69b9237a405 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -15,7 +15,7 @@ var/quick_create_object_html = null var/pathtext = null - pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item","/obj/item","/obj/item/gun","/obj/item/reagent_containers","/obj/item/reagent_containers/food","/obj/item/clothing","/obj/machinery","/obj/vehicle/sealed/mecha","/obj/item/mecha_parts/part","/obj/vehicle/sealed/mecha_parts/mecha_equipement","/obj/item/storage/box/fluff") + pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item","/obj/item","/obj/item/gun","/obj/item/reagent_containers","/obj/item/reagent_containers/food","/obj/item/clothing","/obj/machinery","/obj/vehicle/sealed/mecha","/obj/item/vehicle_part","/obj/vehicle/sealed/mecha_parts/mecha_equipement","/obj/item/storage/box/fluff") if(!pathtext) return var path = text2path(pathtext) diff --git a/code/modules/maps/away_missions/archive/labyrinth.dm b/code/modules/maps/away_missions/archive/labyrinth.dm index a8ccec8b675..ba50e8995bb 100644 --- a/code/modules/maps/away_missions/archive/labyrinth.dm +++ b/code/modules/maps/away_missions/archive/labyrinth.dm @@ -117,16 +117,16 @@ /obj/vehicle/sealed/mecha/combat/honker/cluwne/Initialize(mapload) . = ..() - var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse + var/obj/item/vehicle_module/ME = new /obj/item/vehicle_module/weapon/energy/pulse ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive + ME = new /obj/item/vehicle_module/weapon/ballistic/missile_rack/explosive ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar + ME = new /obj/item/vehicle_module/weapon/ballistic/missile_rack/banana_mortar ME.attach(src) - ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker + ME = new /obj/item/vehicle_module/weapon/honker ME.attach(src) -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar +/obj/item/vehicle_module/weapon/ballistic/missile_rack/banana_mortar name = "Banana Mortar" icon = 'icons/mecha/mecha_equipment_vr.dmi' icon_state = "mecha_bananamrtr" @@ -142,7 +142,7 @@ return 0 return ..() -/obj/item/mecha_parts/mecha_equipment/weapon/honker +/obj/item/vehicle_module/weapon/honker name = "\improper HoNkER BlAsT 5000" icon = 'icons/mecha/mecha_equipment_vr.dmi' icon_state = "mecha_honker" diff --git a/code/modules/maps/overmap/space/debrisfield.dm b/code/modules/maps/overmap/space/debrisfield.dm index 20cb0ca15ce..2d05d6f8836 100644 --- a/code/modules/maps/overmap/space/debrisfield.dm +++ b/code/modules/maps/overmap/space/debrisfield.dm @@ -213,11 +213,11 @@ /obj/vehicle/sealed/mecha/combat/fighter/baron/loaded/busted /* starting_components = list( - /obj/item/mecha_parts/component/hull/lightweight, - /obj/item/mecha_parts/component/actuator/hispeed, - /obj/item/mecha_parts/component/armor, - /obj/item/mecha_parts/component/gas, - /obj/item/mecha_parts/component/electrical/high_current + /obj/item/vehicle_component/hull/lightweight, + /obj/item/vehicle_component/actuator/hispeed, + /obj/item/vehicle_component/armor, + /obj/item/vehicle_component/gas, + /obj/item/vehicle_component/electrical/high_current ) /obj/vehicle/sealed/mecha/combat/fighter/baron/loaded/busted/Initialize(mapload) @@ -225,7 +225,7 @@ health = round(rand(50,120)) cell?.charge = 0 for(var/slot in internal_components) - var/obj/item/mecha_parts/component/comp = internal_components[slot] + var/obj/item/vehicle_component/comp = internal_components[slot] if(!istype(comp)) continue comp.adjust_integrity_mecha(-(round(rand(comp.integrity_max - 10, 0)))) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index b08fd6779c1..6129449a06f 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -305,7 +305,7 @@ CREATE_STANDARD_TURFS(/turf/simulated/mineral/icerock/floor/ignore_cavegen) else if(istype(AM,/obj/vehicle/sealed/mecha)) var/obj/vehicle/sealed/mecha/M = AM - if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill)) + if(istype(M.selected,/obj/item/vehicle_module/tool/drill)) M.selected.action(src) /turf/simulated/mineral/proc/MineralSpread() diff --git a/code/modules/mob/_modifiers/traits_phobias.dm b/code/modules/mob/_modifiers/traits_phobias.dm index 46bc48eaad7..1c1e4e85c8a 100644 --- a/code/modules/mob/_modifiers/traits_phobias.dm +++ b/code/modules/mob/_modifiers/traits_phobias.dm @@ -513,7 +513,7 @@ if(istype(thing, /obj/item/storage/box/syringes)) fear_amount += 2 - if(istype(thing, /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun)) + if(istype(thing, /obj/item/vehicle_module/tool/syringe_gun)) fear_amount += 8 //Syringe gun for a big ass mech. if(istype(thing, /obj/machinery/sleep_console)) //Sleepers got them needles in them. diff --git a/code/modules/research/designs/mechfab_designs.dm b/code/modules/research/designs/mechfab_designs.dm index 8e1478edd3c..b0bd5233d33 100644 --- a/code/modules/research/designs/mechfab_designs.dm +++ b/code/modules/research/designs/mechfab_designs.dm @@ -12,59 +12,59 @@ /datum/prototype/design/science/mechfab/ripley/chassis design_name = "Ripley Chassis" id = "ripley_chassis" - build_path = /obj/item/mecha_parts/chassis/ripley + build_path = /obj/item/vehicle_chassis/ripley work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 15000) /datum/prototype/design/science/mechfab/ripley/chassis/firefighter design_name = "Firefigher Chassis" id = "firefighter_chassis" - build_path = /obj/item/mecha_parts/chassis/firefighter + build_path = /obj/item/vehicle_chassis/firefighter /datum/prototype/design/science/mechfab/ripley/chassis/geiger design_name = "Geiger Chassis" id = "geiger_chassis" - build_path = /obj/item/mecha_parts/chassis/geiger + build_path = /obj/item/vehicle_chassis/geiger /datum/prototype/design/science/mechfab/ripley/torso design_name = "Ripley Torso" id = "ripley_torso" - build_path = /obj/item/mecha_parts/part/ripley_torso + build_path = /obj/item/vehicle_part/ripley_torso work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_GLASS = 11250) /datum/prototype/design/science/mechfab/ripley/torso/geiger design_name = "Geiger Torso" id = "geiger_torso" - build_path = /obj/item/mecha_parts/part/geiger_torso + build_path = /obj/item/vehicle_part/geiger_torso work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 25000, MAT_GLASS = 10000) /datum/prototype/design/science/mechfab/ripley/left_arm design_name = "Ripley Left Arm" id = "ripley_left_arm" - build_path = /obj/item/mecha_parts/part/ripley_left_arm + build_path = /obj/item/vehicle_part/ripley_left_arm work = (15 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/ripley/right_arm design_name = "Ripley Right Arm" id = "ripley_right_arm" - build_path = /obj/item/mecha_parts/part/ripley_right_arm + build_path = /obj/item/vehicle_part/ripley_right_arm work = (15 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/ripley/left_leg design_name = "Ripley Left Leg" id = "ripley_left_leg" - build_path = /obj/item/mecha_parts/part/ripley_left_leg + build_path = /obj/item/vehicle_part/ripley_left_leg work = (15 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500) /datum/prototype/design/science/mechfab/ripley/right_leg design_name = "Ripley Right Leg" id = "ripley_right_leg" - build_path = /obj/item/mecha_parts/part/ripley_right_leg + build_path = /obj/item/vehicle_part/ripley_right_leg work = (15 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500) @@ -75,49 +75,49 @@ /datum/prototype/design/science/mechfab/odysseus/chassis design_name = "Odysseus Chassis" id = "odysseus_chassis" - build_path = /obj/item/mecha_parts/chassis/odysseus + build_path = /obj/item/vehicle_chassis/odysseus work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 15000) /datum/prototype/design/science/mechfab/odysseus/torso design_name = "Odysseus Torso" id = "odysseus_torso" - build_path = /obj/item/mecha_parts/part/odysseus_torso + build_path = /obj/item/vehicle_part/odysseus_torso work = (18 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/odysseus/head design_name = "Odysseus Head" id = "odysseus_head" - build_path = /obj/item/mecha_parts/part/odysseus_head + build_path = /obj/item/vehicle_part/odysseus_head work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 1500, MAT_GLASS = 7500) /datum/prototype/design/science/mechfab/odysseus/left_arm design_name = "Odysseus Left Arm" id = "odysseus_left_arm" - build_path = /obj/item/mecha_parts/part/odysseus_left_arm + build_path = /obj/item/vehicle_part/odysseus_left_arm work = (12 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 7500) /datum/prototype/design/science/mechfab/odysseus/right_arm design_name = "Odysseus Right Arm" id = "odysseus_right_arm" - build_path = /obj/item/mecha_parts/part/odysseus_right_arm + build_path = /obj/item/vehicle_part/odysseus_right_arm work = (12 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 7500) /datum/prototype/design/science/mechfab/odysseus/left_leg design_name = "Odysseus Left Leg" id = "odysseus_left_leg" - build_path = /obj/item/mecha_parts/part/odysseus_left_leg + build_path = /obj/item/vehicle_part/odysseus_left_leg work = (13 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 11250) /datum/prototype/design/science/mechfab/odysseus/right_leg design_name = "Odysseus Right Leg" id = "odysseus_right_leg" - build_path = /obj/item/mecha_parts/part/odysseus_right_leg + build_path = /obj/item/vehicle_part/odysseus_right_leg work = (13 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 11250) @@ -128,62 +128,62 @@ /datum/prototype/design/science/mechfab/gygax/chassis/serenity design_name = "Serenity Chassis" id = "serenity_chassis" - build_path = /obj/item/mecha_parts/chassis/serenity + build_path = /obj/item/vehicle_chassis/serenity materials_base = list(MAT_STEEL = 18750, MAT_PHORON = 4000) /datum/prototype/design/science/mechfab/gygax/chassis design_name = "Gygax Chassis" id = "gygax_chassis" - build_path = /obj/item/mecha_parts/chassis/gygax + build_path = /obj/item/vehicle_chassis/gygax work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/gygax/torso design_name = "Gygax Torso" id = "gygax_torso" - build_path = /obj/item/mecha_parts/part/gygax_torso + build_path = /obj/item/vehicle_part/gygax_torso work = (30 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 15000) /datum/prototype/design/science/mechfab/gygax/head design_name = "Gygax Head" id = "gygax_head" - build_path = /obj/item/mecha_parts/part/gygax_head + build_path = /obj/item/vehicle_part/gygax_head work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 15000, MAT_GLASS = 7500) /datum/prototype/design/science/mechfab/gygax/left_arm design_name = "Gygax Left Arm" id = "gygax_left_arm" - build_path = /obj/item/mecha_parts/part/gygax_left_arm + build_path = /obj/item/vehicle_part/gygax_left_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500) /datum/prototype/design/science/mechfab/gygax/right_arm design_name = "Gygax Right Arm" id = "gygax_right_arm" - build_path = /obj/item/mecha_parts/part/gygax_right_arm + build_path = /obj/item/vehicle_part/gygax_right_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500) /datum/prototype/design/science/mechfab/gygax/left_leg design_name = "Gygax Left Leg" id = "gygax_left_leg" - build_path = /obj/item/mecha_parts/part/gygax_left_leg + build_path = /obj/item/vehicle_part/gygax_left_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250) /datum/prototype/design/science/mechfab/gygax/right_leg design_name = "Gygax Right Leg" id = "gygax_right_leg" - build_path = /obj/item/mecha_parts/part/gygax_right_leg + build_path = /obj/item/vehicle_part/gygax_right_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250) /datum/prototype/design/science/mechfab/gygax/armour design_name = "Gygax Armour Plates" id = "gygax_armour" - build_path = /obj/item/mecha_parts/part/gygax_armour + build_path = /obj/item/vehicle_part/gygax_armour work = (60 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_DIAMOND = 7500) @@ -194,56 +194,56 @@ /datum/prototype/design/science/mechfab/durand/chassis design_name = "Durand Chassis" id = "durand_chassis" - build_path = /obj/item/mecha_parts/chassis/durand + build_path = /obj/item/vehicle_chassis/durand work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/durand/torso design_name = "Durand Torso" id = "durand_torso" - build_path = /obj/item/mecha_parts/part/durand_torso + build_path = /obj/item/vehicle_part/durand_torso work = (30 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 41250, MAT_GLASS = 15000, MAT_SILVER = 7500) /datum/prototype/design/science/mechfab/durand/head design_name = "Durand Head" id = "durand_head" - build_path = /obj/item/mecha_parts/part/durand_head + build_path = /obj/item/vehicle_part/durand_head work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750, MAT_GLASS = 7500, MAT_SILVER = 2250) /datum/prototype/design/science/mechfab/durand/left_arm design_name = "Durand Left Arm" id = "durand_left_arm" - build_path = /obj/item/mecha_parts/part/durand_left_arm + build_path = /obj/item/vehicle_part/durand_left_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250, MAT_SILVER = 2250) /datum/prototype/design/science/mechfab/durand/right_arm design_name = "Durand Right Arm" id = "durand_right_arm" - build_path = /obj/item/mecha_parts/part/durand_right_arm + build_path = /obj/item/vehicle_part/durand_right_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250, MAT_SILVER = 2250) /datum/prototype/design/science/mechfab/durand/left_leg design_name = "Durand Left Leg" id = "durand_left_leg" - build_path = /obj/item/mecha_parts/part/durand_left_leg + build_path = /obj/item/vehicle_part/durand_left_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_SILVER = 2250) /datum/prototype/design/science/mechfab/durand/right_leg design_name = "Durand Right Leg" id = "durand_right_leg" - build_path = /obj/item/mecha_parts/part/durand_right_leg + build_path = /obj/item/vehicle_part/durand_right_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_SILVER = 2250) /datum/prototype/design/science/mechfab/durand/armour design_name = "Durand Armour Plates" id = "durand_armour" - build_path = /obj/item/mecha_parts/part/durand_armour + build_path = /obj/item/vehicle_part/durand_armour work = (60 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_URANIUM = 7500) @@ -255,7 +255,7 @@ /datum/prototype/design/science/mechfab/janus/chassis design_name = "Janus Chassis" id = "janus_chassis" - build_path = /obj/item/mecha_parts/chassis/janus + build_path = /obj/item/vehicle_chassis/janus work = (100 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_DURASTEEL = 19000, MAT_MORPHIUM = 10500, MAT_PLASTEEL = 5500, MAT_LEAD = 2500) req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 3) @@ -263,42 +263,42 @@ /datum/prototype/design/science/mechfab/janus/torso design_name = "Imperion Torso" id = "janus_torso" - build_path = /obj/item/mecha_parts/part/janus_torso + build_path = /obj/item/vehicle_part/janus_torso work = (300 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_DURASTEEL = 8000, MAT_MORPHIUM = 10000, MAT_GOLD = 5000, MAT_VERDANTIUM = 5000) /datum/prototype/design/science/mechfab/janus/head design_name = "Imperion Head" id = "janus_head" - build_path = /obj/item/mecha_parts/part/janus_head + build_path = /obj/item/vehicle_part/janus_head work = (200 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 6000, MAT_GOLD = 5000) /datum/prototype/design/science/mechfab/janus/left_arm design_name = "Prototype Gygax Left Arm" id = "janus_left_arm" - build_path = /obj/item/mecha_parts/part/janus_left_arm + build_path = /obj/item/vehicle_part/janus_left_arm work = (200 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_DIAMOND = 7000) /datum/prototype/design/science/mechfab/janus/right_arm design_name = "Prototype Gygax Right Arm" id = "janus_right_arm" - build_path = /obj/item/mecha_parts/part/janus_right_arm + build_path = /obj/item/vehicle_part/janus_right_arm work = (200 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_DIAMOND = 7000) /datum/prototype/design/science/mechfab/janus/left_leg design_name = "Prototype Durand Left Leg" id = "janus_left_leg" - build_path = /obj/item/mecha_parts/part/janus_left_leg + build_path = /obj/item/vehicle_part/janus_left_leg work = (200 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_URANIUM = 7000) /datum/prototype/design/science/mechfab/janus/right_leg design_name = "Prototype Durand Right Leg" id = "janus_right_leg" - build_path = /obj/item/mecha_parts/part/janus_right_leg + build_path = /obj/item/vehicle_part/janus_right_leg work = (200 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 30000, MAT_METALHYDROGEN = 3000, MAT_DURASTEEL = 2000, MAT_MORPHIUM = 3000, MAT_GOLD = 5000, MAT_URANIUM = 7000) @@ -316,56 +316,56 @@ /datum/prototype/design/science/mechfab/honker/chassis design_name = "H.O.N.K. Chassis" id = "honker_chassis" - build_path = /obj/item/mecha_parts/chassis/honker + build_path = /obj/item/vehicle_chassis/honker work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/honker/torso design_name = "H.O.N.K. Torso" id = "honker_torso" - build_path = /obj/item/mecha_parts/part/honker_torso + build_path = /obj/item/vehicle_part/honker_torso work = (30 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_PLASTIC = 10000) /datum/prototype/design/science/mechfab/honker/head design_name = "H.O.N.K. Head" id = "honker_head" - build_path = /obj/item/mecha_parts/part/honker_head + build_path = /obj/item/vehicle_part/honker_head work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 15000, MAT_GLASS = 7500, MAT_PLASTIC = 5000) /datum/prototype/design/science/mechfab/honker/left_arm design_name = "H.O.N.K. Left Arm" id = "honker_left_arm" - build_path = /obj/item/mecha_parts/part/honker_left_arm + build_path = /obj/item/vehicle_part/honker_left_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500, MAT_PLASTIC = 12000) /datum/prototype/design/science/mechfab/honker/right_arm design_name = "H.O.N.K. Right Arm" id = "honker_right_arm" - build_path = /obj/item/mecha_parts/part/honker_right_arm + build_path = /obj/item/vehicle_part/honker_right_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500, MAT_PLASTIC = 12000) /datum/prototype/design/science/mechfab/honker/left_leg design_name = "H.O.N.K. Left Leg" id = "honker_left_leg" - build_path = /obj/item/mecha_parts/part/honker_left_leg + build_path = /obj/item/vehicle_part/honker_left_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250, MAT_PLASTIC = 15000) /datum/prototype/design/science/mechfab/honker/right_leg design_name = "H.O.N.K. Right Leg" id = "honker_right_leg" - build_path = /obj/item/mecha_parts/part/honker_right_leg + build_path = /obj/item/vehicle_part/honker_right_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250, MAT_PLASTIC = 15000) /datum/prototype/design/science/mechfab/honker/armour design_name = "H.O.N.K. Armour Plates" id = "honker_armour" - build_path = /obj/item/mecha_parts/part/honker_armour + build_path = /obj/item/vehicle_part/honker_armour work = (60 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_DIAMOND = 7500, MAT_PLASTIC = 5000, MAT_BANANIUM = 20000) @@ -376,56 +376,56 @@ /datum/prototype/design/science/mechfab/reticent/chassis design_name = "Reticent Chassis" id = "reticent_chassis" - build_path = /obj/item/mecha_parts/chassis/reticent + build_path = /obj/item/vehicle_chassis/reticent work = (10 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 18750) /datum/prototype/design/science/mechfab/reticent/torso design_name = "Reticent Torso" id = "reticent_torso" - build_path = /obj/item/mecha_parts/part/reticent_torso + build_path = /obj/item/vehicle_part/reticent_torso work = (30 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_OSMIUM = 5000) /datum/prototype/design/science/mechfab/reticent/head design_name = "Reticent Head" id = "reticent_head" - build_path = /obj/item/mecha_parts/part/reticent_head + build_path = /obj/item/vehicle_part/reticent_head work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 15000, MAT_GLASS = 7500, MAT_OSMIUM = 5000) /datum/prototype/design/science/mechfab/reticent/left_arm design_name = "Reticent Left Arm" id = "reticent_left_arm" - build_path = /obj/item/mecha_parts/part/reticent_left_arm + build_path = /obj/item/vehicle_part/reticent_left_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500, MAT_PLASTIC = 12000) /datum/prototype/design/science/mechfab/reticent/right_arm design_name = "Reticent Right Arm" id = "reticent_right_arm" - build_path = /obj/item/mecha_parts/part/reticent_right_arm + build_path = /obj/item/vehicle_part/reticent_right_arm work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 22500, MAT_PLASTIC = 12000) /datum/prototype/design/science/mechfab/reticent/left_leg design_name = "Reticent Left Leg" id = "reticent_left_leg" - build_path = /obj/item/mecha_parts/part/reticent_left_leg + build_path = /obj/item/vehicle_part/reticent_left_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250, MAT_PLASTIC = 15000) /datum/prototype/design/science/mechfab/reticent/right_leg design_name = "Reticent Right Leg" id = "reticent_right_leg" - build_path = /obj/item/mecha_parts/part/reticent_right_leg + build_path = /obj/item/vehicle_part/reticent_right_leg work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 26250, MAT_PLASTIC = 15000) /datum/prototype/design/science/mechfab/reticent/armour design_name = "Reticent Armour Plates" id = "reticent_armour" - build_path = /obj/item/mecha_parts/part/reticent_armour + build_path = /obj/item/vehicle_part/reticent_armour work = (60 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 37500, MAT_OSMIUM = 7500, MAT_PLASTIC = 5000, MAT_SILENCIUM = 20000) @@ -444,93 +444,93 @@ id = "mech_tracker" work = (5 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 375) - build_path = /obj/item/mecha_parts/mecha_tracking + build_path = /obj/item/vehicle_tracking_beacon /datum/prototype/design/science/mecha/hydraulic_clamp design_name = "Hydraulic Clamp" id = "hydraulic_clamp" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp + build_path = /obj/item/vehicle_module/tool/hydraulic_clamp /datum/prototype/design/science/mecha/drill design_name = "Drill" id = "mech_drill" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill + build_path = /obj/item/vehicle_module/tool/drill /datum/prototype/design/science/mecha/extinguisher design_name = "Extinguisher" id = "extinguisher" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/extinguisher + build_path = /obj/item/vehicle_module/tool/extinguisher /datum/prototype/design/science/mecha/cable_layer design_name = "Cable Layer" id = "mech_cable_layer" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer + build_path = /obj/item/vehicle_module/tool/cable_layer materials_base = list(MAT_STEEL = 7500, MAT_PLASTIC = 1000) /datum/prototype/design/science/mecha/flaregun design_name = "Flare Launcher" id = "mecha_flare_gun" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flare + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/flare materials_base = list(MAT_STEEL = 9375) /datum/prototype/design/science/mecha/sleeper design_name = "Sleeper" id = "mech_sleeper" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper + build_path = /obj/item/vehicle_module/tool/sleeper materials_base = list(MAT_STEEL = 3750, MAT_GLASS = 7500) /datum/prototype/design/science/mecha/syringe_gun design_name = "Syringe Gun" id = "mech_syringe_gun" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun + build_path = /obj/item/vehicle_module/tool/syringe_gun work = (20 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 2250, MAT_GLASS = 1500) /datum/prototype/design/science/mecha/passenger design_name = "Passenger Compartment" id = "mech_passenger" - build_path = /obj/item/mecha_parts/mecha_equipment/tool/passenger + build_path = /obj/item/vehicle_module/tool/passenger materials_base = list(MAT_STEEL = 3750, MAT_GLASS = 3750) /datum/prototype/design/science/mecha/taser design_name = "PBT \"Pacifier\" Mounted Taser" id = "mech_taser" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser + build_path = /obj/item/vehicle_module/weapon/energy/taser /datum/prototype/design/science/mecha/rigged_taser design_name = "Jury-Rigged Taser" id = "mech_taser-r" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser/rigged + build_path = /obj/item/vehicle_module/weapon/energy/taser/rigged /datum/prototype/design/science/mecha/shocker design_name = "Exosuit Electrifier" desc = "A device to electrify the external portions of a mecha in order to increase its defensive capabilities." id = "mech_shocker" req_tech = list(TECH_COMBAT = 3, TECH_POWER = 6, TECH_MAGNET = 1) - build_path = /obj/item/mecha_parts/mecha_equipment/shocker + build_path = /obj/item/vehicle_module/shocker materials_base = list(MAT_STEEL = 3500, MAT_GOLD = 750, MAT_GLASS = 1000) /datum/prototype/design/science/mecha/lmg design_name = "Ultra AC 2" id = "mech_lmg" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg + build_path = /obj/item/vehicle_module/weapon/ballistic/lmg /datum/prototype/design/science/mecha/lmg_heavy design_name = "AC 10" id = "mech_lmg_heavy" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg_heavy + build_path = /obj/item/vehicle_module/weapon/ballistic/lmg_heavy materials_base = list(MAT_STEEL = 12000, MAT_GLASS = 4000, MAT_PLASTIC = 3000, MAT_SILVER = 1500, MAT_COPPER = 4000) /datum/prototype/design/science/mecha/gauss_rifle design_name = "Gauss Rifle" id = "mech_gauss_rifle" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gauss_rifle + build_path = /obj/item/vehicle_module/weapon/ballistic/gauss_rifle materials_base = list(MAT_STEEL = 16000, MAT_GLASS = 8000, MAT_PLASTIC = 4000, MAT_SILVER = 3500, MAT_COPPER = 8000) /datum/prototype/design/science/mecha/rigged_lmg design_name = "Jury-Rigged Machinegun" id = "mech_lmg-r" - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/rigged + build_path = /obj/item/vehicle_module/weapon/ballistic/lmg/rigged /datum/prototype/design/science/mecha/weapon abstract_type = /datum/prototype/design/science/mecha/weapon @@ -542,21 +542,21 @@ design_name = "LBX AC 10 \"Scattershot\"" id = "mech_scattershot" req_tech = list(TECH_COMBAT = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot + build_path = /obj/item/vehicle_module/weapon/ballistic/scattershot materials_base = list(MAT_STEEL = 8000, MAT_GLASS = 3000, MAT_PLASTIC = 2000, MAT_SILVER = 2500) /datum/prototype/design/science/mecha/weapon/rigged_scattershot design_name = "Jury-Rigged Shrapnel Cannon" id = "mech_scattershot-r" req_tech = list(TECH_COMBAT = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged + build_path = /obj/item/vehicle_module/weapon/ballistic/scattershot/rigged materials_base = list(MAT_STEEL = 7000, MAT_GLASS = 2000, MAT_PLASTIC = 2000, MAT_SILVER = 2000) /datum/prototype/design/science/mecha/weapon/laser design_name = "CH-PS \"Immolator\" Laser" id = "mech_laser" req_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser + build_path = /obj/item/vehicle_module/weapon/energy/laser materials_base = list(MAT_STEEL = 8000, MAT_GLASS = 3000, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/laser_rigged @@ -564,90 +564,90 @@ desc = "Allows for the construction of a welder-laser assembly package for non-combat exosuits." id = "mech_laser_rigged" req_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser + build_path = /obj/item/vehicle_module/weapon/energy/riggedlaser /datum/prototype/design/science/mecha/weapon/laser_heavy design_name = "CH-LC \"Solaris\" Laser Cannon" id = "mech_laser_heavy" req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy + build_path = /obj/item/vehicle_module/weapon/energy/laser/heavy materials_base = list(MAT_STEEL = 10000, MAT_GLASS = 3000, MAT_DIAMOND = 2000, MAT_OSMIUM = 5000, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/rigged_laser_heavy design_name = "Jury-Rigged Emitter Cannon" id = "mech_laser_heavy-r" req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_ILLEGAL = 1) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/rigged + build_path = /obj/item/vehicle_module/weapon/energy/laser/heavy/rigged materials_base = list(MAT_STEEL = 8000, MAT_GLASS = 4000, MAT_DIAMOND = 1500, MAT_OSMIUM = 4000, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/laser_xray design_name = "CH-XS \"Penetrator\" Laser" id = "mech_laser_xray" req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray + build_path = /obj/item/vehicle_module/weapon/energy/laser/xray materials_base = list(MAT_STEEL = 9000, MAT_GLASS = 3000, MAT_PHORON = 1000, MAT_SILVER = 1500, MAT_GOLD = 2500, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/rigged_laser_xray design_name = "Jury-Rigged Xray Rifle" id = "mech_laser_xray-r" req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray/rigged + build_path = /obj/item/vehicle_module/weapon/energy/laser/xray/rigged materials_base = list(MAT_STEEL = 8500, MAT_GLASS = 2500, MAT_PHORON = 1000, MAT_SILVER = 1250, MAT_GOLD = 2000, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/phase design_name = "NT-PE \"Scorpio\" Phase-Emitter" id = "mech_phase" req_tech = list(TECH_MATERIAL = 1, TECH_COMBAT = 2, TECH_MAGNET = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/phase + build_path = /obj/item/vehicle_module/weapon/energy/phase materials_base = list(MAT_STEEL = 6000, MAT_GLASS = 3000, MAT_PLASTIC = 3000) /datum/prototype/design/science/mecha/weapon/ion design_name = "MK-IV Ion Heavy Cannon" id = "mech_ion" req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion + build_path = /obj/item/vehicle_module/weapon/energy/ion materials_base = list(MAT_STEEL = 15000, MAT_URANIUM = 2000, MAT_SILVER = 2000, MAT_OSMIUM = 4500, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/rigged_ion design_name = "Jury-Rigged Ion Cannon" id = "mech_ion-r" req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion/rigged + build_path = /obj/item/vehicle_module/weapon/energy/ion/rigged materials_base = list(MAT_STEEL = 13000, MAT_URANIUM = 1000, MAT_SILVER = 1000, MAT_OSMIUM = 3000, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/sound_cannon design_name = "H.O.N.K. Sound Cannon" id = "mech_soundcannon" req_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_ILLEGAL = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker + build_path = /obj/item/vehicle_module/weapon/honker materials_base = list(MAT_STEEL = 13000, MAT_SILVER = 1000, MAT_OSMIUM = 3000, MAT_PLASTIC = 2000, MAT_BANANIUM = 4000) /datum/prototype/design/science/mecha/weapon/whisper_blade design_name = "Reticent Whisper Blade" id = "mech_whisper" req_tech = list(TECH_COMBAT = 5, TECH_MAGNET = 4, TECH_ILLEGAL = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/whisperblade + build_path = /obj/item/vehicle_module/weapon/whisperblade materials_base = list(MAT_STEEL = 13000, MAT_GOLD = 1000, MAT_OSMIUM = 3000, MAT_PLASTEEL = 2000, MAT_SILENCIUM = 4000) /datum/prototype/design/science/mecha/weapon/inferno_blade design_name = "Reticent Inferno Blade" id = "mech_inferno" req_tech = list(TECH_COMBAT = 5, TECH_MAGNET = 4, TECH_ILLEGAL = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/infernoblade + build_path = /obj/item/vehicle_module/weapon/infernoblade materials_base = list(MAT_STEEL = 13000, MAT_GOLD = 1000, MAT_LEAD = 3000, MAT_PLASTEEL = 2000, MAT_SILENCIUM = 4000) /datum/prototype/design/science/mecha/weapon/grenade_launcher design_name = "SGL-6 Grenade Launcher" id = "mech_grenade_launcher" req_tech = list(TECH_COMBAT = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade materials_base = list(MAT_STEEL = 7000, MAT_GOLD = 2000, MAT_PLASTIC = 3000) /datum/prototype/design/science/mecha/weapon/rigged_grenade_launcher design_name = "Jury-Rigged Pneumatic Flashlauncher" id = "mech_grenade_launcher-hardsuit" req_tech = list(TECH_COMBAT = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/rigged + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/rigged materials_base = list(MAT_STEEL = 5000, MAT_GOLD = 2000, MAT_PLASTIC = 2000) /datum/prototype/design/science/mecha/weapon/clusterbang_launcher @@ -656,34 +656,34 @@ id = "clusterbang_launcher" req_tech = list(TECH_COMBAT= 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) materials_base = list(MAT_STEEL = 15000, MAT_GOLD = 4500, MAT_URANIUM = 4500) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang/limited + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/clusterbang/limited /datum/prototype/design/science/mecha/weapon/conc_grenade_launcher design_name = "SGL-9 Grenade Launcher" id = "mech_grenade_launcher_conc" req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 1) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/concussion + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/concussion materials_base = list(MAT_STEEL = 9000, MAT_GOLD = 1000, MAT_OSMIUM = 1000, MAT_PLASTIC = 3000) /datum/prototype/design/science/mecha/weapon/frag_grenade_launcher design_name = "HEP-MI 6 Grenade Launcher" id = "mech_grenade_launcher_frag" req_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 2, TECH_MATERIAL = 3, TECH_ILLEGAL = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag/mini + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/frag/mini materials_base = list(MAT_STEEL = 10000, MAT_GOLD = 2500, MAT_URANIUM = 3000, MAT_OSMIUM = 3000, MAT_PLASTIC = 3000) /datum/prototype/design/science/mecha/weapon/banana_launcher design_name = "WSS-2 Banana Peel Launcher" id = "mech_banana_launcher" req_tech = list(TECH_COMBAT = 3, TECH_ILLEGAL = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/banana + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/banana materials_base = list(MAT_STEEL = 7000, MAT_GOLD = 2000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000, MAT_BANANIUM = 4000) /datum/prototype/design/science/mecha/weapon/mousetrap_launcher design_name = "WSS-5 Mouse Trap Launcher" id = "mech_mousetrap_launcher" req_tech = list(TECH_COMBAT = 3, TECH_ILLEGAL = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/mousetrap + build_path = /obj/item/vehicle_module/weapon/ballistic/missile_rack/grenade/mousetrap materials_base = list(MAT_STEEL = 7000, MAT_GOLD = 2000, MAT_OSMIUM = 1000, MAT_PLASTIC = 5000, MAT_BANANIUM = 4000) /datum/prototype/design/science/mecha/weapon/flamer @@ -692,7 +692,7 @@ id = "mech_flamer_full" req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 6, TECH_PHORON = 4, TECH_ILLEGAL = 4) materials_base = list(MAT_STEEL = 10000, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_PHORON = 8000) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer + build_path = /obj/item/vehicle_module/weapon/energy/flamer /datum/prototype/design/science/mecha/weapon/flamer_rigged design_name = "AA-CR-1 Mark 4 Flamethrower" @@ -700,7 +700,7 @@ id = "mech_flamer_rigged" req_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_ILLEGAL = 2) materials_base = list(MAT_STEEL = 8000, MAT_GOLD = 1500, MAT_SILVER = 1500, MAT_URANIUM = 2000, MAT_PHORON = 6000) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged + build_path = /obj/item/vehicle_module/weapon/energy/flamer/rigged /datum/prototype/design/science/mecha/weapon/flame_mg design_name = "DR-AC 3 Incendiary Rotary MG" @@ -708,7 +708,7 @@ id = "mech_lmg_flamer" req_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 5, TECH_PHORON = 2, TECH_ILLEGAL = 1) materials_base = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 1750, MAT_URANIUM = 1500, MAT_PHORON = 4000) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/incendiary + build_path = /obj/item/vehicle_module/weapon/ballistic/incendiary // *** Nonweapon modules /datum/prototype/design/science/mecha/wormhole_gen @@ -716,14 +716,14 @@ desc = "An exosuit module that can generate small quasi-stable wormholes." id = "mech_wormhole_gen" req_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator + build_path = /obj/item/vehicle_module/wormhole_generator /datum/prototype/design/science/mecha/teleporter design_name = "Teleporter" desc = "An exosuit module that allows teleportation to any position in view." id = "mech_teleporter" req_tech = list(TECH_BLUESPACE = 10, TECH_MAGNET = 5) - build_path = /obj/item/mecha_parts/mecha_equipment/teleporter + build_path = /obj/item/vehicle_module/teleporter /datum/prototype/design/science/mecha/rcd design_name = "RCD" @@ -732,14 +732,14 @@ work = (120 * (1 / 3) * 10) // auto regexed to be old time divided by 3 in seconds. materials_base = list(MAT_STEEL = 20000, MAT_PLASTIC = 10000, MAT_PHORON = 18750, MAT_SILVER = 15000, MAT_GOLD = 15000) req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4, TECH_ENGINEERING = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd + build_path = /obj/item/vehicle_module/tool/rcd /datum/prototype/design/science/mecha/gravcatapult design_name = "Gravitational Catapult" desc = "An exosuit-mounted gravitational catapult." id = "mech_gravcatapult" req_tech = list(TECH_BLUESPACE = 2, TECH_MAGNET = 3, TECH_ENGINEERING = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult + build_path = /obj/item/vehicle_module/gravcatapult /datum/prototype/design/science/mecha/repair_droid design_name = "Repair Droid" @@ -747,7 +747,7 @@ id = "mech_repair_droid" req_tech = list(TECH_MAGNET = 3, TECH_DATA = 3, TECH_ENGINEERING = 3) materials_base = list(MAT_STEEL = 7500, MAT_GOLD = 750, MAT_SILVER = 1500, MAT_GLASS = 3750) - build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid + build_path = /obj/item/vehicle_module/repair_droid /datum/prototype/design/science/mecha/shield_drone design_name = "Shield Drone" @@ -755,7 +755,7 @@ id = "mech_shield_droid" req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4) materials_base = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750) - build_path = /obj/item/mecha_parts/mecha_equipment/combat_shield + build_path = /obj/item/vehicle_module/combat_shield /datum/prototype/design/science/mecha/reticent_shield_drone design_name = "Reticent Wall Projector" @@ -763,7 +763,7 @@ id = "mech_reticent_shield_droid" req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4) materials_base = list(MAT_STEEL = 8000, MAT_OSMIUM = 4000, MAT_SILVER = 3000, MAT_SILENCIUM = 10000, MAT_GLASS = 3750) - build_path = /obj/item/mecha_parts/mecha_equipment/combat_shield/reticent + build_path = /obj/item/vehicle_module/combat_shield/reticent /datum/prototype/design/science/mecha/crisis_drone design_name = "Crisis Drone" @@ -771,7 +771,7 @@ id = "mech_med_droid" req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_BIO = 5, TECH_DATA = 4, TECH_ARCANE = 1) materials_base = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000) - build_path = /obj/item/mecha_parts/mecha_equipment/crisis_drone + build_path = /obj/item/vehicle_module/crisis_drone /datum/prototype/design/science/mecha/rad_drone design_name = "Hazmat Drone" @@ -779,7 +779,7 @@ id = "mech_rad_droid" req_tech = list(TECH_PHORON = 4, TECH_MAGNET = 5, TECH_BIO = 6, TECH_DATA = 4, TECH_ARCANE = 1) materials_base = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_VERDANTIUM = 2500, MAT_GLASS = 3000) - build_path = /obj/item/mecha_parts/mecha_equipment/crisis_drone/rad + build_path = /obj/item/vehicle_module/crisis_drone/rad /datum/prototype/design/science/mecha/medanalyzer design_name = "Mounted Body Scanner" @@ -787,21 +787,21 @@ id = "mech_med_analyzer" req_tech = list(TECH_PHORON = 4, TECH_MAGNET = 5, TECH_BIO = 5, TECH_DATA = 4) materials_base = list(MAT_PLASTEEL = 4500, MAT_GOLD = 2000, MAT_URANIUM = 3000, MAT_GLASS = 3000) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/medanalyzer + build_path = /obj/item/vehicle_module/tool/powertool/medanalyzer /datum/prototype/design/science/mecha/jetpack design_name = "Ion Jetpack" desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight." id = "mech_jetpack" req_tech = list(TECH_ENGINEERING = 3, TECH_MAGNET = 4) //One less magnet than the actual got-damn teleporter. - build_path = /obj/item/mecha_parts/mecha_equipment/tool/jetpack + build_path = /obj/item/vehicle_module/tool/jetpack materials_base = list(MAT_STEEL = 7500, MAT_SILVER = 300, MAT_GLASS = 600) /datum/prototype/design/science/mecha/phoron_generator desc = "Phoron Reactor" id = "mech_phoron_generator" req_tech = list(TECH_PHORON = 2, TECH_POWER= 2, TECH_ENGINEERING = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/generator + build_path = /obj/item/vehicle_module/generator materials_base = list(MAT_STEEL = 7500, MAT_SILVER = 375, MAT_GLASS = 750) /datum/prototype/design/science/mecha/energy_relay @@ -809,7 +809,7 @@ id = "mech_energy_relay" req_tech = list(TECH_MAGNET = 4, TECH_POWER = 3) materials_base = list(MAT_STEEL = 7500, MAT_GOLD = 1500, MAT_SILVER = 2250, MAT_GLASS = 1500) - build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay + build_path = /obj/item/vehicle_module/tesla_energy_relay /datum/prototype/design/science/mecha/ccw_armor design_name = "CCW Armor Booster" @@ -817,7 +817,7 @@ id = "mech_ccw_armor" req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4) materials_base = list(MAT_STEEL = 11250, MAT_SILVER = 3750) - build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster + build_path = /obj/item/vehicle_module/anticcw_armor_booster /datum/prototype/design/science/mecha/proj_armor design_name = "Ranged Armor Booster" @@ -825,7 +825,7 @@ id = "mech_proj_armor" req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_ENGINEERING = 3) materials_base = list(MAT_STEEL = 15000, MAT_GOLD = 3750) - build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster + build_path = /obj/item/vehicle_module/antiproj_armor_booster /datum/prototype/design/science/mecha/diamond_drill design_name = "Diamond Drill" @@ -833,7 +833,7 @@ id = "mech_diamond_drill" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) materials_base = list(MAT_STEEL = 7500, MAT_DIAMOND = 4875) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill + build_path = /obj/item/vehicle_module/tool/drill/diamonddrill /datum/prototype/design/science/mecha/ground_drill design_name = "Surface Bore" @@ -841,7 +841,7 @@ id = "mech_ground_drill" req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2, TECH_PHORON = 1) materials_base = list(MAT_STEEL = 7000, MAT_SILVER = 3000, MAT_PHORON = 2000) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/bore + build_path = /obj/item/vehicle_module/tool/drill/bore /datum/prototype/design/science/mecha/orescanner design_name = "Ore Scanner" @@ -849,7 +849,7 @@ id = "mech_ore_scanner" req_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2) materials_base = list(MAT_STEEL = 4000, MAT_GLASS = 1000) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner + build_path = /obj/item/vehicle_module/tool/orescanner /datum/prototype/design/science/mecha/advorescanner design_name = "Advanced Ore Scanner" @@ -857,7 +857,7 @@ id = "mech_ore_scanner_adv" req_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 4, TECH_POWER = 4, TECH_BLUESPACE = 2) materials_base = list(MAT_STEEL = 5000, MAT_OSMIUM = 3000, MAT_SILVER = 1000) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/orescanner/advanced + build_path = /obj/item/vehicle_module/tool/orescanner/advanced /datum/prototype/design/science/mecha/powerwrench design_name = "hydraulic wrench" @@ -865,7 +865,7 @@ id = "mech_wrench" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) materials_base = list(MAT_STEEL = 5000, MAT_PLASTIC = 2000, MAT_GLASS = 1250) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool + build_path = /obj/item/vehicle_module/tool/powertool /datum/prototype/design/science/mecha/powercrowbar design_name = "hydraulic prybar" @@ -873,7 +873,7 @@ id = "mech_crowbar" req_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2, TECH_POWER = 2) materials_base = list(MAT_STEEL = 4000, MAT_OSMIUM = 3000, MAT_GLASS = 1000) - build_path = /obj/item/mecha_parts/mecha_equipment/tool/powertool/prybar + build_path = /obj/item/vehicle_module/tool/powertool/prybar /datum/prototype/design/science/mecha/generator_nuclear design_name = "Nuclear Reactor" @@ -881,7 +881,7 @@ id = "mech_generator_nuclear" req_tech = list(TECH_POWER= 3, TECH_ENGINEERING = 3, TECH_MATERIAL = 3) materials_base = list(MAT_STEEL = 7500, MAT_SILVER = 375, MAT_GLASS = 750) - build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear + build_path = /obj/item/vehicle_module/generator/nuclear /datum/prototype/design/science/mecha/speedboost_ripley design_name = "Ripley Leg Actuator Overdrive" @@ -889,7 +889,7 @@ id = "mech_speedboost_ripley" req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4) materials_base = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000) - build_path = /obj/item/mecha_parts/mecha_equipment/speedboost + build_path = /obj/item/vehicle_module/speedboost /datum/prototype/design/science/synthetic_flash design_name = "Synthetic Flash" @@ -910,7 +910,7 @@ req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) lathe_type = LATHE_TYPE_MECHA materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 2500) - build_path = /obj/item/mecha_parts/component/actuator + build_path = /obj/item/vehicle_component/actuator category = list("Components") /datum/prototype/design/science/mecha_component/actuator_high @@ -918,84 +918,84 @@ id = "mactuatorhigh" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 6) materials_base = list(MAT_STEEL = 7000, MAT_GLASS = 4000, MAT_GOLD = 10000) - build_path = /obj/item/mecha_parts/component/actuator/hispeed + build_path = /obj/item/vehicle_component/actuator/hispeed /datum/prototype/design/science/mecha_component/armor design_name = "Mecha Plating" id = "marmor" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 3) materials_base = list(MAT_STEEL = 10000, MAT_GLASS = 2000) - build_path = /obj/item/mecha_parts/component/armor + build_path = /obj/item/vehicle_component/armor /datum/prototype/design/science/mecha_component/armor/blast design_name = "Mecha Plating - Blast Resistant" id = "marmorblast" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 4) materials_base = list(MAT_STEEL = 15000, MAT_GLASS = 500, MAT_PLASTEEL = 2000) - build_path = /obj/item/mecha_parts/component/armor/mining + build_path = /obj/item/vehicle_component/armor/mining /datum/prototype/design/science/mecha_component/armor/lightweight design_name = "Mecha Plating - Lightweight" id = "marmorlight" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 6) materials_base = list(MAT_STEEL = 7000, MAT_PLASTIC = 5000, MAT_GOLD = 2000) - build_path = /obj/item/mecha_parts/component/armor/lightweight + build_path = /obj/item/vehicle_component/armor/lightweight /datum/prototype/design/science/mecha_component/armor/reinforced design_name = "Mecha Plating - Reinforced" id = "marmorreinf" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 6, TECH_COMBAT = 5) materials_base = list(MAT_STEEL = 15000, MAT_PLASTEEL = 5000, MAT_URANIUM = 5000) - build_path = /obj/item/mecha_parts/component/armor/reinforced + build_path = /obj/item/vehicle_component/armor/reinforced /datum/prototype/design/science/mecha_component/electrical design_name = "Mecha Electrical Harness" id = "melectrical" req_tech = list(TECH_ENGINEERING = 3, TECH_POWER = 3) materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 2000, MAT_PLASTIC = 1000) - build_path = /obj/item/mecha_parts/component/electrical + build_path = /obj/item/vehicle_component/electrical /datum/prototype/design/science/mecha_component/electrical/high_current design_name = "Mecha Electrical Harness - High Current" id = "melectricalhigh" req_tech = list(TECH_ENGINEERING = 5, TECH_POWER = 5, TECH_MATERIAL = 4) materials_base = list(MAT_STEEL = 3000, MAT_GLASS = 4000, MAT_PLASTIC = 5000, MAT_GOLD = 5000) - build_path = /obj/item/mecha_parts/component/electrical/high_current + build_path = /obj/item/vehicle_component/electrical/high_current /datum/prototype/design/science/mecha_component/hull design_name = "Mecha Hull" id = "mhull" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) materials_base = list(MAT_STEEL = 7000, MAT_GLASS = 500) - build_path = /obj/item/mecha_parts/component/hull + build_path = /obj/item/vehicle_component/hull /datum/prototype/design/science/mecha_component/hull/durable design_name = "Mecha Hull - Durable" id = "mhulldura" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4) materials_base = list(MAT_STEEL = 7000, MAT_GLASS = 500, MAT_PLASTEEL = 10000) - build_path = /obj/item/mecha_parts/component/hull/durable + build_path = /obj/item/vehicle_component/hull/durable /datum/prototype/design/science/mecha_component/hull/lightweight design_name = "Mecha Hull - Lightweight" id = "mhulllight" req_tech = list(TECH_ENGINEERING = 5, TECH_MATERIAL = 5) materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 500, MAT_PLASTIC = 3000) - build_path = /obj/item/mecha_parts/component/hull/lightweight + build_path = /obj/item/vehicle_component/hull/lightweight /datum/prototype/design/science/mecha_component/gas design_name = "Mecha Life-Support" id = "mgas" req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2, TECH_BIO = 3) materials_base = list(MAT_STEEL = 2000, MAT_GLASS = 3000) - build_path = /obj/item/mecha_parts/component/gas + build_path = /obj/item/vehicle_component/gas /datum/prototype/design/science/mecha_component/gas/reinforced design_name = "Mecha Life-Support - Reinforced" id = "mgasreinf" req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_BIO = 5) materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 3000, MAT_SILVER = 4000) - build_path = /obj/item/mecha_parts/component/gas/reinforced + build_path = /obj/item/vehicle_component/gas/reinforced /* * Non-Mech Vehicles @@ -1049,56 +1049,56 @@ /datum/prototype/design/science/mechfab/fighter/pinnace/chassis design_name = "Pinnace Chassis" id = "pinnace_chassis" - build_path = /obj/item/mecha_parts/fighter/chassis/pinnace + build_path = /obj/item/vehicle_chassis/fighter/pinnace work = 3 * 30 materials_base = list(MAT_STEEL = 25000, MAT_GLASS = 10000, MAT_PLASTEEL = 10000) /datum/prototype/design/science/mechfab/fighter/pinnace/core design_name = "Pinnace Core" id = "pinnace_core" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_core + build_path = /obj/item/vehicle_part/fighter/pinnace_core work = 3 * 60 materials_base = list(MAT_STEEL = 25000, MAT_GLASS = 7000, MAT_PLASTEEL = 7000) /datum/prototype/design/science/mechfab/fighter/pinnace/cockpit design_name = "Pinnace Cockpit" id = "pinnace_cockpit" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_cockpit + build_path = /obj/item/vehicle_part/fighter/pinnace_cockpit work = 3 * 15 materials_base = list(MAT_STEEL = 2500, MAT_PLASTEEL = 2500, MAT_GLASS = 7500, MAT_PLASTIC = 2500) /datum/prototype/design/science/mechfab/fighter/pinnace/main_engine design_name = "Pinnace Main Engine" id = "pinnace_main_engine" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_main_engine + build_path = /obj/item/vehicle_part/fighter/pinnace_main_engine work = 3 * 25 materials_base = list(MAT_STEEL = 15000, MAT_PLASTEEL = 5000) /datum/prototype/design/science/mechfab/fighter/pinnace/left_engine design_name = "Pinnace Left Engine" id = "pinnace_left_engine" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_left_engine + build_path = /obj/item/vehicle_part/fighter/pinnace_left_engine work = 3 * 25 materials_base = list(MAT_STEEL = 10000, MAT_PLASTEEL = 2500) /datum/prototype/design/science/mechfab/fighter/pinnace/right_engine design_name = "Pinnace Right Engine" id = "pinnace_right_engine" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_right_engine + build_path = /obj/item/vehicle_part/fighter/pinnace_right_engine work = 3 * 25 materials_base = list(MAT_STEEL = 10000, MAT_PLASTEEL = 2500) /datum/prototype/design/science/mechfab/fighter/pinnace/left_wing design_name = "Pinnace Left Wing" id = "pinnace_left_wing" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_left_wing + build_path = /obj/item/vehicle_part/fighter/pinnace_left_wing work = 3 * 20 materials_base = list(MAT_STEEL = 7000, MAT_PLASTIC = 3000, MAT_PLASTEEL = 5000) /datum/prototype/design/science/mechfab/fighter/pinnace/right_wing design_name = "Pinnace Right Wing" id = "pinnace_right_wing" - build_path = /obj/item/mecha_parts/fighter/part/pinnace_right_wing + build_path = /obj/item/vehicle_part/fighter/pinnace_right_wing work = 3 * 20 materials_base = list(MAT_STEEL = 7000, MAT_PLASTIC = 3000, MAT_PLASTEEL = 5000) @@ -1112,56 +1112,56 @@ /datum/prototype/design/science/mechfab/fighter/baron/chassis design_name = "Baron Chassis" id = "baron_chassis" - build_path = /obj/item/mecha_parts/fighter/chassis/baron + build_path = /obj/item/vehicle_chassis/fighter/baron work = 3 * 30 materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_PLASTEEL = 15000) /datum/prototype/design/science/mechfab/fighter/baron/core design_name = "Baron Core" id = "baron_core" - build_path = /obj/item/mecha_parts/fighter/part/baron_core + build_path = /obj/item/vehicle_part/fighter/baron_core work = 3 * 60 materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_PLASTEEL = 15000) /datum/prototype/design/science/mechfab/fighter/baron/cockpit design_name = "Baron Cockpit" id = "baron_cockpit" - build_path = /obj/item/mecha_parts/fighter/part/baron_cockpit + build_path = /obj/item/vehicle_part/fighter/baron_cockpit work = 3 * 15 materials_base = list(MAT_STEEL = 5000, MAT_PLASTEEL = 5000, MAT_GLASS = 10000, MAT_PLASTIC = 5000) /datum/prototype/design/science/mechfab/fighter/baron/main_engine design_name = "Baron Main Engine" id = "baron_main_engine" - build_path = /obj/item/mecha_parts/fighter/part/baron_main_engine + build_path = /obj/item/vehicle_part/fighter/baron_main_engine work = 3 * 25 materials_base = list(MAT_STEEL = 25000, MAT_PLASTEEL = 10000) /datum/prototype/design/science/mechfab/fighter/baron/left_engine design_name = "Baron Left Engine" id = "baron_left_engine" - build_path = /obj/item/mecha_parts/fighter/part/baron_left_engine + build_path = /obj/item/vehicle_part/fighter/baron_left_engine work = 3 * 25 materials_base = list(MAT_STEEL = 20000, MAT_PLASTEEL = 5000) /datum/prototype/design/science/mechfab/fighter/baron/right_engine design_name = "Baron Right Engine" id = "baron_right_engine" - build_path = /obj/item/mecha_parts/fighter/part/baron_right_engine + build_path = /obj/item/vehicle_part/fighter/baron_right_engine work = 3 * 25 materials_base = list(MAT_STEEL = 20000, MAT_PLASTEEL = 5000) /datum/prototype/design/science/mechfab/fighter/baron/left_wing design_name = "Baron Left Wing" id = "baron_left_wing" - build_path = /obj/item/mecha_parts/fighter/part/baron_left_wing + build_path = /obj/item/vehicle_part/fighter/baron_left_wing work = 3 * 20 materials_base = list(MAT_STEEL = 15000, MAT_PLASTIC = 6000, MAT_PLASTEEL = 10000) /datum/prototype/design/science/mechfab/fighter/baron/right_wing design_name = "Baron Right Wing" id = "baron_right_wing" - build_path = /obj/item/mecha_parts/fighter/part/baron_right_wing + build_path = /obj/item/vehicle_part/fighter/baron_right_wing work = 3 * 20 materials_base = list(MAT_STEEL = 15000, MAT_PLASTIC = 6000, MAT_PLASTEEL = 10000) @@ -1175,55 +1175,55 @@ /datum/prototype/design/science/mechfab/fighter/duke/chassis design_name = "Duke Chassis" id = "duke_chassis" - build_path = /obj/item/mecha_parts/fighter/chassis/duke + build_path = /obj/item/vehicle_chassis/fighter/duke work = 3 * 30 materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 15000, MAT_PLASTEEL = 20000) /datum/prototype/design/science/mechfab/fighter/duke/core design_name = "Duke Core" id = "duke_core" - build_path = /obj/item/mecha_parts/fighter/part/duke_core + build_path = /obj/item/vehicle_part/fighter/duke_core work = 3 * 60 materials_base = list(MAT_STEEL = 37500, MAT_GLASS = 10000, MAT_PLASTEEL = 20000) /datum/prototype/design/science/mechfab/fighter/duke/cockpit design_name = "Duke Cockpit" id = "duke_cockpit" - build_path = /obj/item/mecha_parts/fighter/part/duke_cockpit + build_path = /obj/item/vehicle_part/fighter/duke_cockpit work = 3 * 15 materials_base = list(MAT_STEEL = 5000, MAT_GLASS = 2500, MAT_PLASTEEL = 5000, MAT_PLASTIC = 5000) /datum/prototype/design/science/mechfab/fighter/duke/main_engine design_name = "Duke Main Engine" id = "duke_main_engine" - build_path = /obj/item/mecha_parts/fighter/part/duke_main_engine + build_path = /obj/item/vehicle_part/fighter/duke_main_engine work = 3 * 25 materials_base = list(MAT_STEEL = 25000, MAT_PLASTEEL = 15000) /datum/prototype/design/science/mechfab/fighter/duke/left_engine design_name = "Duke Left Engine" id = "duke_left_engine" - build_path = /obj/item/mecha_parts/fighter/part/duke_left_engine + build_path = /obj/item/vehicle_part/fighter/duke_left_engine work = 3 * 25 materials_base = list(MAT_STEEL = 20000, MAT_PLASTEEL = 10000) /datum/prototype/design/science/mechfab/fighter/duke/right_engine design_name = "Duke Right Engine" id = "duke_right_engine" - build_path = /obj/item/mecha_parts/fighter/part/duke_right_engine + build_path = /obj/item/vehicle_part/fighter/duke_right_engine work = 3 * 25 materials_base = list(MAT_STEEL = 20000, MAT_PLASTEEL = 10000) /datum/prototype/design/science/mechfab/fighter/duke/left_wing design_name = "Duke Left Wing" id = "duke_left_wing" - build_path = /obj/item/mecha_parts/fighter/part/duke_left_wing + build_path = /obj/item/vehicle_part/fighter/duke_left_wing work = 3 * 20 materials_base = list(MAT_STEEL = 10000, MAT_PLASTIC = 5000, MAT_PLASTEEL = 20000) /datum/prototype/design/science/mechfab/fighter/duke/right_wing design_name = "Duke Right Wing" id = "duke_right_wing" - build_path = /obj/item/mecha_parts/fighter/part/duke_right_wing + build_path = /obj/item/vehicle_part/fighter/duke_right_wing work = 3 * 20 materials_base = list(MAT_STEEL = 10000, MAT_PLASTIC = 5000, MAT_PLASTEEL = 20000) diff --git a/code/modules/vehicles/sealed/mecha/README.md b/code/modules/vehicles/sealed/mecha/README.md new file mode 100644 index 00000000000..f2f455ace99 --- /dev/null +++ b/code/modules/vehicles/sealed/mecha/README.md @@ -0,0 +1,8 @@ +# Mecha + +Modular vehicle system. + +These don't have to be 'classical' 2-legged mechs. +The mecha module is just a backend for highly simulated, modular vehicles. + +This'll probably be renamed / refactored to a dynamic vehicle system later. diff --git a/code/modules/vehicles/sealed/mecha/components/actuators.dm b/code/modules/vehicles/sealed/mecha/components/actuators.dm index 84f7580559d..a6af796262e 100644 --- a/code/modules/vehicles/sealed/mecha/components/actuators.dm +++ b/code/modules/vehicles/sealed/mecha/components/actuators.dm @@ -1,5 +1,5 @@ -/obj/item/mecha_parts/component/actuator +/obj/item/vehicle_component/actuator name = "mecha actuator" icon = 'icons/mecha/mech_component.dmi' icon_state = "motor" @@ -22,10 +22,10 @@ var/strafing_multiplier = 1 -/obj/item/mecha_parts/component/actuator/get_step_delay() +/obj/item/vehicle_component/actuator/get_step_delay() return step_delay -/obj/item/mecha_parts/component/actuator/hispeed +/obj/item/vehicle_component/actuator/hispeed name = "overclocked mecha actuator" step_delay = -1 diff --git a/code/modules/vehicles/sealed/mecha/components/armor.dm b/code/modules/vehicles/sealed/mecha/components/armor.dm index 999966be176..77a8443c230 100644 --- a/code/modules/vehicles/sealed/mecha/components/armor.dm +++ b/code/modules/vehicles/sealed/mecha/components/armor.dm @@ -1,5 +1,5 @@ -/obj/item/mecha_parts/component/armor +/obj/item/vehicle_component/armor name = "mecha plating" icon = 'icons/mecha/mech_component.dmi' icon_state = "armor" @@ -38,7 +38,7 @@ var/minimum_penetration = 0 var/fail_penetration_value = 0.66 -/obj/item/mecha_parts/component/armor/mining +/obj/item/vehicle_component/armor/mining name = "blast-resistant mecha plating" step_delay = 2 @@ -55,7 +55,7 @@ "rad"=1 ) -/obj/item/mecha_parts/component/armor/lightweight +/obj/item/vehicle_component/armor/lightweight name = "lightweight mecha plating" integrity_max = 50 @@ -72,7 +72,7 @@ "rad"=1 ) -/obj/item/mecha_parts/component/armor/reinforced +/obj/item/vehicle_component/armor/reinforced name = "reinforced mecha plating" step_delay = 4 @@ -90,7 +90,7 @@ "bomb"=0.8 ) -/obj/item/mecha_parts/component/armor/military +/obj/item/vehicle_component/armor/military name = "military grade mecha plating" step_delay = 4 @@ -113,7 +113,7 @@ "bomb"=0.8 ) -/obj/item/mecha_parts/component/armor/military/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) +/obj/item/vehicle_component/armor/military/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) . = ..() if(.) var/typepass = FALSE @@ -126,7 +126,7 @@ else step_delay = initial(step_delay) -/obj/item/mecha_parts/component/armor/marshal +/obj/item/vehicle_component/armor/marshal name = "marshal mecha plating" step_delay = 3 @@ -150,7 +150,7 @@ "bomb"=1 ) -/obj/item/mecha_parts/component/armor/marshal/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) +/obj/item/vehicle_component/armor/marshal/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) . = ..() if(.) var/typepass = FALSE @@ -163,7 +163,7 @@ else step_delay = initial(step_delay) -/obj/item/mecha_parts/component/armor/marshal/reinforced +/obj/item/vehicle_component/armor/marshal/reinforced name = "blackops mecha plating" step_delay = 5 @@ -177,7 +177,7 @@ "bomb"=0.8 ) -/obj/item/mecha_parts/component/armor/military/marauder +/obj/item/vehicle_component/armor/military/marauder name = "cutting edge mecha plating" step_delay = 4 @@ -201,7 +201,7 @@ "bomb"=0.7 ) -/obj/item/mecha_parts/component/armor/military/marauder/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) +/obj/item/vehicle_component/armor/military/marauder/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) . = ..() if(.) var/typepass = FALSE @@ -214,7 +214,7 @@ else step_delay = initial(step_delay) -/obj/item/mecha_parts/component/armor/alien +/obj/item/vehicle_component/armor/alien name = "strange mecha plating" step_delay = 2 damage_absorption = list( @@ -226,7 +226,7 @@ "bomb"=0.7 ) -/obj/item/mecha_parts/component/armor/alien/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) +/obj/item/vehicle_component/armor/alien/attach(var/obj/vehicle/sealed/mecha/target, var/mob/living/user) . = ..() if(.) if(istype(target, /obj/vehicle/sealed/mecha/combat/phazon/janus)) diff --git a/code/modules/vehicles/sealed/mecha/components/electrical.dm b/code/modules/vehicles/sealed/mecha/components/electrical.dm index 5d4a213882c..f08a5d86ba4 100644 --- a/code/modules/vehicles/sealed/mecha/components/electrical.dm +++ b/code/modules/vehicles/sealed/mecha/components/electrical.dm @@ -1,5 +1,5 @@ -/obj/item/mecha_parts/component/electrical +/obj/item/vehicle_component/electrical name = "mecha electrical harness" icon = 'icons/mecha/mech_component.dmi' icon_state = "board" @@ -22,7 +22,7 @@ var/charge_cost_mod = 1 -/obj/item/mecha_parts/component/electrical/high_current +/obj/item/vehicle_component/electrical/high_current name = "efficient mecha electrical harness" emp_resistance = 0 diff --git a/code/modules/vehicles/sealed/mecha/components/hull.dm b/code/modules/vehicles/sealed/mecha/components/hull.dm index cdea1f5bb43..38ddc1869f6 100644 --- a/code/modules/vehicles/sealed/mecha/components/hull.dm +++ b/code/modules/vehicles/sealed/mecha/components/hull.dm @@ -1,5 +1,5 @@ -/obj/item/mecha_parts/component/hull +/obj/item/vehicle_component/hull name = "mecha hull" icon = 'icons/mecha/mech_component.dmi' icon_state = "hull" @@ -20,14 +20,14 @@ step_delay = 2 -/obj/item/mecha_parts/component/hull/durable +/obj/item/vehicle_component/hull/durable name = "durable mecha hull" step_delay = 4 integrity_danger_mod = 0.3 integrity_max = 100 -/obj/item/mecha_parts/component/hull/lightweight +/obj/item/vehicle_component/hull/lightweight name = "lightweight mecha hull" step_delay = 1 diff --git a/code/modules/vehicles/sealed/mecha/components/lifesupport.dm b/code/modules/vehicles/sealed/mecha/components/lifesupport.dm index c0bf51e6f90..370593a97b4 100644 --- a/code/modules/vehicles/sealed/mecha/components/lifesupport.dm +++ b/code/modules/vehicles/sealed/mecha/components/lifesupport.dm @@ -1,5 +1,5 @@ -/obj/item/mecha_parts/component/gas +/obj/item/vehicle_component/gas name = "mecha life-support" icon = 'icons/mecha/mech_component.dmi' icon_state = "lifesupport" @@ -20,7 +20,7 @@ internal_damage_flag = MECHA_INT_TANK_BREACH -/obj/item/mecha_parts/component/gas/reinforced +/obj/item/vehicle_component/gas/reinforced name = "reinforced mecha life-support" emp_resistance = 2 diff --git a/code/modules/vehicles/sealed/mecha/equipment/mecha_equipment_dynamicprocs.dm b/code/modules/vehicles/sealed/mecha/equipment/mecha_equipment_dynamicprocs.dm deleted file mode 100644 index 32ef11fc9f1..00000000000 --- a/code/modules/vehicles/sealed/mecha/equipment/mecha_equipment_dynamicprocs.dm +++ /dev/null @@ -1,19 +0,0 @@ -/* - * File containing all the default 'handlers' for Exosuit equipment, hopefully to make all dynX calls extinct. - */ - -// Used for impacting (thrown) objects, and damage value. -/obj/item/mecha_parts/mecha_equipment/proc/handle_ranged_contact(var/obj/A, var/inc_damage = 0) - return max(0, inc_damage) - -// Used for melee strikes with an object, and a mob, and damage value. -/obj/item/mecha_parts/mecha_equipment/proc/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = 0) - return max(0, inc_damage) - -// Used for projectile impacts from bullet_act. -/obj/item/mecha_parts/mecha_equipment/proc/handle_projectile_contact(var/obj/projectile/Proj, var/inc_damage = 0) - return max(0, inc_damage) - -// Used for on-movement actions. -/obj/item/mecha_parts/mecha_equipment/proc/handle_movement_action() //Any modules that have special effects or needs when taking a step or floating through space. - return diff --git a/code/modules/vehicles/sealed/mecha/equipment/tools/tools.dm b/code/modules/vehicles/sealed/mecha/equipment/tools/tools.dm deleted file mode 100644 index 4dce6f7bbdf..00000000000 --- a/code/modules/vehicles/sealed/mecha/equipment/tools/tools.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/item/mecha_parts/mecha_equipment/tool - equip_type = EQUIP_UTILITY diff --git a/code/modules/vehicles/sealed/mecha/equipment/weapons/energy/energy.dm b/code/modules/vehicles/sealed/mecha/equipment/weapons/energy/energy.dm deleted file mode 100644 index 1e42c1f6607..00000000000 --- a/code/modules/vehicles/sealed/mecha/equipment/weapons/energy/energy.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/item/mecha_parts/mecha_equipment/weapon/energy - name = "general energy weapon" - auto_rearm = 1 diff --git a/code/modules/vehicles/sealed/mecha/mech_bay.dm b/code/modules/vehicles/sealed/mecha/mech_bay.dm index 7b4b397a2a1..311cc8cc2b5 100644 --- a/code/modules/vehicles/sealed/mecha/mech_bay.dm +++ b/code/modules/vehicles/sealed/mecha/mech_bay.dm @@ -99,4 +99,3 @@ else to_chat(M, SPAN_NOTICE("Now charging...")) charging = M - return diff --git a/code/modules/vehicles/sealed/mecha/mech_fabricator.dm b/code/modules/vehicles/sealed/mecha/mech_fabricator.dm index 1050dd81079..579211134f4 100644 --- a/code/modules/vehicles/sealed/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/sealed/mecha/mech_fabricator.dm @@ -179,8 +179,8 @@ else sub_category += "All Cyborgs" //Else check if this design builds a piece of exosuit equipment. - else if(built_item in typesof(/obj/item/mecha_parts/mecha_equipment)) - var/obj/item/mecha_parts/mecha_equipment/E = built_item + else if(built_item in typesof(/obj/item/vehicle_module)) + var/obj/item/vehicle_module/E = built_item var/mech_types = initial(E.mech_flags) sub_category = "Equipment" if(mech_types) diff --git a/code/modules/vehicles/sealed/mecha/mech_sensor.dm b/code/modules/vehicles/sealed/mecha/mech_sensor.dm index fbfdce8214e..b84524946a2 100644 --- a/code/modules/vehicles/sealed/mecha/mech_sensor.dm +++ b/code/modules/vehicles/sealed/mecha/mech_sensor.dm @@ -29,7 +29,7 @@ if(ismecha(AM)) var/obj/vehicle/sealed/mecha/M = AM if(istype(M, /obj/vehicle/sealed/mecha/medical/odysseus)) - for(var/obj/item/mecha_parts/mecha_equipment/tool/sleeper/S in M.equipment) + for(var/obj/item/vehicle_module/tool/sleeper/S in M.equipment) if(S.occupant_legacy) return FALSE return TRUE diff --git a/code/modules/vehicles/sealed/mecha/mecha.dm b/code/modules/vehicles/sealed/mecha/mecha.dm index 88a5a131281..2809450dfd3 100644 --- a/code/modules/vehicles/sealed/mecha/mecha.dm +++ b/code/modules/vehicles/sealed/mecha/mecha.dm @@ -140,7 +140,7 @@ var/wreckage /// This lists holds what stuff you bolted onto your baby ride. var/list/equipment = new - var/obj/item/mecha_parts/mecha_equipment/selected + var/obj/item/vehicle_module/selected var/max_equip = 2 var/datum/events/events @@ -171,11 +171,11 @@ MECH_ELECTRIC = null ) var/list/starting_components = list( - /obj/item/mecha_parts/component/hull, - /obj/item/mecha_parts/component/actuator, - /obj/item/mecha_parts/component/armor, - /obj/item/mecha_parts/component/gas, - /obj/item/mecha_parts/component/electrical + /obj/item/vehicle_component/hull, + /obj/item/vehicle_component/actuator, + /obj/item/vehicle_component/armor, + /obj/item/vehicle_component/gas, + /obj/item/vehicle_component/electrical ) //Working exosuit vars @@ -328,7 +328,7 @@ utility_equipment.Cut() universal_equipment.Cut() special_equipment.Cut() - for(var/obj/item/mecha_parts/mecha_equipment/E in equipment) + for(var/obj/item/vehicle_module/E in equipment) if(E.salvageable && prob(30)) WR.crowbar_salvage += E E.forceMove(WR) @@ -338,7 +338,7 @@ E.destroy() for(var/slot in internal_components) - var/obj/item/mecha_parts/component/C = internal_components[slot] + var/obj/item/vehicle_component/C = internal_components[slot] if(istype(C)) C.damage_part(rand(10, 20)) C.detach() @@ -353,11 +353,11 @@ WR.crowbar_salvage += internal_tank internal_tank.forceMove(WR) else - for(var/obj/item/mecha_parts/mecha_equipment/E in equipment) + for(var/obj/item/vehicle_module/E in equipment) E.detach(loc) E.destroy() for(var/slot in internal_components) - var/obj/item/mecha_parts/component/C = internal_components[slot] + var/obj/item/vehicle_component/C = internal_components[slot] if(istype(C)) C.detach() qdel(C) @@ -386,12 +386,12 @@ // VEHICLE MECHS WHEN? /obj/vehicle/sealed/mecha/proc/create_components() for(var/path in starting_components) - var/obj/item/mecha_parts/component/C = new path(src) + var/obj/item/vehicle_component/C = new path(src) C.attach(src) if(starting_equipment && LAZYLEN(starting_equipment)) for(var/path in starting_equipment) - var/obj/item/mecha_parts/mecha_equipment/ME = new path(src) + var/obj/item/vehicle_module/ME = new path(src) ME.attach(src) /obj/vehicle/sealed/mecha/drain_energy(datum/actor, amount, flags) @@ -476,9 +476,9 @@ /obj/vehicle/sealed/mecha/examine(mob/user, dist) . = ..() - var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/AC = internal_components[MECH_ARMOR] - var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL] + var/obj/item/vehicle_component/hull/HC = internal_components[MECH_HULL] if(AC) . += "It has [AC] attached. [AC.get_efficiency()<0.5?"It is severely damaged.":""]" @@ -509,7 +509,7 @@ . += " It's falling apart. " if(equipment?.len) . += "It's equipped with:" - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) . += "[icon2html(ME, world)] [ME]" /obj/vehicle/sealed/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits. @@ -643,7 +643,7 @@ if(!equipment.len) return - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) ME.MoveAction() /obj/vehicle/sealed/mecha/relaymove(mob/user,direction) @@ -655,7 +655,7 @@ to_chat(user, "You climb out from [src]") return 0 - var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL] + var/obj/item/vehicle_component/hull/HC = internal_components[MECH_HULL] if(!HC) occupant_message("You can't operate an exosuit that doesn't have a hull!") return @@ -678,7 +678,7 @@ return domove(direction) /obj/vehicle/sealed/mecha/proc/can_ztravel() - for(var/obj/item/mecha_parts/mecha_equipment/tool/jetpack/jp in equipment) + for(var/obj/item/vehicle_module/tool/jetpack/jp in equipment) return jp.equip_ready return FALSE @@ -690,7 +690,7 @@ var/tally = 0 if(LAZYLEN(equipment)) - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) if(ME.get_step_delay()) tally += ME.get_step_delay() @@ -700,11 +700,11 @@ tally -= encumbrance_gap for(var/slot in internal_components) - var/obj/item/mecha_parts/component/C = internal_components[slot] + var/obj/item/vehicle_component/C = internal_components[slot] if(C && C.get_step_delay()) tally += C.get_step_delay() - var/obj/item/mecha_parts/component/actuator/actuator = internal_components[MECH_ACTUATOR] + var/obj/item/vehicle_component/actuator/actuator = internal_components[MECH_ACTUATOR] if(!actuator) // Relying purely on hydraulic pumps. You're going nowhere fast. tally = 2 SECONDS @@ -716,9 +716,9 @@ if(strafing) tally = round(tally * actuator.strafing_multiplier) - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) - if(istype(ME, /obj/item/mecha_parts/mecha_equipment/speedboost)) - var/obj/item/mecha_parts/mecha_equipment/speedboost/SB = ME + for(var/obj/item/vehicle_module/ME in equipment) + if(istype(ME, /obj/item/vehicle_module/speedboost)) + var/obj/item/vehicle_module/speedboost/SB = ME for(var/path in ME.required_type) if(istype(src, path)) tally = round(tally * SB.slowdown_multiplier) @@ -820,7 +820,7 @@ return 0 /obj/vehicle/sealed/mecha/proc/handle_equipment_movement() - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) if(ME.chassis == src) //Sanity ME.handle_movement_action() return @@ -910,7 +910,7 @@ if(prob(10)) if(ignore_threshold || src.integrity*100/initial(src.integrity) < src.internal_damage_threshold) - var/obj/item/mecha_parts/mecha_equipment/destr = SAFEPICK(equipment) + var/obj/item/vehicle_module/destr = SAFEPICK(equipment) if(destr) destr.destroy() return @@ -953,7 +953,7 @@ return /obj/vehicle/sealed/mecha/proc/components_handle_damage(var/damage, var/type = DAMAGE_TYPE_BRUTE) - var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/AC = internal_components[MECH_ARMOR] if(AC) var/armor_efficiency = AC.get_efficiency() @@ -961,7 +961,7 @@ AC.damage_part(damage_change, type) damage -= damage_change - var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL] + var/obj/item/vehicle_component/hull/HC = internal_components[MECH_HULL] if(HC) if(HC.integrity) @@ -969,7 +969,7 @@ HC.damage_part(hull_absorb, type) damage -= hull_absorb - for(var/obj/item/mecha_parts/component/C in (internal_components - list(MECH_HULL, MECH_ARMOR))) + for(var/obj/item/vehicle_component/C in (internal_components - list(MECH_HULL, MECH_ARMOR))) if(prob(C.relative_size)) var/damage_part_amt = round(damage / 4, 0.1) C.damage_part(damage_part_amt) @@ -978,7 +978,7 @@ return damage /obj/vehicle/sealed/mecha/proc/get_damage_absorption() - var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/AC = internal_components[MECH_ARMOR] if(!istype(AC)) return @@ -1017,7 +1017,7 @@ user.setClickCooldown(user.get_attack_speed()) src.log_message("Attack by hand/paw. Attacker - [user].",1) - var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/ArmC = internal_components[MECH_ARMOR] var/temp_deflect_chance = deflect_chance @@ -1064,7 +1064,7 @@ //I think this is relative to throws. /obj/vehicle/sealed/mecha/proc/dynhitby(atom/movable/A) - var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/ArmC = internal_components[MECH_ARMOR] var/temp_deflect_chance = deflect_chance var/temp_damage_minimum = damage_minimum @@ -1083,7 +1083,7 @@ temp_minimum_penetration = round(ArmC.get_efficiency() * ArmC.minimum_penetration) temp_fail_penetration_value = round(ArmC.get_efficiency() * ArmC.fail_penetration_value) - if(istype(A, /obj/item/mecha_parts/mecha_tracking)) + if(istype(A, /obj/item/vehicle_tracking_beacon)) A.forceMove(src) src.visible_message("The [A] fastens firmly to [src].") return @@ -1116,7 +1116,7 @@ - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) pass_damage = ME.handle_ranged_contact(A, pass_damage) pass_damage = (pass_damage*pass_damage_reduc_mod)//Applying damage reduction @@ -1131,7 +1131,7 @@ return ..() /obj/vehicle/sealed/mecha/proc/dynbulletdamage(var/obj/projectile/Proj) - var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/ArmC = internal_components[MECH_ARMOR] var/temp_deflect_chance = deflect_chance var/temp_damage_minimum = damage_minimum @@ -1164,7 +1164,7 @@ var/pass_damage = Proj.damage_force var/pass_damage_reduc_mod - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) pass_damage = ME.handle_projectile_contact(Proj, pass_damage) if(pass_damage < temp_damage_minimum)//too pathetic to really damage you. @@ -1207,7 +1207,7 @@ //This refer to whenever you are caught in an explosion. /obj/vehicle/sealed/mecha/legacy_ex_act(severity) - var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/ArmC = internal_components[MECH_ARMOR] var/temp_deflect_chance = deflect_chance @@ -1275,7 +1275,7 @@ src.log_message("Attacked by [W]. Attacker - [user]") var/pass_damage_reduc_mod //Modifer for failing to bring AP. - var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/armor/ArmC = internal_components[MECH_ARMOR] var/temp_deflect_chance = deflect_chance var/temp_damage_minimum = damage_minimum @@ -1316,7 +1316,7 @@ var/pass_damage = W.damage_force pass_damage = (pass_damage*pass_damage_reduc_mod) //Apply the reduction of damage from not having enough armor penetration. This is not regular armor values at play. - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) pass_damage = ME.handle_projectile_contact(W, user, pass_damage) src.take_damage_legacy(pass_damage, W.damage_type) //The take_damage_legacy() proc handles armor values if(pass_damage > internal_damage_minimum) //Only decently painful attacks trigger a chance of mech damage. @@ -1337,8 +1337,8 @@ RA.do_scan(src, user) return - if(istype(W, /obj/item/mecha_parts/mecha_equipment)) - var/obj/item/mecha_parts/mecha_equipment/E = W + if(istype(W, /obj/item/vehicle_module)) + var/obj/item/vehicle_module/E = W if(E.can_attach(src)) if(!user.attempt_insert_item_for_installation(E, src)) return @@ -1348,8 +1348,8 @@ to_chat(user, "You were unable to attach [W] to [src]") return - if(istype(W, /obj/item/mecha_parts/component) && state == MECHA_CELL_OUT) - var/obj/item/mecha_parts/component/MC = W + if(istype(W, /obj/item/vehicle_component) && state == MECHA_CELL_OUT) + var/obj/item/vehicle_component/MC = W if(MC.attach(src)) user.transfer_item_to_loc(W, src, INV_OP_FORCE) user.visible_message("[user] installs \the [W] in \the [src]", "You install \the [W] in \the [src].") @@ -1392,7 +1392,7 @@ else if(state==MECHA_CELL_OUT) var/list/removable_components = list() for(var/slot in internal_components) - var/obj/item/mecha_parts/component/MC = internal_components[slot] + var/obj/item/vehicle_component/MC = internal_components[slot] if(istype(MC)) removable_components[MC.name] = MC else @@ -1402,7 +1402,7 @@ if(!remove) return - var/obj/item/mecha_parts/component/RmC = removable_components[remove] + var/obj/item/vehicle_component/RmC = removable_components[remove] RmC.detach() return @@ -1470,7 +1470,7 @@ to_chat(user, "The [src.name] is at full integrity") return - else if(istype(W, /obj/item/mecha_parts/mecha_tracking)) + else if(istype(W, /obj/item/vehicle_tracking_beacon)) if(!user.attempt_insert_item_for_installation(W, src)) return user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") @@ -1481,7 +1481,7 @@ var/obj/item/stack/nanopaste/NP = W for(var/slot in internal_components) - var/obj/item/mecha_parts/component/C = internal_components[slot] + var/obj/item/vehicle_component/C = internal_components[slot] if(C) @@ -1537,7 +1537,7 @@ /obj/vehicle/sealed/mecha/return_air() RETURN_TYPE(/datum/gas_mixture) - var/obj/item/mecha_parts/component/gas/GC = internal_components[MECH_GAS] + var/obj/item/vehicle_component/gas/GC = internal_components[MECH_GAS] if(use_internal_tank && GC && prob(GC.get_efficiency() * 100)) return cabin_air return loc?.return_air() @@ -1596,7 +1596,7 @@ if(usr != occupant_legacy) return - var/obj/item/mecha_parts/component/gas/GC = internal_components[MECH_GAS] + var/obj/item/vehicle_component/gas/GC = internal_components[MECH_GAS] if(!GC) return @@ -1663,7 +1663,7 @@ if(usr!=src.occupant_legacy) return - var/obj/item/mecha_parts/component/gas/GC = internal_components[MECH_GAS] + var/obj/item/vehicle_component/gas/GC = internal_components[MECH_GAS] if(!GC) to_chat(occupant_legacy, "The life support systems don't seem to respond.") return @@ -1697,7 +1697,7 @@ //returns an equipment object if we have one of that type, useful since is_type_in_list won't return the object //since is_type_in_list uses caching, this is a slower operation, so only use it if needed /obj/vehicle/sealed/mecha/proc/get_equipment(var/equip_type) - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) + for(var/obj/item/vehicle_module/ME in equipment) if(istype(ME,equip_type)) return ME return null @@ -1871,8 +1871,8 @@ var/tank_temperature = internal_tank ? internal_tank.return_temperature() : "Unknown" var/cabin_pressure = round(return_pressure(),0.01) - var/obj/item/mecha_parts/component/hull/HC = internal_components[MECH_HULL] - var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR] + var/obj/item/vehicle_component/hull/HC = internal_components[MECH_HULL] + var/obj/item/vehicle_component/armor/AC = internal_components[MECH_ARMOR] var/output_text = {"[report_internal_damage()] Armor Integrity: [AC?"[round(AC.integrity / AC.integrity_max * 100, 0.1)]%":"ARMOR MISSING"]
@@ -1954,19 +1954,19 @@ output_text += {"
Equipment