diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm index e871b0ea946..97bec5fc0f9 100644 --- a/_maps/map_files/BigRed_v2/BigRed_v2.dmm +++ b/_maps/map_files/BigRed_v2/BigRed_v2.dmm @@ -11576,7 +11576,7 @@ /turf/open/floor/freezer, /area/bigredv2/caves/lambda_lab) "kuf" = ( -/obj/mecha_wreckage/ripley, +/obj/structure/mecha_wreckage/ripley, /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/cargo) @@ -14405,7 +14405,7 @@ /turf/open/floor, /area/bigredv2/outside/engineering) "rlw" = ( -/obj/mecha_wreckage/seraph, +/obj/structure/mecha_wreckage/seraph, /turf/open/floor/tile/dark, /area/bigredv2/outside/nanotrasen_lab/inside/garbledradio) "rlA" = ( diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm index 5801f153312..5613659a4d0 100644 --- a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm +++ b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm @@ -8809,7 +8809,7 @@ /turf/open/floor/plating/ground/concrete, /area/campaign/jungle_outpost/outpost/req/depot) "Mc" = ( -/obj/mecha_wreckage/durand, +/obj/structure/mecha_wreckage/durand, /turf/open/floor/tile/purple/whitepurple{ dir = 1 }, diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 75f42e19bdb..97711c78dfc 100644 --- a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -32238,7 +32238,7 @@ }, /area/ice_colony/underground/medical/lobby/garbledradio) "woG" = ( -/obj/mecha_wreckage/ripley, +/obj/structure/mecha_wreckage/ripley, /turf/open/floor/plating/ground/snow/layer0, /area/ice_colony/exterior/surface/valley/south) "woW" = ( diff --git a/_maps/map_files/LV624/LV624.dmm b/_maps/map_files/LV624/LV624.dmm index c1525df8876..e9dc0feca5f 100644 --- a/_maps/map_files/LV624/LV624.dmm +++ b/_maps/map_files/LV624/LV624.dmm @@ -8878,7 +8878,7 @@ }, /area/lv624/lazarus/hydroponics/aux) "iud" = ( -/obj/mecha_wreckage/ripley/lv624, +/obj/structure/mecha_wreckage/ripley/lv624, /turf/open/floor/plating/ground/dirt, /area/lv624/ground/sand4) "iuM" = ( diff --git a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm index 6103aed710f..2c9bab5c93e 100644 --- a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm +++ b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm @@ -14953,7 +14953,7 @@ }, /area/shuttle/drop1/lz1) "mMn" = ( -/obj/mecha_wreckage/ripley, +/obj/structure/mecha_wreckage/ripley, /turf/open/floor/mech_bay_recharge_floor, /area/lawankaoutpost/colony/cargo) "mMH" = ( @@ -25824,7 +25824,7 @@ /turf/open/floor/tile/red/whitered, /area/lawankaoutpost/colony/medbay) "vJJ" = ( -/obj/mecha_wreckage/ripley, +/obj/structure/mecha_wreckage/ripley, /turf/open/floor/mech_bay_recharge_floor, /area/lawankaoutpost/colony/mining) "vJM" = ( @@ -26621,7 +26621,7 @@ }, /area/shuttle/drop1/lz1) "wns" = ( -/obj/mecha_wreckage/phazon, +/obj/structure/mecha_wreckage/phazon, /turf/open/floor/mech_bay_recharge_floor, /area/lawankaoutpost/colony/robotics) "wnM" = ( @@ -28029,7 +28029,7 @@ /turf/open/ground/grass/weedable, /area/lawankaoutpost/outside/south) "xxH" = ( -/obj/mecha_wreckage/seraph, +/obj/structure/mecha_wreckage/seraph, /turf/open/floor/tile/dark/yellow2{ dir = 1 }, diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm index 76618408d74..15694d432f9 100644 --- a/_maps/map_files/slumbridge/slumbridge.dmm +++ b/_maps/map_files/slumbridge/slumbridge.dmm @@ -638,7 +638,7 @@ }, /area/slumbridge/inside/sombase/west) "aCj" = ( -/obj/mecha_wreckage/ripley/firefighter, +/obj/structure/mecha_wreckage/ripley/firefighter, /turf/open/floor/plating/ground/concrete, /area/slumbridge/outside/southwest) "aCG" = ( @@ -3645,7 +3645,7 @@ /turf/open/floor/plating, /area/slumbridge/inside/colony/pharmacy) "cIm" = ( -/obj/mecha_wreckage/ripley/lv624, +/obj/structure/mecha_wreckage/ripley/lv624, /turf/open/floor/plating/ground/concrete/edge, /area/slumbridge/outside/southwest) "cIK" = ( @@ -5080,7 +5080,7 @@ /turf/open/ground/grass/weedable, /area/slumbridge/outside/southeast) "dQp" = ( -/obj/mecha_wreckage/ripley/lv624, +/obj/structure/mecha_wreckage/ripley/lv624, /turf/open/floor/plating/ground/concrete, /area/slumbridge/outside/southwest) "dQz" = ( @@ -5358,7 +5358,7 @@ /turf/open/floor/tile/green, /area/slumbridge/inside/houses/recreational) "dYX" = ( -/obj/mecha_wreckage/seraph, +/obj/structure/mecha_wreckage/seraph, /turf/open/floor/plating/platebotc, /area/slumbridge/inside/engi/south) "dZj" = ( @@ -5623,7 +5623,7 @@ /turf/open/floor/plating/ground/mars/random/cave, /area/slumbridge/caves/mining) "emS" = ( -/obj/mecha_wreckage/durand, +/obj/structure/mecha_wreckage/durand, /turf/open/floor/plating/platebotc, /area/slumbridge/inside/engi/south) "enk" = ( @@ -6400,7 +6400,7 @@ }, /area/slumbridge/inside/zeta/south) "eVa" = ( -/obj/mecha_wreckage/mauler, +/obj/structure/mecha_wreckage/mauler, /turf/open/floor/plating/platebotc, /area/slumbridge/inside/engi/south) "eVd" = ( @@ -21882,7 +21882,7 @@ }, /area/slumbridge/inside/prison/outerringsouth) "qkn" = ( -/obj/mecha_wreckage/ripley/lv624, +/obj/structure/mecha_wreckage/ripley/lv624, /turf/open/floor/plating/ground/concrete/edge{ dir = 4 }, @@ -26508,7 +26508,7 @@ /turf/open/floor/plating, /area/slumbridge/inside/pmcdome) "tBA" = ( -/obj/mecha_wreckage/gygax, +/obj/structure/mecha_wreckage/gygax, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/platebotc, /area/slumbridge/inside/engi/south) @@ -31334,7 +31334,7 @@ /turf/open/floor/tile/showroom, /area/slumbridge/inside/engi/west) "xbI" = ( -/obj/mecha_wreckage/marauder, +/obj/structure/mecha_wreckage/marauder, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/platebotc, /area/slumbridge/inside/engi/south) @@ -32293,7 +32293,7 @@ /turf/open/floor/plating, /area/slumbridge/inside/colony/kitchen) "xQE" = ( -/obj/mecha_wreckage/ripley, +/obj/structure/mecha_wreckage/ripley, /turf/open/floor/tile/dark, /area/slumbridge/inside/colony/construction) "xQF" = ( diff --git a/_maps/modularmaps/big_red/bigredofficevar1.dmm b/_maps/modularmaps/big_red/bigredofficevar1.dmm index bf715e87322..31051a36a87 100644 --- a/_maps/modularmaps/big_red/bigredofficevar1.dmm +++ b/_maps/modularmaps/big_red/bigredofficevar1.dmm @@ -495,7 +495,7 @@ /turf/open/floor, /area/bigredv2/outside/office_complex) "vR" = ( -/obj/mecha_wreckage/ripley/firefighter, +/obj/structure/mecha_wreckage/ripley/firefighter, /turf/open/floor/mech_bay_recharge_floor, /area/bigredv2/outside/office_complex) "vU" = ( diff --git a/_maps/modularmaps/big_red/bigredsecornervar6.dmm b/_maps/modularmaps/big_red/bigredsecornervar6.dmm index e8804fc2a3c..797f79cfe98 100644 --- a/_maps/modularmaps/big_red/bigredsecornervar6.dmm +++ b/_maps/modularmaps/big_red/bigredsecornervar6.dmm @@ -388,7 +388,7 @@ /area/bigredv2/caves/secomplex) "wO" = ( /obj/effect/decal/cleanable/cobweb, -/obj/mecha_wreckage/ripley/lv624, +/obj/structure/mecha_wreckage/ripley/lv624, /turf/open/floor/tile/dark, /area/bigredv2/caves/secomplex) "xa" = ( diff --git a/_maps/modularmaps/lv624/newcavevar2.dmm b/_maps/modularmaps/lv624/newcavevar2.dmm index 73fdda5c6e4..e26c863b251 100644 --- a/_maps/modularmaps/lv624/newcavevar2.dmm +++ b/_maps/modularmaps/lv624/newcavevar2.dmm @@ -18,7 +18,7 @@ /area/lv624/ground/caves/central2) "cu" = ( /obj/item/mecha_parts/part/durand_head, -/obj/mecha_wreckage/durand, +/obj/structure/mecha_wreckage/durand, /turf/open/floor/plating/ground/dirt, /area/lv624/ground/caves/central2) "cQ" = ( diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm deleted file mode 100644 index 13f35958931..00000000000 --- a/code/game/mecha/mech_bay.dm +++ /dev/null @@ -1,15 +0,0 @@ - - -/obj/machinery/mech_bay_recharge_port - name = "Mech Bay Power Port" - density = TRUE - anchored = TRUE - icon = 'icons/mecha/mech_bay.dmi' - icon_state = "recharge_port" - -/obj/machinery/computer/mech_bay_power_console - name = "Mech Bay Power Control Console" - density = TRUE - anchored = TRUE - icon = 'icons/obj/machines/computer.dmi' - icon_state = "recharge_comp" diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm deleted file mode 100644 index c5758bdb004..00000000000 --- a/code/game/mecha/mecha_parts.dm +++ /dev/null @@ -1,193 +0,0 @@ -///////////////////////// -////// Mecha Parts ////// -///////////////////////// - -/obj/item/mecha_parts - name = "mecha part" - icon = 'icons/mecha/mech_construct.dmi' - icon_state = "blank" - w_class = WEIGHT_CLASS_HUGE - - -/obj/item/mecha_parts/chassis - name="Mecha Chassis" - icon_state = "backbone" - - -/////////// Ripley - -/obj/item/mecha_parts/chassis/ripley - name = "Ripley Chassis" - - -/obj/item/mecha_parts/part/ripley_torso - name="Ripley Torso" - desc="A torso part of Ripley APLU. Contains power unit, processing core and life support systems." - icon_state = "ripley_harness" - -/obj/item/mecha_parts/part/ripley_left_arm - name="Ripley Left Arm" - desc="A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools." - icon_state = "ripley_l_arm" - -/obj/item/mecha_parts/part/ripley_right_arm - name="Ripley Right Arm" - desc="A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools." - icon_state = "ripley_r_arm" - -/obj/item/mecha_parts/part/ripley_left_leg - name="Ripley Left Leg" - desc="A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems." - icon_state = "ripley_l_leg" - -/obj/item/mecha_parts/part/ripley_right_leg - name="Ripley Right Leg" - desc="A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems." - icon_state = "ripley_r_leg" - -///////// Gygax - -/obj/item/mecha_parts/chassis/gygax - name = "Gygax Chassis" - -/obj/item/mecha_parts/part/gygax_torso - name="Gygax Torso" - desc="A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot." - icon_state = "gygax_harness" - -/obj/item/mecha_parts/part/gygax_head - name="Gygax Head" - desc="A Gygax head. Houses advanced surveilance and targeting sensors." - icon_state = "gygax_head" - -/obj/item/mecha_parts/part/gygax_left_arm - name="Gygax Left Arm" - desc="A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons." - icon_state = "gygax_l_arm" - -/obj/item/mecha_parts/part/gygax_right_arm - name="Gygax Right Arm" - desc="A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons." - icon_state = "gygax_r_arm" - -/obj/item/mecha_parts/part/gygax_left_leg - name="Gygax Left Leg" - icon_state = "gygax_l_leg" - -/obj/item/mecha_parts/part/gygax_right_leg - name="Gygax Right Leg" - icon_state = "gygax_r_leg" - -/obj/item/mecha_parts/part/gygax_armour - name="Gygax Armour Plates" - icon_state = "gygax_armour" - - -//////////// Durand - -/obj/item/mecha_parts/chassis/durand - name = "Durand Chassis" - - -/obj/item/mecha_parts/part/durand_torso - name="Durand Torso" - icon_state = "durand_harness" - -/obj/item/mecha_parts/part/durand_head - name="Durand Head" - icon_state = "durand_head" - -/obj/item/mecha_parts/part/durand_left_arm - name="Durand Left Arm" - icon_state = "durand_l_arm" - -/obj/item/mecha_parts/part/durand_right_arm - name="Durand Right Arm" - icon_state = "durand_r_arm" - -/obj/item/mecha_parts/part/durand_left_leg - name="Durand Left Leg" - icon_state = "durand_l_leg" - -/obj/item/mecha_parts/part/durand_right_leg - name="Durand Right Leg" - icon_state = "durand_r_leg" - -/obj/item/mecha_parts/part/durand_armour - name="Durand Armour Plates" - icon_state = "durand_armour" - - - -////////// Firefighter - -/obj/item/mecha_parts/chassis/firefighter - name = "Firefighter Chassis" - - -////////// Phazon - -/obj/item/mecha_parts/chassis/phazon - name = "Phazon Chassis" - -/obj/item/mecha_parts/part/phazon_torso - name="Phazon Torso" - icon_state = "phazon_harness" - -/obj/item/mecha_parts/part/phazon_head - name="Phazon Head" - icon_state = "phazon_head" - -/obj/item/mecha_parts/part/phazon_left_arm - name="Phazon Left Arm" - icon_state = "phazon_l_arm" - -/obj/item/mecha_parts/part/phazon_right_arm - name="Phazon Right Arm" - icon_state = "phazon_r_arm" - -/obj/item/mecha_parts/part/phazon_left_leg - name="Phazon Left Leg" - icon_state = "phazon_l_leg" - -/obj/item/mecha_parts/part/phazon_right_leg - name="Phazon Right Leg" - icon_state = "phazon_r_leg" - -///////// Odysseus - - -/obj/item/mecha_parts/chassis/odysseus - name = "Odysseus Chassis" - -/obj/item/mecha_parts/part/odysseus_head - name="Odysseus Head" - icon_state = "odysseus_head" - -/obj/item/mecha_parts/part/odysseus_torso - name="Odysseus Torso" - desc="A torso part of Odysseus. Contains power unit, processing core and life support systems." - icon_state = "odysseus_torso" - -/obj/item/mecha_parts/part/odysseus_left_arm - name="Odysseus Left Arm" - desc="An Odysseus left arm. Data and power sockets are compatible with most exosuit tools." - icon_state = "odysseus_l_arm" - -/obj/item/mecha_parts/part/odysseus_right_arm - name="Odysseus Right Arm" - desc="An Odysseus right arm. Data and power sockets are compatible with most exosuit tools." - icon_state = "odysseus_r_arm" - -/obj/item/mecha_parts/part/odysseus_left_leg - name="Odysseus Left Leg" - desc="An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems." - icon_state = "odysseus_l_leg" - -/obj/item/mecha_parts/part/odysseus_right_leg - name="Odysseus Right Leg" - desc="A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems." - icon_state = "odysseus_r_leg" - - - diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm deleted file mode 100644 index 09d35c6119f..00000000000 --- a/code/game/mecha/mecha_wreckage.dm +++ /dev/null @@ -1,68 +0,0 @@ -/////////////////////////////////// -//////// Mecha wreckage //////// -/////////////////////////////////// - - -/obj/mecha_wreckage - name = "Exosuit wreckage" - desc = "Remains of some unfortunate mecha. There is nothing left to Salvage." - icon = 'icons/mecha/mecha.dmi' - hit_sound = 'sound/effects/metal_crash.ogg' - density = TRUE - anchored = FALSE - opacity = FALSE - resistance_flags = XENO_DAMAGEABLE - - -/obj/mecha_wreckage/gygax - name = "Gygax wreckage" - icon_state = "gygax-broken" - -/obj/mecha_wreckage/gygax/dark - name = "Dark Gygax wreckage" - icon_state = "darkgygax-broken" - -/obj/mecha_wreckage/marauder - name = "Marauder wreckage" - icon_state = "marauder-broken" - -/obj/mecha_wreckage/mauler - name = "Mauler Wreckage" - icon_state = "mauler-broken" - desc = "The syndicate won't be very happy about this..." - -/obj/mecha_wreckage/seraph - name = "Seraph wreckage" - icon_state = "seraph-broken" - -/obj/mecha_wreckage/ripley - name = "Ripley wreckage" - icon_state = "ripley-broken" - -/obj/mecha_wreckage/ripley/lv624 - name = "MkIV Powerloader Wreckage" - anchored = TRUE - -/obj/mecha_wreckage/ripley/firefighter - name = "Firefighter wreckage" - icon_state = "firefighter-broken" - -/obj/mecha_wreckage/ripley/deathripley - name = "Death-Ripley wreckage" - icon_state = "deathripley-broken" - -/obj/mecha_wreckage/durand - name = "Durand wreckage" - icon_state = "durand-broken" - -/obj/mecha_wreckage/phazon - name = "Phazon wreckage" - icon_state = "phazon-broken" - - -/obj/mecha_wreckage/odysseus - name = "Odysseus wreckage" - -/obj/mecha_wreckage/hoverpod - name = "Hover pod wreckage" - icon_state = "engineering_pod-broken" diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index de5f7577e82..02171a40982 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -60,7 +60,6 @@ recharging_mech_ref = null recharge_console.update_icon() - /obj/machinery/mech_bay_recharge_port/attackby(obj/item/I, mob/user, params) if(default_change_direction_wrench(user, I)) recharging_turf = get_step(loc, dir) diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm index 147a69d6a65..cda318519dd 100644 --- a/code/modules/vehicles/mecha/mecha_parts.dm +++ b/code/modules/vehicles/mecha/mecha_parts.dm @@ -1,7 +1,3 @@ -///////////////////////// -////// Mecha Parts ////// -///////////////////////// - /obj/item/mecha_parts name = "mecha part" icon = 'icons/mecha/mech_construct.dmi' @@ -52,6 +48,11 @@ desc = "A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_r_leg" +////////// Firefighter + +/obj/item/mecha_parts/chassis/firefighter + name = "\improper Firefighter Chassis" + ///////// Odysseus /obj/item/mecha_parts/chassis/odysseus @@ -64,7 +65,7 @@ /obj/item/mecha_parts/part/odysseus_torso name = "\improper Odysseus torso" - desc="A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper." + desc = "A torso part of Odysseus. Contains power unit, processing core and life support systems along with an attachment port for a mounted sleeper." icon_state = "odysseus_torso" /obj/item/mecha_parts/part/odysseus_left_arm @@ -128,7 +129,6 @@ desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction." icon_state = "gygax_armor" - //////////// Durand /obj/item/mecha_parts/chassis/durand @@ -230,45 +230,44 @@ desc = "A H.O.N.K right leg. The foot appears just large enough to fully accommodate a clown shoe." icon_state = "honker_r_leg" - ////////// Phazon /obj/item/mecha_parts/chassis/phazon name = "\improper Phazon chassis" /obj/item/mecha_parts/part/phazon_torso - name="\improper Phazon torso" - desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle." + name = "\improper Phazon torso" + desc = "A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle." icon_state = "phazon_harness" /obj/item/mecha_parts/part/phazon_head - name="\improper Phazon head" - desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing." + name = "\improper Phazon head" + desc = "A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing." icon_state = "phazon_head" /obj/item/mecha_parts/part/phazon_left_arm - name="\improper Phazon left arm" - desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand." + name = "\improper Phazon left arm" + desc = "A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand." icon_state = "phazon_l_arm" /obj/item/mecha_parts/part/phazon_right_arm - name="\improper Phazon right arm" - desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand." + name = "\improper Phazon right arm" + desc = "A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand." icon_state = "phazon_r_arm" /obj/item/mecha_parts/part/phazon_left_leg - name="\improper Phazon left leg" - desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged." + name = "\improper Phazon left leg" + desc = "A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged." icon_state = "phazon_l_leg" /obj/item/mecha_parts/part/phazon_right_leg - name="\improper Phazon right leg" - desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged." + name = "\improper Phazon right leg" + desc = "A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged." icon_state = "phazon_r_leg" /obj/item/mecha_parts/part/phazon_armor - name="Phazon armor" - desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties." + name = "Phazon armor" + desc = "Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties." icon_state = "phazon_armor" // Savannah-Ivanov @@ -277,38 +276,38 @@ name = "\improper Savannah-Ivanov chassis" /obj/item/mecha_parts/part/savannah_ivanov_torso - name="\improper Savannah-Ivanov torso" - desc="A Savannah-Ivanov torso part. It's missing a huge chunk of space..." + name = "\improper Savannah-Ivanov torso" + desc = "A Savannah-Ivanov torso part. It's missing a huge chunk of space..." icon_state = "savannah_ivanov_harness" /obj/item/mecha_parts/part/savannah_ivanov_head - name="\improper Savannah-Ivanov head" - desc="A Savannah-Ivanov head. It's sensors have been adjusted to support graceful landings." + name = "\improper Savannah-Ivanov head" + desc = "A Savannah-Ivanov head. It's sensors have been adjusted to support graceful landings." icon_state = "savannah_ivanov_head" /obj/item/mecha_parts/part/savannah_ivanov_left_arm - name="\improper Savannah-Ivanov left arm" - desc="A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists." + name = "\improper Savannah-Ivanov left arm" + desc = "A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists." icon_state = "savannah_ivanov_l_arm" /obj/item/mecha_parts/part/savannah_ivanov_right_arm - name="\improper Savannah-Ivanov right arm" - desc="A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists." + name = "\improper Savannah-Ivanov right arm" + desc = "A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists." icon_state = "savannah_ivanov_r_arm" /obj/item/mecha_parts/part/savannah_ivanov_left_leg - name="\improper Savannah-Ivanov left leg" - desc="A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential." + name = "\improper Savannah-Ivanov left leg" + desc = "A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential." icon_state = "savannah_ivanov_l_leg" /obj/item/mecha_parts/part/savannah_ivanov_right_leg - name="\improper Savannah-Ivanov right leg" - desc="A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential." + name = "\improper Savannah-Ivanov right leg" + desc = "A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential." icon_state = "savannah_ivanov_r_leg" /obj/item/mecha_parts/part/savannah_ivanov_armor - name="Savannah-Ivanov armor" - desc="Savannah-Ivanov armor plates. They are uniquely shaped and reinforced to deal with the stresses of two pilots, grandiose leaps, and missiles." + name = "Savannah-Ivanov armor" + desc = "Savannah-Ivanov armor plates. They are uniquely shaped and reinforced to deal with the stresses of two pilots, grandiose leaps, and missiles." icon_state = "savannah_ivanov_armor" ///////// Circuitboards @@ -331,7 +330,6 @@ name = "Ripley Central Control module (Exosuit Board)" icon_state = "mainboard" - /obj/item/circuitboard/mecha/gygax/peripherals name = "Gygax Peripherals Control module (Exosuit Board)" icon_state = "mcontroller" diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm index 3f5c3ddd6b4..0895922dece 100644 --- a/code/modules/vehicles/mecha/mecha_wreckage.dm +++ b/code/modules/vehicles/mecha/mecha_wreckage.dm @@ -1,15 +1,12 @@ -/////////////////////////////////// -//////// Mecha wreckage //////// -/////////////////////////////////// - - /obj/structure/mecha_wreckage name = "exosuit wreckage" desc = "Remains of some unfortunate mecha. Completely irreparable, but perhaps something can be salvaged." icon = 'icons/mecha/mecha.dmi' + hit_sound = 'sound/effects/metal_crash.ogg' density = TRUE anchored = FALSE opacity = FALSE + resistance_flags = XENO_DAMAGEABLE ///list of welder-salvaged items that it can output var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel) /// times we can salvage this mech @@ -136,6 +133,14 @@ name = "\improper Ripley MK-II wreckage" icon_state = "ripleymkii-broken" +/obj/structure/mecha_wreckage/ripley/lv624 + name = "MkIV Powerloader Wreckage" + anchored = TRUE + +/obj/structure/mecha_wreckage/ripley/firefighter + name = "Firefighter wreckage" + icon_state = "firefighter-broken" + /obj/structure/mecha_wreckage/clarke name = "\improper Clarke wreckage" icon_state = "clarke-broken" diff --git a/tgmc.dme b/tgmc.dme index d27df1bceab..a344780b902 100644 --- a/tgmc.dme +++ b/tgmc.dme @@ -642,9 +642,6 @@ #include "code\game\atoms\_atom.dm" #include "code\game\atoms\atom_appearance.dm" #include "code\game\atoms\atom_movable.dm" -#include "code\game\mecha\mech_bay.dm" -#include "code\game\mecha\mecha_parts.dm" -#include "code\game\mecha\mecha_wreckage.dm" #include "code\game\objects\empulse.dm" #include "code\game\objects\explosion.dm" #include "code\game\objects\explosion_recursive.dm"