From 0de551448e8049f541f57b879b5dd9b2c6866ac9 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Sat, 23 Nov 2024 11:43:09 -0500 Subject: [PATCH] refactor: move damaged ruin ripley to subtype (#27294) * refactor: move damaged ruin ripley to subtype * set script PR number * derp * fix typepath --- .../LavaRuins/lavaland_biodome_winter.dmm | 2 +- .../lavaland_surface_random_ripley.dmm | 4 +-- code/game/mecha/mecha.dm | 1 - code/game/mecha/working/ripley.dm | 28 ++++++++++++++++++- .../UpdatePaths/Scripts/27294_old_ripley.txt | 1 + 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/27294_old_ripley.txt diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm index 3ff7e1339be..2ee5cb13371 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm @@ -169,7 +169,7 @@ /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aL" = ( -/obj/mecha/working/ripley/mining, +/obj/mecha/working/ripley/mining/old, /turf/simulated/floor/wood, /area/ruin/powered/snow_cabin) "aM" = ( diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm index 89e6e5f92d5..48d956fc429 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm @@ -9,9 +9,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "d" = ( -/obj/mecha/working/ripley/mining{ - ruin_mecha = 1 - }, +/obj/mecha/working/ripley/mining/old, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "e" = ( diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9ab8e2b0905..4065b6acef8 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -16,7 +16,6 @@ armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, rad = 0, fire = 100, acid = 75) bubble_icon = "machine" var/list/facing_modifiers = list(MECHA_FRONT_ARMOUR = 1.5, MECHA_SIDE_ARMOUR = 1, MECHA_BACK_ARMOUR = 0.5) - var/ruin_mecha = FALSE //if the mecha starts on a ruin, don't automatically give it a tracking beacon to prevent metagaming. var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items) var/can_move = 0 // time of next allowed movement /// Time it takes to enter the mech diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index e73662442d6..c272b8cd577 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -196,14 +196,40 @@ An altercation even occurred where an individual dressed in a poorly-made Killjoy costume attempted to kill a collector to gain a Death Ripley, who was later sent to a mental institution after screaming, “THE DEATHSQUAD IS REAL." /obj/mecha/working/ripley/mining + name = "APLU \"Miner\"" + +/obj/mecha/working/ripley/mining/proc/prepare_equipment() + SHOULD_CALL_PARENT(FALSE) + + // Diamond drill as a treat + var/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill/D = new + D.attach(src) + + // Add ore box to cargo + cargo.Add(new /obj/structure/ore_box(src)) + + // Attach hydraulic clamp + var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new + HC.attach(src) + + var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new + scanner.attach(src) + +/obj/mecha/working/ripley/mining/Initialize(mapload) + . = ..() + prepare_equipment() + +/obj/mecha/working/ripley/mining/old desc = "An old, dusty mining ripley." name = "APLU \"Miner\"" obj_integrity = 75 //Low starting health -/obj/mecha/working/ripley/mining/Initialize(mapload) +/obj/mecha/working/ripley/mining/old/add_cell() . = ..() if(cell) cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge + +/obj/mecha/working/ripley/mining/old/prepare_equipment() //Attach drill if(prob(70)) //Maybe add a drill if(prob(15)) //Possible diamond drill... Feeling lucky? diff --git a/tools/UpdatePaths/Scripts/27294_old_ripley.txt b/tools/UpdatePaths/Scripts/27294_old_ripley.txt new file mode 100644 index 00000000000..d040b735d21 --- /dev/null +++ b/tools/UpdatePaths/Scripts/27294_old_ripley.txt @@ -0,0 +1 @@ +/obj/mecha/working/ripley/mining : /obj/mecha/working/ripley/mining/old