Skip to content

Commit

Permalink
Consistent Exosuit Terminology (#3195)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Changes just about every player-facing instance of the word "mech" to
"exosuit." God help me, I did this manually so there shouldn't be any
stupid find-and-replace shenanigans.

## Why It's Good For The Game

Consistent terminology is good, and maybe people will stop thinking the
overgrown power armor is a gundam.

## Changelog

:cl:
fix: Changed almost every player facing instance of the word "mech" to
"exosuit"
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored Aug 3, 2024
1 parent 940a54b commit 6202595
Show file tree
Hide file tree
Showing 44 changed files with 143 additions and 143 deletions.
10 changes: 5 additions & 5 deletions _maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1398,7 +1398,7 @@
dir = 4
},
/obj/machinery/door/airlock/engineering{
name = "Mech Lab";
name = "Exosuit Lab";
dir = 4
},
/obj/machinery/door/firedoor/border_only{
Expand Down Expand Up @@ -2577,7 +2577,7 @@
/area/ruin/wasteplanet/abandoned_mechbay/mechlab)
"DY" = (
/obj/machinery/door/airlock/engineering{
name = "Mech Lab";
name = "Exosuit Lab";
dir = 4
},
/obj/effect/decal/cleanable/glass,
Expand Down Expand Up @@ -2723,7 +2723,7 @@
},
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/human/syndicate/melee{
name = "Syndicate Mech Pilot"
name = "Syndicate Exosuit Pilot"
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
Expand Down Expand Up @@ -2771,7 +2771,7 @@
"Hj" = (
/obj/machinery/light/dim/directional/south,
/mob/living/simple_animal/hostile/human/syndicate/melee{
name = "Syndicate Mech Pilot"
name = "Syndicate Exosuit Pilot"
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ruin/wasteplanet/abandoned_mechbay/bay2)
Expand Down Expand Up @@ -3016,7 +3016,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/directional/south,
/mob/living/simple_animal/hostile/human/syndicate/melee{
name = "Syndicate Mech Pilot"
name = "Syndicate Exosuit Pilot"
},
/turf/open/floor/plasteel/dark,
/area/ruin/wasteplanet/abandoned_mechbay/bay1)
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_rigger.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"NATURAL"
],
"map_short_name": "Riggs-class",
"description": "The Riggs-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, the Riggs offers basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility mech. Thanks to this versatility, the Riggs has become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.",
"description": "The Riggs-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, the Riggs offers basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility exosuit. Thanks to this versatility, the Riggs has become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.",
"tags": [
"Mining",
"Medical",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/nanotrasen_heron.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"outfit": "/datum/outfit/job/nanotrasen/security/ert/engi",
"slots": 1
},
"Mech Pilot":{
"Exosuit Pilot":{
"outfit": "/datum/outfit/job/nanotrasen/security/mech_pilot",
"slots": 1
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/independent/independent_rigger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/door/airlock/mining/glass{
name = "Mech Bay"
name = "Exosuit Bay"
},
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
Expand All @@ -869,7 +869,7 @@
"kG" = (
/obj/machinery/door/poddoor{
id = "riggs_cargo";
name = "Mech Bay Blast Door"
name = "Exosuit Bay Blast Door"
},
/turf/open/floor/engine/hull/interior,
/area/ship/cargo)
Expand Down Expand Up @@ -1488,7 +1488,7 @@
"sT" = (
/obj/machinery/door/poddoor{
id = "riggs_cargo";
name = "Mech Bay Blast Door"
name = "Exosuit Bay Blast Door"
},
/obj/structure/cable{
icon_state = "0-2"
Expand Down Expand Up @@ -3309,7 +3309,7 @@
"Oy" = (
/obj/machinery/door/poddoor{
id = "riggs_cargo";
name = "Mech Bay Blast Door"
name = "Exosuit Bay Blast Door"
},
/obj/structure/cable{
icon_state = "0-2"
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2003,7 +2003,7 @@
dir = 1
},
/obj/machinery/door/airlock/research{
name = "Mech Bay"
name = "Exosuit Bay"
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/science/robotics)
Expand Down Expand Up @@ -3481,7 +3481,7 @@
dir = 1
},
/obj/machinery/door/airlock/research{
name = "Mech Bay"
name = "Exosuit Bay"
},
/turf/open/floor/plasteel/patterned/grid,
/area/ship/science/robotics)
Expand Down Expand Up @@ -4557,7 +4557,7 @@
},
/obj/machinery/door/poddoor{
id = "heron_mechbayshut";
name = "Mechbay Shutters"
name = "Exosuit Bay Shutters"
},
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/science/robotics)
Expand Down Expand Up @@ -7282,7 +7282,7 @@
"AC" = (
/obj/machinery/door/poddoor{
id = "heron_mechbayshut";
name = "Mechbay Shutters"
name = "Exosuit Bay Shutters"
},
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/science/robotics)
Expand Down Expand Up @@ -11850,7 +11850,7 @@
},
/obj/machinery/door/poddoor{
id = "heron_mechbayshut";
name = "Mechbay Shutters"
name = "Exosuit Bay Shutters"
},
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/science/robotics)
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@
/obj/machinery/door/poddoor/shutters{
dir = 8;
id = "syndie_mechbay";
name = "Mechbay"
name = "Exosuit Bay"
},
/obj/machinery/door/firedoor/border_only{
dir = 8
Expand Down Expand Up @@ -2044,7 +2044,7 @@
/obj/machinery/button/door{
dir = 4;
id = "syndie_mechbay";
name = "mechbay door";
name = "Exosuit Bay Door";
pixel_x = -24
},
/obj/item/radio/intercom/directional/south,
Expand Down Expand Up @@ -2099,7 +2099,7 @@
/obj/machinery/button/door{
dir = 8;
id = "syndie_mechbay";
name = "mechbay door";
name = "Exosuit Bay Door";
pixel_x = 24
},
/obj/effect/turf_decal/techfloor{
Expand Down
6 changes: 3 additions & 3 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -625,11 +625,11 @@ so as to remain in compliance with the most up-to-date laws."
if(T)
AI.eyeobj.setLoc(T)

//MECHS
//EXOSUITS

/atom/movable/screen/alert/low_mech_integrity
name = "Mech Damaged"
desc = "Mech integrity is low."
name = "Exosuit Damaged"
desc = "Exosuit integrity is low."
icon_state = "low_mech_integrity"


Expand Down
4 changes: 2 additions & 2 deletions code/datums/ruins/wasteplanet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
suffix = "wasteplanet_unhonorable.dmm"

/datum/map_template/ruin/wasteplanet/abandoned_mechbay
name = "Abandoned Mech Bay"
description = "A military base formerly used for staging 4 mechs and crew. God knows what's in it now."
name = "Abandoned Exosuit Bay"
description = "A military base formerly used for staging 4 exosuits and crew. God knows what's in it now."
id = "abandoned_mechbay"
suffix = "wasteplanet_abandoned_mechbay.dmm"
2 changes: 1 addition & 1 deletion code/game/MapData/shuttles/nanotrasen_ranger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
"}

/obj/item/disk/holodisk/lp/retrieval/phazon
name = "Retrieval Mission Secret Mecha"
name = "Retrieval Mission Secret Exosuit"
desc = "A holodisk containing a retrieval mission for the LP."
preset_image_type = /datum/preset_holoimage/commissioner
preset_record_text = {"
Expand Down
14 changes: 7 additions & 7 deletions code/game/area/areas/ruins/wasteplanet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
//Abandoned Mechbay Ruin

/area/ruin/wasteplanet/abandoned_mechbay/mainhall
name = "Abandoned Mechbay Main Corridor"
name = "Abandoned Exosuit Bay Main Corridor"
icon_state = "hallC"

/area/ruin/wasteplanet/abandoned_mechbay/commandcontrol
name = "Abandoned Mechbay Command and Control"
name = "Abandoned Exosuit Bay Command and Control"
icon_state = "bridge"

/area/ruin/wasteplanet/abandoned_mechbay/bay1
name = "Abandoned Mechbay Upper Hangar"
name = "Abandoned Exosuit Bay Upper Hangar"
icon_state = "mechbay"

/area/ruin/wasteplanet/abandoned_mechbay/bay2
name = "Abandoned Mechbay Lower Hangar"
name = "Abandoned Exosuit Bay Lower Hangar"
icon_state = "mechbay"

/area/ruin/wasteplanet/abandoned_mechbay/crewquarters
name = "Abandoned Mechbay Crew Quarters"
name = "Abandoned Exosuit Bay Crew Quarters"
icon_state = "green"

/area/ruin/wasteplanet/abandoned_mechbay/mechlab
name = "Abandoned Mech Lab"
name = "Abandoned Exosuit Lab"
icon_state = "mechbay"

/area/ruin/wasteplanet/abandoned_mechbay/engineering
name = "Abandoned Mechbay Engineering"
name = "Abandoned Exosuit Bay Engineering"
icon_state = "engine"

//Abandoned Waste Site
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/mecha_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//I'm annoyed I even have to tell you this! SPRITE FIRST, then commit.

/obj/item/mecha_parts/mecha_equipment
name = "mecha equipment"
name = "exosuit equipment"
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_equip"
force = 5
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/tools/weapon_bay.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/mecha_parts/concealed_weapon_bay
name = "concealed weapon bay"
desc = "A compartment that allows a non-combat mecha to equip one weapon while hiding the weapon from plain sight."
desc = "A compartment that allows a civilian exosuit to equip one weapon while hiding the weapon from plain sight."
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_weapon_bay"

Expand Down
4 changes: 2 additions & 2 deletions code/game/mecha/equipment/tools/work_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@

//Dunno where else to put this so shrug
/obj/item/mecha_parts/mecha_equipment/conversion_kit
name = "Mecha Conversion Kit"
desc = "A perfectly generic conversion kit for a perfectly generic mecha. How did you even get this?"
name = "Exosuit Conversion Kit"
desc = "A perfectly generic conversion kit for a perfectly generic exosuit. How did you even get this?"
icon_state = "ripleyupgrade"
var/source_mech = list(null) //must be a list due to the mining ripley existing
var/result_mech = null
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/equipment/weapons/weapons.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/item/mecha_parts/mecha_equipment/weapon
name = "mecha weapon"
name = "exosuit weapon"
range = MECHA_RANGED
destroy_sound = 'sound/mecha/weapdestr.ogg'
var/projectile
Expand Down
12 changes: 6 additions & 6 deletions code/game/mecha/mech_bay.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/turf/open/floor/mech_bay_recharge_floor // Whos idea it was
name = "mech bay recharge station" // Recharging turfs
desc = "Parking a mech on this station will recharge its internal power cell."
name = "exosuit bay recharge station" // Recharging turfs
desc = "Parking an exosuit on this station will recharge its internal power cell."
icon = 'icons/turf/floors.dmi' // That are set in stone to check the west turf for recharge port
icon_state = "recharge_floor" // Some people just want to watch the world burn i guess

Expand All @@ -12,8 +12,8 @@
initial_gas_mix = AIRLESS_ATMOS

/obj/machinery/mech_bay_recharge_port
name = "mech bay power port"
desc = "This port recharges a mech's internal power cell."
name = "exosuit bay power port"
desc = "This port recharges an exosuit's internal power cell."
density = TRUE
dir = EAST
icon = 'icons/mecha/mech_bay.dmi'
Expand Down Expand Up @@ -81,8 +81,8 @@
return ..()

/obj/machinery/computer/mech_bay_power_console
name = "mech bay power control console"
desc = "Displays the status of mechs connected to the recharge station."
name = "exosuit bay power control console"
desc = "Displays the status of exosuits connected to the recharge station."
icon_screen = "recharge_comp"
icon_keyboard = "rd_key"
circuit = /obj/item/circuitboard/computer/mech_bay_power_console
Expand Down
18 changes: 9 additions & 9 deletions code/game/mecha/mecha.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/mecha
name = "mecha"
name = "exosuit"
desc = "Exosuit"
icon = 'icons/mecha/mecha.dmi'
density = TRUE //Dense. To raise the heat.
Expand Down Expand Up @@ -404,13 +404,13 @@
var/integrity = obj_integrity/max_integrity*100
switch(integrity)
if(30 to 45)
occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 1)
occupant.throw_alert("exosuit damage", /atom/movable/screen/alert/low_mech_integrity, 1)
if(15 to 35)
occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 2)
occupant.throw_alert("exosuit damage", /atom/movable/screen/alert/low_mech_integrity, 2)
if(-INFINITY to 15)
occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 3)
occupant.throw_alert("exosuit damage", /atom/movable/screen/alert/low_mech_integrity, 3)
else
occupant.clear_alert("mech damage")
occupant.clear_alert("exosuit damage")
var/atom/checking = occupant.loc
// recursive check to handle all cases regarding very nested occupants,
// such as brainmob inside brainitem inside MMI inside mecha
Expand All @@ -419,7 +419,7 @@
// hit a turf before hitting the mecha, seems like they have
// been moved out
occupant.clear_alert("charge")
occupant.clear_alert("mech damage")
occupant.clear_alert("exosuit damage")
RemoveActions(occupant, human_occupant=1)
occupant = null
break
Expand Down Expand Up @@ -1024,10 +1024,10 @@
final_exit_delay = exit_delay/2

