Skip to content

Commit

Permalink
renames and re-lores odysseus and gygax
Browse files Browse the repository at this point in the history
  • Loading branch information
Apogee-dev committed Dec 29, 2024
1 parent 99ff245 commit 8edeae1
Show file tree
Hide file tree
Showing 16 changed files with 108 additions and 108 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3510,7 +3510,7 @@
"PW" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/mecha/combat/gygax{
name = "\improper Gygax #2"
name = "\improper 501p #2"
},
/obj/effect/decal/cleanable/blood/innards,
/turf/open/floor/mech_bay_recharge_floor,
Expand Down
11 changes: 6 additions & 5 deletions code/game/mecha/combat/gygax.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/mecha/combat/gygax
desc = "A lightweight, security exosuit. Popular among private and corporate security."
name = "\improper Gygax"
desc = "A light security exosuit manufactured by Cybersun Biodynamics. The basic version of the 500 Series combat exosuits, the 501p can overload its leg actuators to further enhance mobility."
name = "\improper 501p Security Exosuit"
icon_state = "gygax"
step_in = 3
dir_in = 1 //Facing North.
Expand All @@ -22,10 +22,11 @@
mechstep(direction) //agile mechs get to move and turn in the same step

/obj/mecha/combat/gygax/dark
desc = "A lightweight exosuit, painted in a dark scheme."
name = "\improper Dark Gygax"
desc = "A light combat exosuit manufactured by Cybersun Biodynamics. An exclusive variant of the 500 Series meant for use by Cybersun's own personnel and trusted parties, the 515 EX operates more efficiently in overload mode."
name = "\improper 515 EX Combat Exosuit"
icon_state = "darkgygax"
wreckage = /obj/structure/mecha_wreckage/gygax/dark
leg_overload_coeff = 50

/obj/mecha/combat/gygax/dark/loaded/Initialize()
. = ..()
Expand All @@ -50,7 +51,7 @@

/obj/mecha/combat/gygax/inteq
name = "\improper Basenji"
desc = "A lightweight security exosuit, modified to IRMG standards. The leg actuators have been maxed out, allowing for powerful short ranged charges."
desc = "A light security exosuit originally manufactured by Cybersun Biodynamics, extensively modified by IRMG artificers. The leg actuators have been maxed out, allowing for powerful short ranged charges."
icon_state = "inteqgygax"
charge_break_walls = TRUE
charge_toss_structures = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/tools/work_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@

/obj/item/mecha_parts/mecha_equipment/conversion_kit/inteq_gygax
name = "IRMG Basenji Conversion Kit"
desc = "An IRMG-custom conversion kit for a Gygax combat exosuit, to convert it to the specialized Pyrnese breaching exosuit."
desc = "An IRMG-custom conversion kit for a 500 Series combat exosuit, to convert it to the specialized Basenji breaching exosuit."
source_mech = list(/obj/mecha/combat/gygax,/obj/mecha/combat/gygax/dark)
result_mech = /obj/mecha/combat/gygax/inteq

4 changes: 2 additions & 2 deletions code/game/mecha/mech_fabricator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"Cyborg",
"Ripley",
"Firefighter",
"Odysseus",
"Gygax",
"200 Series",
"500 Series",
"Durand",
"H.O.N.K",
"Phazon",
Expand Down
8 changes: 4 additions & 4 deletions code/game/mecha/mecha_construction_paths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -527,14 +527,14 @@
user.visible_message("<span class='notice'>[user] cuts the internal armor layer from [parent].</span>", "<span class='notice'>You cut the internal armor layer from [parent].</span>")
if(21)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures Gygax Armor Plates.</span>", "<span class='notice'>You secure Gygax Armor Plates.</span>")
user.visible_message("<span class='notice'>[user] secures the armor plates.</span>", "<span class='notice'>You secure the armor plates.</span>")
else
user.visible_message("<span class='notice'>[user] pries Gygax Armor Plates from [parent].</span>", "<span class='notice'>You pry Gygax Armor Plates from [parent].</span>")
user.visible_message("<span class='notice'>[user] pries the armor plates from [parent].</span>", "<span class='notice'>You pry the armor plates from [parent].</span>")
if(22)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] welds Gygax Armor Plates to [parent].</span>", "<span class='notice'>You weld Gygax Armor Plates to [parent].</span>")
user.visible_message("<span class='notice'>[user] welds the armor plates to [parent].</span>", "<span class='notice'>You weld the armor plates to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens Gygax Armor Plates.</span>", "<span class='notice'>You unfasten Gygax Armor Plates.</span>")
user.visible_message("<span class='notice'>[user] unfastens the armor plates.</span>", "<span class='notice'>You unfasten the armor plates.</span>")
return TRUE

