forked from shiptest-ss13/Shiptest
-
-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Мердж-с-оффами' of https://github.com/Mirag1993/Shiptes…
…t-mastermind into Мердж-с-оффами
- Loading branch information
Showing
31 changed files
with
2,692 additions
and
88 deletions.
There are no files selected for viewing
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,21 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", | ||
| "map_name": "Hard prison pod", | ||
| "map_short_name": "HPP-class", | ||
| "map_path": "_maps/shuttles/independent/hard_prison_pod.dmm", | ||
| "prefix": "SV", | ||
| "description": " Is it a ship? Oh no...it seems pod.", | ||
| "tags": ["Soloship"], | ||
| "namelists": [ | ||
| "SPACE", | ||
| "NATURAL" | ||
| ], | ||
| "limit": 1, | ||
| "job_slots": { | ||
| "Prisoner": { | ||
| "outfit": "/datum/outfit/job/prisoner", | ||
| "slots": 1 | ||
| } | ||
| }, | ||
| "enabled": true | ||
| } |
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,24 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", | ||
| "map_name": "Acron-class Mercenary Ship", | ||
| "prefix": "ISV", | ||
| "description": "Специальный корабль особого назначения клана Паука для выполнения узконаправленных задач.", | ||
| "tags": [ | ||
| "Боевой", | ||
| "Медицинский" | ||
| ], | ||
| "namelists": [ | ||
| "GENERAL" | ||
| ], | ||
| "map_short_name": "Acron-class", | ||
| "map_path": "_maps/shuttles/independent/independent_acron.dmm", | ||
| "limit": 1, | ||
| "job_slots": { | ||
| "Space Ninja": { | ||
| "outfit": "/datum/outfit/acron_ninja", | ||
| "slots": 2, | ||
| "officer": true | ||
| } | ||
| }, | ||
| "enabled": true | ||
| } |
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,24 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", | ||
| "map_name": "Alone ship", | ||
| "map_short_name": "Alone", | ||
| "map_path": "_maps/shuttles/independent/independent_alone.dmm", | ||
| "prefix": "ISV", | ||
| "description": "A budget ship designed for seasoned space explorers...", | ||
| "tags": [ | ||
| "Soloship" | ||
| ], | ||
| "limit": 1, | ||
| "namelists": [ | ||
| "SPACE", | ||
| "MYTHOLOGICAL" | ||
| ], | ||
| "job_slots": { | ||
| "Loner": { | ||
| "outfit": "/datum/outfit/job/hermit", | ||
| "officer": true, | ||
| "slots": 1 | ||
| } | ||
| }, | ||
| "enabled": true | ||
| } |
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,24 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", | ||
| "map_name": "Omega-class Personal Shuttle", | ||
| "map_short_name": "Omega-class", | ||
| "description": "The Omega is the sports car of space...", | ||
| "tags": [ | ||
| "Generalist" | ||
| ], | ||
| "limit": 1, | ||
| "prefix": "ISV", | ||
| "namelists": [ | ||
| "MYTHOLOGICAL", | ||
| "NATURAL" | ||
| ], | ||
| "map_path": "_maps/shuttles/independent/independent_omega.dmm", | ||
| "job_slots": { | ||
| "Loner": { | ||
| "outfit": "/datum/outfit/job/prison", | ||
| "officer": true, | ||
| "slots": 1 | ||
| } | ||
| }, | ||
| "enabled": true | ||
| } |
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
Oops, something went wrong.