if(do_after(occupant, has_gravity() ? final_exit_delay : 0 , target = src))
to_chat(occupant, "<span class='notice'>You exit the mech.</span>")
to_chat(occupant, "<span class='notice'>You exit the exosuit.</span>")
go_out()
else
to_chat(occupant, "<span class='notice'>You stop exiting the mech. Weapons are enabled again.</span>")
to_chat(occupant, "<span class='notice'>You stop exiting the exosuit. Weapons are enabled again.</span>")
is_currently_ejecting = FALSE

/obj/mecha/Exited(atom/movable/M, atom/newloc)
Expand All @@ -1052,7 +1052,7 @@
return
var/atom/movable/mob_container
occupant.clear_alert("charge")
occupant.clear_alert("mech damage")
occupant.clear_alert("exosuit damage")
if(ishuman(occupant))
mob_container = occupant
RemoveActions(occupant, human_occupant=1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mecha_actions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
return ..()

/datum/action/innate/mecha/mech_eject
name = "Eject From Mech"
name = "Eject From Exosuit"
button_icon_state = "mech_eject"

/datum/action/innate/mecha/mech_eject/Activate()
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mecha_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
to_chat(user, "<span class='notice'>You replace the fused wires.</span>")
else
to_chat(user, "<span class='warning'>You need two lengths of cable to fix this mech!</span>")
to_chat(user, "<span class='warning'>You need two lengths of cable to fix this exosuit!</span>")
return

if(istype(W, /obj/item/mecha_parts))
Expand Down
Loading

0 comments on commit 6202595

Please sign in to comment.