/datum/component/construction/unordered/mecha_chassis/firefighter
Expand Down
66 changes: 33 additions & 33 deletions code/game/mecha/mecha_parts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,79 +64,79 @@
///////// Odysseus

/obj/item/mecha_parts/chassis/odysseus
name = "\improper Odysseus chassis"
name = "\improper 200 Series chassis"
construct_type = /datum/component/construction/unordered/mecha_chassis/odysseus

/obj/item/mecha_parts/part/odysseus_head
name = "\improper Odysseus head"
desc = "An Odysseus head. Contains an integrated medical HUD scanner."
name = "\improper 200 Series head"
desc = "A 200 Series head. Contains an integrated medical HUD scanner."
icon_state = "odysseus_head"

/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."
name = "\improper 200 Series torso"
desc="The torso of a 200 Series exosuit. 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
name = "\improper Odysseus left arm"
desc = "An Odysseus left arm. Data and power sockets are compatible with specialized medical equipment."
name = "\improper 200 Series left arm"
desc = "A 200 Series left arm. Data and power sockets are compatible with specialized medical equipment."
icon_state = "odysseus_l_arm"

/obj/item/mecha_parts/part/odysseus_right_arm
name = "\improper Odysseus right arm"
desc = "An Odysseus right arm. Data and power sockets are compatible with specialized medical equipment."
name = "\improper 200 Series right arm"
desc = "A 200 Series right arm. Data and power sockets are compatible with specialized medical equipment."
icon_state = "odysseus_r_arm"

/obj/item/mecha_parts/part/odysseus_left_leg
name = "\improper Odysseus left leg"
desc = "An Odysseus left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
name = "\improper 200 Series left leg"
desc = "A 200 Series left leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
icon_state = "odysseus_l_leg"

/obj/item/mecha_parts/part/odysseus_right_leg
name = "\improper Odysseus right leg"
desc = "An odysseus right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
name = "\improper 200 Series right leg"
desc = "A 200 Series right leg. Contains complex servodrives and balance maintaining systems to maintain stability for critical patients."
icon_state = "odysseus_r_leg"

///////// Gygax

/obj/item/mecha_parts/chassis/gygax
name = "\improper Gygax chassis"
name = "\improper 500 Series chassis"
construct_type = /datum/component/construction/unordered/mecha_chassis/gygax

/obj/item/mecha_parts/part/gygax_torso
name = "\improper Gygax torso"
desc = "A torso part of Gygax. Contains power unit, processing core and life support systems."
name = "\improper 500 Series torso"
desc = "The torso of a 500 Series exosuit. Contains power unit, processing core and life support systems."
icon_state = "gygax_harness"

/obj/item/mecha_parts/part/gygax_head
name = "\improper Gygax head"
desc = "A Gygax head. Houses advanced surveillance and targeting sensors."
name = "\improper 500 Series head"
desc = "A 500 Series head. Houses advanced surveillance and targeting sensors."
icon_state = "gygax_head"

/obj/item/mecha_parts/part/gygax_left_arm
name = "\improper Gygax left arm"
desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons."
name = "\improper 500 Series left arm"
desc = "A 500 Series 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 = "\improper Gygax right arm"
desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons."
name = "\improper 500 Series right arm"
desc = "A 500 Series 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 = "\improper Gygax left leg"
desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
name = "\improper 500 Series left leg"
desc = "A 500 Series left leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
icon_state = "gygax_l_leg"

/obj/item/mecha_parts/part/gygax_right_leg
name = "\improper Gygax right leg"
desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
name = "\improper 500 Series right leg"
desc = "A 500 Series right leg. Constructed with advanced servomechanisms and actuators to enable faster speed."
icon_state = "gygax_r_leg"

