This repository has been archived by the owner on Feb 16, 2024. It is now read-only.
forked from shiptest-ss13/Shiptest
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into hispaupdate
- Loading branch information
Showing
171 changed files
with
24,555 additions
and
23,626 deletions.
There are no files selected for viewing
2,690 changes: 1,345 additions & 1,345 deletions
2,690
_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
Large diffs are not rendered by default.
Oops, something went wrong.
2,904 changes: 1,466 additions & 1,438 deletions
2,904
_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Large diffs are not rendered by default.
Oops, something went wrong.
9,481 changes: 0 additions & 9,481 deletions
9,481
_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm
This file was deleted.
Oops, something went wrong.
6,293 changes: 6,293 additions & 0 deletions
6,293
_maps/RandomRuins/LavaRuins/lavaland_surface_codelab.dmm
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "$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", | ||
| "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": [ | ||
| "Combat", | ||
| "Engineering", | ||
| "Specialist" | ||
| ], | ||
| "namelists": [ | ||
| "GENERAL", | ||
| "SPACE" | ||
| ], | ||
| "map_path": "_maps/shuttles/shiptest/independent_mudskipper.dmm", | ||
| "roundstart": true, | ||
| "limit": 2, | ||
| "starting_funds": 1500, | ||
| "job_slots": { | ||
| "Salvage Leader": { | ||
| "outfit": "/datum/outfit/job/captain", | ||
| "officer": true, | ||
| "slots": 1 | ||
| }, | ||
| "Salvagee": { | ||
| "outfit": "/datum/outfit/job/engineer/independent/ship_engineer/salvage", | ||
| "slots": 2 | ||
| }, | ||
| "Salvage Technician": { | ||
| "outfit": "/datum/outfit/job/engineer/gloved", | ||
| "slots": 1 | ||
| } | ||
| }, | ||
| "enabled": true | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", | ||
| "map_name": "Vaquero-Class Light Frigate", | ||
| "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": [ | ||
| "Generalist" | ||
| ], | ||
| "namelists": [ | ||
| "BEASTS", | ||
| "INTEQ" | ||
| ], | ||
| "map_short_name": "Vaquero-class", | ||
| "map_path": "_maps/shuttles/shiptest/inteq_vaquero.dmm", | ||
| "limit": 1, | ||
| "job_slots": { | ||
| "Vanguard": { | ||
| "outfit": "/datum/outfit/job/captain/inteq/naked", | ||
| "officer": true, | ||
| "slots": 1 | ||
| }, | ||
| "Master At Arms": { | ||
| "outfit": "/datum/outfit/job/warden/inteq", | ||
| "officer": true, | ||
| "slots": 1 | ||
| }, | ||
| "Artificer": { | ||
| "outfit": "/datum/outfit/job/engineer/inteq", | ||
| "slots": 1 | ||
| }, | ||
| "Corpsman": { | ||
| "outfit": "/datum/outfit/job/paramedic/inteq", | ||
| "slots": 1 | ||
| }, | ||
| "Enforcer": { | ||
| "outfit": "/datum/outfit/job/security/inteq", | ||
| "slots": 1 | ||
| }, | ||
| "Recruit": { | ||
| "outfit": "/datum/outfit/job/assistant/inteq", | ||
| "slots": 2 | ||
| } | ||
| }, | ||
| "enabled": true | ||
| } |
Oops, something went wrong.