Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes merge conflicts from my big ass melee pr #3

Merged
merged 92 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
d37c89b
Bandolier auto-loading (#3324)
Gristlebee Sep 9, 2024
5c8add4
Automatic changelog generation for PR #3324 [ci skip]
actions-user Sep 9, 2024
bf4052d
Automatic changelog compile [ci skip]
actions-user Sep 10, 2024
6b3c4c8
Faction datums for smarter faction logic (#3156)
FalloutFalcon Sep 10, 2024
5d4ad5b
Automatic changelog generation for PR #3156 [ci skip]
actions-user Sep 10, 2024
f2246c5
Crafting Cruft Removal (#3296)
Sadhorizon Sep 10, 2024
d8a47e1
Automatic changelog generation for PR #3296 [ci skip]
actions-user Sep 10, 2024
4f36dfa
Removes Sheetza (#3347)
FalloutFalcon Sep 10, 2024
8c72d71
Automatic changelog generation for PR #3347 [ci skip]
actions-user Sep 10, 2024
a492fec
Automatic changelog compile [ci skip]
actions-user Sep 11, 2024
b44f874
Scarborough Arms (#3336)
rye-rice Sep 12, 2024
b4222cf
Automatic changelog generation for PR #3336 [ci skip]
actions-user Sep 12, 2024
e02e490
Automatic changelog compile [ci skip]
actions-user Sep 13, 2024
0aa2035
Fixes Centcom Ban DB erroring out with bad index (#3337)
ToasterBiome Sep 13, 2024
fe5f948
Automatic changelog generation for PR #3337 [ci skip]
actions-user Sep 13, 2024
ac2885c
fixes no emergency sprite for floor lights (#3349)
FalloutFalcon Sep 13, 2024
95f5db8
Automatic changelog generation for PR #3349 [ci skip]
actions-user Sep 13, 2024
647183d
New items and rebalances for Outpost Cargo Exploration Tab + Undergro…
Gristlebee Sep 13, 2024
c77c910
Automatic changelog generation for PR #3328 [ci skip]
actions-user Sep 13, 2024
bcd38b4
Removes Emotes From Most Reagents (#3317)
MemeSnorfer Sep 13, 2024
3388d91
Automatic changelog generation for PR #3317 [ci skip]
actions-user Sep 13, 2024
2b0ef6e
Automatic changelog compile [ci skip]
actions-user Sep 14, 2024
8e25c0b
useless vars (#3356)
FalloutFalcon Sep 14, 2024
12e2edf
Automatic changelog generation for PR #3356 [ci skip]
actions-user Sep 14, 2024
678ecb1
Fixes double sandwich crafting category (#3357)
trazodont Sep 14, 2024
28e913d
Fixes south-facing subshuttle prechargers (#3355)
Zevotech Sep 14, 2024
e724549
Automatic changelog generation for PR #3355 [ci skip]
actions-user Sep 14, 2024
6da20a7
Bump webpack from 5.75.0 to 5.94.0 in /tgui (#3314)
dependabot[bot] Sep 14, 2024
8740dd7
Gun Safety PSA - Keep your gun safeties on to prevent accidental disc…
Gristlebee Sep 14, 2024
02c8132
Automatic changelog generation for PR #3312 [ci skip]
actions-user Sep 14, 2024
1d23c7c
Bump micromatch from 4.0.4 to 4.0.8 in /tgui (#3316)
dependabot[bot] Sep 14, 2024
1da0895
Automatic changelog compile [ci skip]
actions-user Sep 15, 2024
815a299
Fixes gun misfires always happening (#3363)
Gristlebee Sep 15, 2024
4087e45
Automatic changelog generation for PR #3363 [ci skip]
actions-user Sep 15, 2024
2e4418b
Automatic changelog compile [ci skip]
actions-user Sep 16, 2024
46b6217
Concrete Mix @ Outpost (#3376)
Erikafox Sep 18, 2024
fb59591
Automatic changelog generation for PR #3376 [ci skip]
actions-user Sep 18, 2024
bfbe7eb
Automatic changelog compile [ci skip]
actions-user Sep 18, 2024
8b2faaf
CTF machines are only added to processing when CTF starts (#3360)
FalloutFalcon Sep 18, 2024
29177cb
Automatic changelog generation for PR #3360 [ci skip]
actions-user Sep 18, 2024
e08ed92
Temperature Feedback (#3358)
Gristlebee Sep 18, 2024
737a370
Automatic changelog generation for PR #3358 [ci skip]
actions-user Sep 18, 2024
b937561
Automatic changelog compile [ci skip]
actions-user Sep 19, 2024
bb0ad02
Seperates goggles from the base ballistic helmet. (#3389)
Sadhorizon Sep 20, 2024
c6be4db
Automatic changelog generation for PR #3389 [ci skip]
actions-user Sep 20, 2024
2bcf67a
PGF Turrets (#3381)
Erikafox Sep 20, 2024
54d9c5a
Automatic changelog generation for PR #3381 [ci skip]
actions-user Sep 20, 2024
5b36ab8
Adds Inteq wintercoats and hoodies to the uniform lockers on Inteq sh…
Gristlebee Sep 20, 2024
c79460a
Automatic changelog generation for PR #3344 [ci skip]
actions-user Sep 20, 2024
9b6775a
.45-70 boxes hold 18 instead of 12, .45-70 specialty ammo black marke…
generalthrax Sep 20, 2024
1e3c36c
Add tgfont namespace (#3343)
ZephyrTFA Sep 20, 2024
e4738af
Hardliner Rework DLC: Adds the Hardliner Elite Suit (#3394)
Imaginos16 Sep 20, 2024
0638d3c
Automatic changelog generation for PR #3394 [ci skip]
actions-user Sep 20, 2024
18631e7
Ruin map template tags (#3077)
FalloutFalcon Sep 20, 2024
b7ab315
Automatic changelog generation for PR #3077 [ci skip]
actions-user Sep 20, 2024
150d8fd
Automatic changelog compile [ci skip]
actions-user Sep 21, 2024
3a29bbc
Gorlex DLC 2: Winter Coats! (#3400)
Imaginos16 Sep 21, 2024
21faec6
Automatic changelog generation for PR #3400 [ci skip]
actions-user Sep 21, 2024
9943ca0
Makes Ship Turrets Connectable Without Areas (#3386)
Erikafox Sep 21, 2024
61653ee
Automatic changelog generation for PR #3386 [ci skip]
actions-user Sep 21, 2024
5fcefb2
Panacea is no longer an indie ship. (#3404)
Sadhorizon Sep 21, 2024
d065388
Automatic changelog generation for PR #3404 [ci skip]
actions-user Sep 21, 2024
e03aaab
Automatic changelog compile [ci skip]
actions-user Sep 22, 2024
05f9de1
Adds Flares To Outpost (#3393)
Erikafox Sep 23, 2024
b4148db
Automatic changelog generation for PR #3393 [ci skip]
actions-user Sep 23, 2024
b84274d
Adds new wasteplanet cave type (#3374)
Erikafox Sep 23, 2024
468b8d9
Automatic changelog generation for PR #3374 [ci skip]
actions-user Sep 23, 2024
0f9fe9a
Automatic changelog compile [ci skip]
actions-user Sep 23, 2024
6da28a5
removes the B.E.P.I.S. (#3414)
Thera-Pissed Sep 23, 2024
fa98c06
Automatic changelog generation for PR #3414 [ci skip]
actions-user Sep 23, 2024
8a454ce
Turrets Now Actually Connect To Their Console Consistently (#3412)
Erikafox Sep 23, 2024
6a69402
Automatic changelog generation for PR #3412 [ci skip]
actions-user Sep 23, 2024
505c27d
Changes the color of the text output of health analyzers to be readab…
zimon9 Sep 23, 2024
49305c7
Automatic changelog generation for PR #3411 [ci skip]
actions-user Sep 23, 2024
c333b67
Adds a bunch of kepori underwear (#3392)
thgvr Sep 23, 2024
6e6175a
Automatic changelog generation for PR #3392 [ci skip]
actions-user Sep 23, 2024
fe5e164
Concrete Bags (#3397)
Erikafox Sep 23, 2024
e15913d
Automatic changelog generation for PR #3397 [ci skip]
actions-user Sep 23, 2024
34802c2
Updates Balaclava Sprites (#3409)
Imaginos16 Sep 23, 2024
309385c
Automatic changelog generation for PR #3409 [ci skip]
actions-user Sep 23, 2024
b065692
Miso Soup Spelling Error (#3370)
trazodont Sep 23, 2024
d03c8b8
Automatic changelog generation for PR #3370 [ci skip]
actions-user Sep 23, 2024
d423267
Miskilamo Style Consistency (#3377)
Apogee-dev Sep 23, 2024
73086a9
Automatic changelog generation for PR #3377 [ci skip]
actions-user Sep 23, 2024
643f8fb
removes did_fire variable (#3415)
Thera-Pissed Sep 23, 2024
b364877
Automatic changelog generation for PR #3415 [ci skip]
actions-user Sep 23, 2024
f213d6c
Melee Code Cleanup (#2932)
FalloutFalcon Sep 23, 2024
d7201a1
Automatic changelog generation for PR #2932 [ci skip]
actions-user Sep 23, 2024
33f8664
reduces recruit slots on colossus to 2 (#3416)
thgvr Sep 23, 2024
88a64b8
Automatic changelog generation for PR #3416 [ci skip]
actions-user Sep 23, 2024
585c53a
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Sep 23, 2024
6bfa16c
fixes any errors.
FalloutFalcon Sep 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Faction datums for smarter faction logic (shiptest-ss13#3156)
<!-- 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
A basic datum system for managing factions, currently they are only used
to consistently grab faction 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
Simplify attaching content to factions.

<!-- 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:
add: Added faction datums, this will be cool soon!
/: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. -->

---------

Signed-off-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
  • Loading branch information
FalloutFalcon authored Sep 10, 2024
commit 6b3c4c8988ac63fe2bc8968be1dc05bd1f97a5a8
6 changes: 5 additions & 1 deletion _maps/configs/independent_beluga.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Beluga-class Transport",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": ["CRUISE", "NATURAL"],
"namelists": [
"CRUISE",
"NATURAL"
],
"map_short_name": "Beluga-class",
"map_path": "_maps/shuttles/independent/independent_beluga.dmm",
"description": "The Beluga-Class is a transport vessel for those with especially rich blood. Featuring a modest kitchen, hired Inteq security, and luxurious decoration, the Beluga is a first choice pick for many wealthy spacers trying to get from point A to B. The independent ship features several rooms for its guests and a well furnished meeting room for any corporate occassion.",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_box.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"SPACE",
"NATURAL"
],
"faction": "/datum/faction/independent",
"prefix": "IMV",
"job_slots": {
"Chief Medical Officer": {
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_bubble.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"GENERAL",
"SPACE"
],
"faction": "/datum/faction/independent",
"prefix": "ISV",
"limit": 1,
"job_slots": {
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_dwayne.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Mark.II Dwayne-class Long Range Mining Transport",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_junker.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Junker-class Salvaged Ship",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_kilo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"tags": [
"Mining"
],
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_lagoon.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Lagoon-class Cruise Ship",
"faction": "/datum/faction/independent",
"prefix": "SV",
"description": "An unusual sight in the relatively impoverished Frontier, the Lagoon-class is a large pleasure vessel dedicated to transporting its passengers to any number of exotic locales. Lagoons found on the Frontier tend to contain crews and passengers of a particularly daring – or foolhardy – character, willing to pay out the nose for a tour of some of the most dangerous regions in known space. Accordingly, Lagoons in these regions typically include a small but respectably equipped security contingent to protect (and, when necessary, rein in) the passengers, and come with a surprisingly powerful thermo-electric generator to move the ship’s prodigious bulk across vast expanses of space.",
"tags": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_mudskipper.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Mudskipper-class Salvage Clipper",
"map_short_name": "Mudskipper-class",
"faction": "/datum/faction/independent",
"prefix": "ISV",
"description": "One of the cheapest (and yet, inexplicably popular) offerings from Miskilamo Spacefaring, the Mudskipper-class is a vessel purpose-built for enterprising scrappers and looters looking to salvage bombed-out ruins and harvest boatloads of materials. Featuring a diverse set of multipurpose rooms, a charitable supply of EVA/ruin raiding equipment, and a set of anti-radiation gear for dealing with industrial accidents, the Mudskipper-class just keeps on chuggin’!",
"tags": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_rigger.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Riggs-class Sloop",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_schmiedeberg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Schmiedeberg-class Pharmacology Ship",
"faction": "/datum/faction/independent",
"prefix": "IMV",
"map_short_name": "Schmiedeberg-class",
"description": "Interested in pharmacological science, but tired of sitting in front of a chemistry dispenser and pushing buttons all day? Eager to combine the culinary arts with the narcotic ones? Hoping to combine all of these qualities with the most important activity of all: making fat stacks of dosh? Then the Schmiedeberg-class is for you! Host to a robust ghetto chemistry lab, a high-efficiency botanical set-up and a complete kitchen-and-storefront, the Schmiedeberg is perfect for back-alley chemists and botanists everywhere.",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_shetland.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"map_name": "Shetland-class Multipurpose Frigate",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_sunskipper.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Sunskipper-class Culinary Vessel",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": ["CRUISE", "NATURAL"],
"map_short_name": "Sunskipper-class",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/independent_tranquility.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Tranquility-class Flying Apartment Complex",
"faction": "/datum/faction/independent",
"prefix": "SV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/inteq_colossus.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Colossus-class Armored Frigate",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"description": "The mainstay of Inteq’s mercenary fleet, the Colossus is a professionally-militarized freighter like most of Inteq’s ships, and is designed to operate independently for some time, serving IRMG’s interests and providing vital mercenary services wherever they are needed. Key features include a secure and well-stocked armory and ample crew space, as well as a spacious cargo bay, which crews often refurbish into additional recreational or training space.",
"tags": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/inteq_hound.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"map_name": "Hound-class Corvette",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"namelists": [
"MYTHOLOGICAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/inteq_talos.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Talos-class Command Clipper",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"description": "The Talos is a command and support ship, and a rare example of a purpose-built Inteq ship. Outfitted with an abundance of construction and engineering equipment and a private bluespace communications suite capable of networking IRMG ships across any given system, Taloses are often the lynchpin of coordinated IRMG operations in a system, and offer construction and repair services as part of IRMG’s mercenary offerings. As Talos crews place a larger emphasis on support personnel, they tend to be less well-armed than other Inteq crews. One unusual feature of the Talos is its depressurized “wings” filled with redundant baffles, intended to provide extra durability in the case of impacts or weapons fire. They also double as auxiliary storage space and potential room for modification by their enterprising Artificer crews.",
"tags": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/inteq_valor.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Valor-Class Field Care Cruiser",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"description": "The Valor is the dedicated medical vessel of the Inteq fleet, suitable for treatment both for Inteq combat casualties, or paid treatment of outsiders. It's equipped with high-end medical equipment and a small ambulance for patient transport for this purpose.",
"tags": ["Medical", "Subshuttle"],
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/inteq_vaquero.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Vaquero-class Light Frigate",
"faction": "/datum/faction/inteq",
"prefix": "IRMV",
"description": "The Vaquero is a flexible and cheap military conversion of a light commercial freighter, widely used by Inteq Risk Management Group for picket, reconnaissance, and light escort duty, or for contracts that don't warrant a larger, more specialized ship. Unlike most Inteq ships, the Vaquero features basic medical, engineering, and military equipment all in one package, and its minimal crew requirements are an excellent fit for Vanguards with a smaller command and for training missions. Like its peers, it features a large cargo bay, which can be reconfigured as needed.",
"tags": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/nanotrasen_delta.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Delta-class Frigate",
"faction": "/datum/faction/nt/ns_logi",
"prefix": "NSSV",
"namelists": [
"GENERAL",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/nanotrasen_gecko.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Gecko-class Salvage Runner",
"faction": "/datum/faction/nt",
"prefix": "NTSV",
"namelists": [
"NANOTRASEN",
Expand Down
18 changes: 10 additions & 8 deletions _maps/configs/nanotrasen_heron.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"faction": "/datum/faction/nt",
"prefix": "NTSV",
"namelists": ["WEAPONS"],
"namelists": [
"WEAPONS"
],
"map_name": "Heron-Class Dreadnaught",
"map_short_name": "Heron-class",
"map_path": "_maps/shuttles/nanotrasen/nanotrasen_heron.dmm",
Expand Down Expand Up @@ -33,15 +36,15 @@
"outfit": "/datum/outfit/job/nanotrasen/security",
"slots": 1
},
"ERT Officer":{
"ERT Officer": {
"outfit": "/datum/outfit/job/nanotrasen/security/ert",
"slots": 4
},
"ERT Medical Officer":{
"ERT Medical Officer": {
"outfit": "/datum/outfit/job/nanotrasen/security/ert/med",
"slots": 1
},
"ERT Engineering Officer":{
"ERT Engineering Officer": {
"outfit": "/datum/outfit/job/nanotrasen/security/ert/engi",
"slots": 1
},
Expand All @@ -53,20 +56,19 @@
"outfit": "/datum/outfit/job/nanotrasen/engineer",
"slots": 1
},
"Chief Engineer":{
"Chief Engineer": {
"outfit": "/datum/outfit/job/nanotrasen/ce",
"officer": true,
"slots": 1
},
"Roboticist": {
"outfit":"/datum/outfit/job/nanotrasen/roboticist",
"outfit": "/datum/outfit/job/nanotrasen/roboticist",
"slots": 1
},
"Medical Doctor":{
"Medical Doctor": {
"outfit": "/datum/outfit/job/nanotrasen/doctor",
"slots": 1
},

"Atmospheric Technician": 1,
"Quartermaster": 1,
"Cargo Technician": 1,
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/nanotrasen_meta.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Meta-class Freighter",
"faction": "/datum/faction/nt",
"prefix": "NTSV",
"map_short_name": "Meta-class",
"description": "The Meta-class is a medium freight vessel designed for comfort and sustainability over long journeys of delivering cargo. Most, if not all of these ships are no longer under the direct management of the Company, leaving regulation and professionalism at the behest of individual captains. They can be found running independent contracts, delivering cargo, smuggling illicit goods, and generally trying to stay afloat ever since the collapse of Nanotrasen's operations in the frontier.",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/nanotrasen_mimir.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"faction": "/datum/faction/nt",
"prefix": "NTSV",
"namelists": [
"NANOTRASEN",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/nanotrasen_osprey.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Osprey-class Exploration Cruiser",
"faction": "/datum/faction/nt",
"prefix": "NTSV",
"namelists": [
"NANOTRASEN",
Expand Down
3 changes: 2 additions & 1 deletion _maps/configs/nanotrasen_ranger.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"prefix": "NTSV",
"map_name": "Ranger-class Aid Vessel",
"faction": "/datum/faction/nt",
"prefix": "NTSV",
"namelists": [
"NANOTRASEN",
"NATURAL_AGGRESSIVE",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/nanotrasen_skipper.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Skipper-class Heavy Cruiser",
"faction": "/datum/faction/nt",
"map_short_name": "Skipper-class",
"prefix": "NTSV",
"namelists": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/pgf_crying_sun.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"faction": "/datum/faction/pgf",
"prefix": "PGFN",
"map_name": "Crying Sun-class Light Frigate",
"namelists": [
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/pirate_libertatia.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"tags": [
"Combat"
],
"faction": "/datum/faction/frontier",
"prefix": "ISV",
"namelists": [
"PIRATES",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/pirate_noderider.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Jupiter-class Stormrider",
"map_short_name": "Jupiter-class",
"faction": "/datum/faction/frontier",
"prefix": "ISV",
"namelists": [
"INSTALLATION",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/pirate_tortuga.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Tortuga-class Converted Cargo Freighter",
"faction": "/datum/faction/frontier",
"prefix": "ISV",
"namelists": [
"PIRATES",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/solgov_chronicle.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Chronicle-class Sensor Frigate",
"faction": "/datum/faction/solgov",
"prefix": "SCSV",
"namelists": [
"SOLGOV",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/solgov_inkwell.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Inkwell-class Supply Freighter",
"faction": "/datum/faction/solgov",
"prefix": "SCSV",
"namelists": [
"SOLGOV",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/solgov_paracelsus.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Paracelsus-class Medical Corvette",
"faction": "/datum/faction/solgov",
"prefix": "SCSV",
"namelists": [
"SOLGOV",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/srm_elder.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Elder-class Montagnes' Vessel",
"faction": "/datum/faction/srm",
"prefix": "SRSV",
"namelists": [
"SAINT-ROUMAIN",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_cybersun_kansatsu.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"faction": "/datum/faction/syndicate/cybersun",
"prefix": "CSSV",
"namelists": [
"CYBERSUN",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_gorlex_hyena.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"faction": "/datum/faction/syndicate/ngr",
"prefix": "NGRV",
"namelists": [
"GORLEX",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_gorlex_komodo.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"faction": "/datum/faction/syndicate",
"prefix": "ISV",
"namelists": [
"GORLEX",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_litieguai.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Li Tieguai-class Rescue Ship",
"faction": "/datum/faction/syndicate/cybersun",
"prefix": "CSSV",
"map_short_name": "Li Tieguai-class",
"description": "A small, nimble, and exceptionally well-built medical response vessel, the Li Tieguai is a recent addition to Cybersun’s fleet, forming a critical component of their Frontier stabilization program. Li Tieguais come equipped with high-end medical equipment, including a selection of Cybersun augments and prosthetics, as well as weaponry and armor sufficient to protect its personnel in the often-dangerous Frontier sectors, so that they can offer premium healthcare (at premium prices) in even the most dangerous of scenarios.",
Expand Down
1 change: 1 addition & 0 deletions _maps/configs/syndicate_twinkleshine.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"faction": "/datum/faction/syndicate",
"prefix": "SSV",
"namelists": [
"GORLEX",
Expand Down
1 change: 1 addition & 0 deletions _maps/example_ship_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Example-class Experimental Ship",
"map_short_name": "Test-class",
"faction": "/datum/faction/independent",
"prefix": "STSV",
"namelists": ["GENERAL", "SPACE", "MYTHOLOGICAL", "WEAPONS"],
"map_path": "_maps/shuttles/shiptest/null.dmm",
Expand Down
10 changes: 5 additions & 5 deletions _maps/ship_config_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
"type": "array",
"description": "A list of tags describing the ship's niche, converted into searchable strings."
},
"faction": {
"title": "Ship Faction Datum",
"type": [ "null", "string" ],
"description": "Default faction datum"
},
"prefix": {
"title": "Ship Default Prefix",
"type": [ "null", "string" ],
"description": "The prefix of the ship class, appended to randomly generated names when they're first purchased.",
"maxLength": 5
},
"faction_name": {
"title": "Faction Name",
"type": [ "null", "string" ],
"description": "A custom faction name for the ship class. If exluded or left blank, the ship will use the default faction name for the faction that matches the ship's prefix."
},
"namelists": {
"title": "Namelists",
"type": "array",
Expand Down
2 changes: 1 addition & 1 deletion check_regex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ standards:
- exactly: [4, "/mob text paths", '"/mob']
- exactly: [43, "/obj text paths", '"/obj']
- exactly: [0, "/turf text paths", '"/turf']
- exactly: [116, "text2path uses", "text2path"]
- exactly: [117, "text2path uses", "text2path"]

- exactly: [18, "world<< uses", 'world[ \t]*<<']
- exactly: [0, "world.log<< uses", 'world.log[ \t]*<<']
Expand Down
Loading