/obj/item/mecha_parts/part/gygax_armor
gender = PLURAL
name = "\improper Gygax armor plates"
desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction."
name = "\improper 500 Series armor plates"
desc = "A set of armor plates designed for the 500 Series. Designed to effectively deflect damage with a lightweight construction."
icon_state = "gygax_armor"


Expand Down Expand Up @@ -294,15 +294,15 @@


/obj/item/circuitboard/mecha/gygax/peripherals
name = "Gygax Peripherals Control module (Exosuit Board)"
name = "500 Series Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/gygax/targeting
name = "Gygax Weapon Control and Targeting module (Exosuit Board)"
name = "500 Series Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/gygax/main
name = "Gygax Central Control module (Exosuit Board)"
name = "500 Series Central Control module (Exosuit Board)"
icon_state = "mainboard"

/obj/item/circuitboard/mecha/durand/peripherals
Expand Down Expand Up @@ -330,11 +330,11 @@
icon_state = "mainboard"

/obj/item/circuitboard/mecha/odysseus/peripherals
name = "Odysseus Peripherals Control module (Exosuit Board)"
name = "200 Series Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"

/obj/item/circuitboard/mecha/odysseus/main
name = "Odysseus Central Control module (Exosuit Board)"
name = "200 Series Central Control module (Exosuit Board)"
icon_state = "mainboard"

/obj/item/circuitboard/mecha/phazon/peripherals
Expand Down
7 changes: 3 additions & 4 deletions code/game/mecha/mecha_wreckage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
AI = null

/obj/structure/mecha_wreckage/gygax
name = "\improper Gygax wreckage"
name = "\improper 501p wreckage"
icon_state = "gygax-broken"
parts = list(
/obj/item/mecha_parts/part/gygax_torso,
Expand All @@ -122,7 +122,7 @@
)

/obj/structure/mecha_wreckage/gygax/dark
name = "\improper Dark Gygax wreckage"
name = "\improper 515 EX wreckage"
icon_state = "darkgygax-broken"

/obj/structure/mecha_wreckage/marauder
Expand All @@ -132,7 +132,6 @@
/obj/structure/mecha_wreckage/touro
name = "\improper Touro wreckage"
icon_state = "touro-broken"
desc = "The syndicate won't be very happy about this..."

/obj/structure/mecha_wreckage/seraph
name = "\improper Seraph wreckage"
Expand Down Expand Up @@ -210,7 +209,7 @@


