Skip to content

Commit

Permalink
refactor multiple files concerning robot and mechs. (#5538)
Browse files Browse the repository at this point in the history
# About the pull request
Also refactored a lot of the code to be more clear and clean...
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
del: Removed "security robot module" from robot_module.dm
refactor: change the name of Ripley in game to P-1000, gygax to MAX,
Durand to MOX, Odysseus to Alice to be more in line with the lore.
/:cl:

---------

Co-authored-by: Julien <[email protected]>
  • Loading branch information
Huffie56 and Julien authored Jan 31, 2024
1 parent 62e83cd commit 3a17276
Show file tree
Hide file tree
Showing 9 changed files with 228 additions and 300 deletions.
12 changes: 6 additions & 6 deletions code/game/objects/effects/decals/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@
return ..()

/obj/effect/decal/mecha_wreckage/gygax
name = "Gygax wreckage"
name = "MAX wreckage"
icon_state = "gygax-broken"

/obj/effect/decal/mecha_wreckage/gygax/dark
name = "Dark Gygax wreckage"
name = "Dark MAX wreckage"
icon_state = "darkgygax-broken"

/obj/effect/decal/mecha_wreckage/marauder
Expand All @@ -116,27 +116,27 @@
icon_state = "seraph-broken"

/obj/effect/decal/mecha_wreckage/ripley
name = "Ripley wreckage"
name = "P-1000 wreckage"
icon_state = "ripley-broken"

/obj/effect/decal/mecha_wreckage/ripley/firefighter
name = "Firefighter wreckage"
icon_state = "firefighter-broken"

/obj/effect/decal/mecha_wreckage/ripley/deathripley
name = "Death-Ripley wreckage"
name = "Death-P-1000 wreckage"
icon_state = "deathripley-broken"

/obj/effect/decal/mecha_wreckage/durand
name = "Durand wreckage"
name = "MOX wreckage"
icon_state = "durand-broken"

/obj/effect/decal/mecha_wreckage/phazon
name = "Phazon wreckage"
icon_state = "phazon-broken"

/obj/effect/decal/mecha_wreckage/odysseus
name = "Odysseus wreckage"
name = "Alice wreckage"
icon_state = "odysseus-broken"

/obj/effect/decal/mecha_wreckage/hoverpod
Expand Down
102 changes: 31 additions & 71 deletions code/game/objects/items/circuitboards/mecha.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

///////// Circuitboards

/obj/item/circuitboard/mecha
/obj/item/circuitboard/exosuit
name = "Exosuit Circuit board"
icon_state = "std_mod"
force = 5
Expand All @@ -10,71 +7,34 @@
throw_speed = SPEED_VERY_FAST
throw_range = 15

/obj/item/circuitboard/mecha/ripley


/obj/item/circuitboard/mecha/ripley/peripherals
name = "Circuit board (Ripley Peripherals Control module)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/ripley/main
name = "Circuit board (Ripley Central Control module)"
icon_state = "mainboard"

/obj/item/circuitboard/mecha/gygax


/obj/item/circuitboard/mecha/gygax/peripherals
name = "Circuit board (Gygax Peripherals Control module)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/gygax/targeting
name = "Circuit board (Gygax Weapon Control and Targeting module)"
icon_state = "mcontroller"


/obj/item/circuitboard/mecha/gygax/main
name = "Circuit board (Gygax Central Control module)"
icon_state = "mainboard"

/obj/item/circuitboard/mecha/durand


/obj/item/circuitboard/mecha/durand/peripherals
name = "Circuit board (Durand Peripherals Control module)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/durand/targeting
name = "Circuit board (Durand Weapon Control and Targeting module)"
icon_state = "mcontroller"


/obj/item/circuitboard/mecha/durand/main
name = "Circuit board (Durand Central Control module)"
icon_state = "mainboard"

/obj/item/circuitboard/mecha/honker


/obj/item/circuitboard/mecha/honker/peripherals
name = "Circuit board (H.O.N.K Peripherals Control module)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/honker/targeting
name = "Circuit board (H.O.N.K Weapon Control and Targeting module)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/honker/main
name = "Circuit board (H.O.N.K Central Control module)"
icon_state = "mainboard"

/obj/item/circuitboard/mecha/odysseus


/obj/item/circuitboard/mecha/odysseus/peripherals
name = "Circuit board (Odysseus Peripherals Control module)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/odysseus/main
name = "Circuit board (Odysseus Central Control module)"
// that's the two possible exosuit boards icon_state.
/obj/item/circuitboard/exosuit/main
icon_state = "mainboard"
/obj/item/circuitboard/exosuit/peripherals
icon_state = "mcontroller"

// P-1000 Older version of the P-5000
/obj/item/circuitboard/exosuit/main/work_loader
name = "Circuit board (P-1000 Central Control module)"
/obj/item/circuitboard/exosuit/peripherals/work_loader
name = "Circuit board (P-1000 Peripherals Control module)"

// MAX (Mobile Assault Exo-Warrior)look like a gygax from afar
/obj/item/circuitboard/exosuit/main/max
name = "Circuit board (Max Central Control module)"
/obj/item/circuitboard/exosuit/peripherals/max
name = "Circuit board (Max Peripherals Control module)"
/obj/item/circuitboard/exosuit/peripherals/max/targeting
name = "Circuit board (Max Weapon Control and Targeting module)"

// MOX (mobile offensive exo-warrior) look like a durand from afar.
/obj/item/circuitboard/exosuit/main/mox
name = "Circuit board (Mox Central Control module)"
/obj/item/circuitboard/exosuit/peripherals/mox
name = "Circuit board (Mox Peripherals Control module)"

// Alice it's an exosuit featured in alien versus predator 2 doesn't look like an odysseus but is a name in CM lore.
/obj/item/circuitboard/exosuit/main/alice
name = "Circuit board (Alice Central Control module)"
/obj/item/circuitboard/exosuit/peripherals/alice
name = "Circuit board (Alice Peripherals Control module)"
2 changes: 0 additions & 2 deletions code/game/objects/items/circuitboards/robot_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
name = "medic robot module"
/obj/item/circuitboard/robot_module/engineering
name = "engineering robot module"
/obj/item/circuitboard/robot_module/security
name = "security robot module"
/obj/item/circuitboard/robot_module/janitor
name = "janitorial robot module"
/obj/item/circuitboard/robot_module/butler
Expand Down
175 changes: 175 additions & 0 deletions code/game/objects/structures/prop_mech.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
/obj/structure/prop/mech
icon = 'icons/obj/structures/props/mech.dmi'

/obj/structure/prop/mech/hydralic_clamp
name = "Hydraulic Clamp"
icon_state = "mecha_clamp"

/obj/structure/prop/mech/drill
name = "Drill"
desc = "This is the drill that'll pierce the heavens!"
icon_state = "mecha_drill"

/obj/structure/prop/mech/armor_booster
name = "Armor Booster Module (Close Combat Weaponry)"
desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
icon_state = "mecha_abooster_ccw"

/obj/structure/prop/mech/repair_droid
name = "Repair Droid"
desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage."
icon_state = "repair_droid"

/obj/structure/prop/mech/tesla_energy_relay
name = "Energy Relay"
desc = "Wirelessly drains energy from any available power channel in area. The performance index is quite low."
icon_state = "tesla"

/obj/structure/prop/mech/parts
name = "mecha part"
flags_atom = FPRINT|CONDUCT

/obj/structure/prop/mech/parts/chassis
name="Mecha Chassis"
icon_state = "backbone"

// ripley to turn into P-1000 an Older version of the P-5000 to anchor it more into the lore...
/obj/structure/prop/mech/parts/chassis/ripley
name = "P-1000 Chassis"
icon_state = "ripley_chassis"
/obj/structure/prop/mech/parts/chassis/firefighter
name = "Firefighter Chassis"
icon_state = "ripley_chassis"
/obj/structure/prop/mech/parts/ripley_torso
name="P-1000 Torso"
desc="A torso part of P-1000 APLU. Contains power unit, processing core and life support systems."
icon_state = "ripley_harness"
/obj/structure/prop/mech/parts/ripley_left_arm
name="P-1000 Left Arm"
desc="A P-1000 APLU left arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_l_arm"
/obj/structure/prop/mech/parts/ripley_right_arm
name="P-1000 Right Arm"
desc="A P-1000 APLU right arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_r_arm"
/obj/structure/prop/mech/parts/ripley_left_leg
name="P-1000 Left Leg"
desc="A P-1000 APLU left leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "ripley_l_leg"
/obj/structure/prop/mech/parts/ripley_right_leg
name="P-1000 Right Leg"
desc="A P-1000 APLU right leg. Contains somewhat complex servodrives and balance maintaining systems."
icon_state = "ripley_r_leg"

//gygax turned into MAX (Mobile Assault Exo-Warrior)look like a gygax from afar
/obj/structure/prop/mech/parts/chassis/gygax
name = "MAX Chassis"
icon_state = "gygax_chassis"
/obj/structure/prop/mech/parts/gygax_torso
name="MAX Torso"
desc="A torso part of MAX. Contains power unit, processing core and life support systems. Has an additional equipment slot."
icon_state = "gygax_harness"
/obj/structure/prop/mech/parts/gygax_head
name="MAX Head"
desc="A MAX head. Houses advanced surveilance and targeting sensors."
icon_state = "gygax_head"
/obj/structure/prop/mech/parts/gygax_left_arm
name="MAX Left Arm"
desc="A MAX left arm. Data and power sockets are compatible with most exosuit tools and weapons."
icon_state = "gygax_l_arm"
/obj/structure/prop/mech/parts/gygax_right_arm
name="MAX Right Arm"
desc="A MAX right arm. Data and power sockets are compatible with most exosuit tools and weapons."
icon_state = "gygax_r_arm"
/obj/structure/prop/mech/parts/gygax_left_leg
name="MAX Left Leg"
icon_state = "gygax_l_leg"
/obj/structure/prop/mech/parts/gygax_right_leg
name="MAX Right Leg"
icon_state = "gygax_r_leg"
/obj/structure/prop/mech/parts/gygax_armor
name="MAX Armor Plates"
icon_state = "gygax_armor"

// durand MOX (mobile offensive exo-warrior) look like a durand from afar.
/obj/structure/prop/mech/parts/chassis/durand
name = "MOX Chassis"
icon_state = "durand_chassis"
/obj/structure/prop/mech/parts/durand_torso
name="MOX Torso"
icon_state = "durand_harness"
/obj/structure/prop/mech/parts/durand_head
name="MOX Head"
icon_state = "durand_head"
/obj/structure/prop/mech/parts/durand_left_arm
name="MOX Left Arm"
icon_state = "durand_l_arm"
/obj/structure/prop/mech/parts/durand_right_arm
name="MOX Right Arm"
icon_state = "durand_r_arm"
/obj/structure/prop/mech/parts/durand_left_leg
name="MOX Left Leg"
icon_state = "durand_l_leg"
/obj/structure/prop/mech/parts/durand_right_leg
name="MOX Right Leg"
icon_state = "durand_r_leg"
/obj/structure/prop/mech/parts/durand_armor
name="MOX Armor Plates"
icon_state = "durand_armor"

// phazon currently not in use. could be deleted...
/obj/structure/prop/mech/parts/chassis/phazon
name = "Phazon Chassis"
icon_state = "phazon_chassis"
/obj/structure/prop/mech/parts/phazon_torso
name="Phazon Torso"
icon_state = "phazon_harness"
/obj/structure/prop/mech/parts/phazon_head
name="Phazon Head"
icon_state = "phazon_head"
/obj/structure/prop/mech/parts/phazon_left_arm
name="Phazon Left Arm"
icon_state = "phazon_l_arm"
/obj/structure/prop/mech/parts/phazon_right_arm
name="Phazon Right Arm"
icon_state = "phazon_r_arm"
/obj/structure/prop/mech/parts/phazon_left_leg
name="Phazon Left Leg"
icon_state = "phazon_l_leg"
/obj/structure/prop/mech/parts/phazon_right_leg
name="Phazon Right Leg"
icon_state = "phazon_r_leg"
/obj/structure/prop/mech/parts/phazon_armor_plates
name="Phazon Armor Plates"
icon_state = "phazon_armor"

// odysseus currently not in use could be deleted...
/obj/structure/prop/mech/parts/chassis/odysseus
name = "Odysseus Chassis"
icon_state = "odysseus_chassis"
/obj/structure/prop/mech/parts/odysseus_head
name="Odysseus Head"
icon_state = "odysseus_head"
/obj/structure/prop/mech/parts/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/structure/prop/mech/parts/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/structure/prop/mech/parts/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/structure/prop/mech/parts/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/structure/prop/mech/parts/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"
/obj/structure/prop/mech/parts/odysseus_armor_plates
name="Odysseus Armor Plates"
icon_state = "odysseus_armor"
Loading

0 comments on commit 3a17276

Please sign in to comment.