/obj/structure/mecha_wreckage/odysseus
name = "\improper Odysseus wreckage"
name = "\improper 202r wreckage"
icon_state = "odysseus-broken"
parts = list(
/obj/item/mecha_parts/part/odysseus_torso,
Expand Down
4 changes: 2 additions & 2 deletions code/game/mecha/medical/odysseus.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/mecha/medical/odysseus
desc = "These exosuits are developed and produced by Vey-Med. (&copy; All rights reserved)."
name = "\improper Odysseus"
desc = "A high-end utility exosuit manufactured by Cybersun Biodynamics. The general medical variant of the 200 Series, the 202r features a high-speed leg design and advanced stabilization system to move patients safely over rough terrain."
name = "\improper 202r Medical exosuit"
icon_state = "odysseus"
step_in = 2
max_temperature = 15000
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/toy_mechs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
victim.combat_health--

/obj/item/toy/prize/gygax
name = "toy Gygax"
name = "toy 515p"
desc = "4/13"
icon_state = "gygaxtoy"
max_combat_health = 5 //250 integrity
Expand Down Expand Up @@ -544,7 +544,7 @@
special_attack_cry = "BULLET STORM"

/obj/item/toy/prize/odysseus
name = "toy Odysseus"
name = "toy 202r"
desc = "10/13"
icon_state = "odysseustoy"
max_combat_health = 4 //120 integrity
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@

/datum/blackmarket_item/weapon/mecha_weapon_bay
name = "Concealed Weapons Bay"
desc = "Ripley with a laser cannon? Odysseus with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)"
desc = "Ripley with a laser cannon? 200 Series with a missile rack? Sky's the limit with this omni-compatible weapons bay! (Missiles and lasers not included)"
item = /obj/item/mecha_parts/concealed_weapon_bay

price_min = 1000
Expand All @@ -268,7 +268,7 @@

/datum/blackmarket_item/weapon/mecha_syringe_gun
name = "Mounted Syringe Gun"
desc = "We ripped this off an old Nanotrasen exosuit. It's a real advanced piece of equipment. Exosuit not included."
desc = "We ripped this off an old Cybersun exosuit. It's a real advanced piece of equipment. Exosuit not included."
item = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun

price_min = 5000
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cargo/bounties/mech.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
wanted_types = list(/obj/mecha/working/ripley/firefighter)

/datum/bounty/item/mech/odysseus
name = "Odysseus"
name = "200 Series"
reward = 11000
wanted_types = list(/obj/mecha/medical/odysseus)

/datum/bounty/item/mech/gygax
name = "Gygax"
name = "500 Series"
reward = 28000
wanted_types = list(/obj/mecha/combat/gygax)

Expand Down
12 changes: 6 additions & 6 deletions code/modules/cargo/packs/mechs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Build Your Own Suit
crate_name = "APLU construction kit"

/datum/supply_pack/mech/odysseus_parts
name = "Odysseus construction kit"
desc = "DeForest Medical's premier solution to on the go medical treatment. Some assembly required."
name = "202r construction kit"
desc = "Cybersun Biodynamics' premier solution to on-the-go medical treatment. Some assembly required."
cost = 5000
contains = list(
/obj/item/mecha_parts/chassis/odysseus,
Expand All @@ -52,11 +52,11 @@ Build Your Own Suit
/obj/item/circuitboard/mecha/odysseus/peripherals,
/obj/item/circuitboard/mecha/odysseus/main
)
crate_name = "Odysseus Construction Kit"
crate_name = "202r Construction Kit"

/datum/supply_pack/mech/gygax_parts
name = "Gygax construction kit"
desc = "An agile exosuit made famous by Nanotrasen security personnel during the ICW. Or at least the parts to it."
name = "501p construction kit"
desc = "An agile combat exosuit sold across the galaxy by Cybersun. Or at least the parts to it."
cost = 12000
contains = list(
/obj/item/mecha_parts/chassis/gygax,
Expand All @@ -71,7 +71,7 @@ Build Your Own Suit
/obj/item/circuitboard/mecha/gygax/main,
/obj/item/circuitboard/mecha/gygax/targeting
)
crate_name = "Gygax Construction Kit"
crate_name = "501p Construction Kit"

/datum/supply_pack/mech/durand_parts
name = "Durand construction kit"
Expand Down
16 changes: 8 additions & 8 deletions code/modules/research/designs/mecha_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,40 @@
category = list("Exosuit Modules")

/datum/design/board/odysseus_main
name = "\"Odysseus\" Central Control module"
name = "200 Series Central Control module"
desc = "Allows for the construction of a \"Odysseus\" Central Control module."
id = "odysseus_main"
build_path = /obj/item/circuitboard/mecha/odysseus/main
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL

/datum/design/board/odysseus_peri
name = "\"Odysseus\" Peripherals Control module"
name = "200 Series Peripherals Control module"
desc = "Allows for the construction of a \"Odysseus\" Peripheral Control module."
id = "odysseus_peri"
build_path = /obj/item/circuitboard/mecha/odysseus/peripherals
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL

/datum/design/board/gygax_main
name = "\"Gygax\" Central Control module"
desc = "Allows for the construction of a \"Gygax\" Central Control module."
name = "500 Series Central Control module"
desc = "Allows for the construction of a 500 Series Central Control module."
id = "gygax_main"
build_path = /obj/item/circuitboard/mecha/gygax/main
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/board/gygax_peri
name = "\"Gygax\" Peripherals Control module"
desc = "Allows for the construction of a \"Gygax\" Peripheral Control module."
name = "500 Series Peripherals Control module"
desc = "Allows for the construction of a 500 Series Peripheral Control module."
id = "gygax_peri"
build_path = /obj/item/circuitboard/mecha/gygax/peripherals
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/board/gygax_targ
name = "\"Gygax\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"Gygax\" Weapons & Targeting Control module."
name = "500 Series Weapons & Targeting Control module"
desc = "Allows for the construction of a 500 Series Weapons & Targeting Control module."
id = "gygax_targ"
build_path = /obj/item/circuitboard/mecha/gygax/targeting
category = list("Exosuit Modules")
Expand Down
Loading

0 comments on commit 8edeae1

Please sign in to comment.