Skip to content

Commit

Permalink
Merge pull request #821 from molnizz/cringe14
Browse files Browse the repository at this point in the history
Limit ship 1
  • Loading branch information
RalseiDreemuurr authored Jul 11, 2024
2 parents 3f81cd7 + fc806d8 commit 1185d3a
Show file tree
Hide file tree
Showing 41 changed files with 41 additions and 14 deletions.
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/elysium_iron_maiden.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"NATURAL_AGGRESSIVE"
],
"map_path": "_maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm",
"limit": 2,
"limit": 1,
"job_slots": {
"Caid": {
"outfit": "/datum/outfit/job/independent/assistant",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_beluga.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"Service"
],
"starting_funds": 4000,
"limit": 2,
"limit": 1,
"roundstart": true,
"job_slots": {
"Captain": {
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_box.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"NATURAL"
],
"prefix": "IMV",
"limit": 1,
"job_slots": {
"Chief Medical Officer": {
"outfit": "/datum/outfit/job/independent/cmo",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_boyardee.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"MERCANTILE"
],
"starting_funds": 5000,
"limit": 1,
"map_short_name": "Boyardee-class",
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_boyardee.dmm",
"job_slots": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_bulk_track.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Survival",
"Transportation"
],
"limit": 3,
"limit": 1,
"namelists": [
"GENERAL",
"SPACE",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_byo.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"GENERAL"
],
"prefix": "ISV",
"limit": 1,
"job_slots": {
"Architect": {
"outfit": "/datum/outfit/job/independent/ce",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_caravan.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"NATURAL"
],
"roundstart": true,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_escapepod.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
],
"map_short_name": "Escape Pod",
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_halftrack.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"Cargo"
],
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_kilo.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"map_short_name": "Kilo-class",
"starting_funds": 1500,
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_kilo.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_koi.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"NATURAL"
],
"prefix": "IMV",
"limit": 1,
"job_slots": {
"Chief Medical Officer": {
"outfit": "/datum/outfit/job/independent/cmo",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_lagoon.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"map_short_name": "Lagoon-class",
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm",
"starting_funds": 3000,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_masinyane.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"NATURAL"
],
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_masinyane.dmm",
"limit": 1,
"job_slots": {
"Private Ship Owner": {
"outfit": "/datum/outfit/job/independent/captain/masinyane",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_mimos.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"SPACE"
],
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_mimos.dmm",
"limit": 2,
"limit": 1,
"job_slots": {
"Master Mime": {
"outfit": "/datum/outfit/job/mime/captain",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_module.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"NATURAL"
],
"prefix": "IMV",
"limit": 1,
"job_slots": {
"ERT": {
"outfit": "/datum/outfit/centcom/ert/engineer",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_mudskipper.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_mudskipper.dmm",
"roundstart": true,
"limit": 2,
"limit": 1,
"starting_funds": 1500,
"job_slots": {
"Salvage Leader": {
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_nemo.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
],
"starting_funds": 500,
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_nemo.dmm",
"limit": 1,
"job_slots": {
"Research Director": {
"outfit": "/datum/outfit/job/independent/rd",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_qurk.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"BEASTS",
"NATURAL_AGGRESSIVE"
],
"limit": 1,
"job_slots": {
"Chief Medical Director": {
"outfit": "/datum/outfit/job/cmo",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_radio.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"starting_funds": 5000,
"description": "Редкий корабль, который появляется в секторе и собирая информацию из самых горячих точек транслирует новости на весь сектор. Экипаж может быть настолько приставучим, что пристыковываются прямо к кораблям, которые подвергаются обстрелу. В экипаже помимо капитана есть детектив, что достаёт больше информации, чем кто либо и инженер, что следит за работоспособностью телекомов",
"tags": ["Specialist"],
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_ramo.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm",
"roundstart": true,
"starting_funds": 2000,
"limit": 2,
"limit": 1,
"job_slots": {
"Salvage Leader": {
"outfit": "/datum/outfit/job/captain",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_schmiedeberg.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"SUNS",
"GENERAL"
],
"limit": 2,
"limit": 1,
"job_slots": {
"Chief Pharmacist": {
"outfit": "/datum/outfit/job/independent/cmo/pharma",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_sfwb.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"NATURAL"
],
"prefix": "ISV",
"limit": 1,
"job_slots": {
"Chem-chef": {
"outfit": "/datum/outfit/job/chemist",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_shepherd.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"namelists": [
"MYTHOLOGICAL"
],
"limit": 1,
"job_slots": {
"Chaplain": {
"outfit": "/datum/outfit/job/independent/chaplain",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/independent_shetland.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_shetland.dmm",
"map_id": "independent_shetland",
"roundstart": true,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/independent_tranquility.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"Generalist"
],
"map_path": "_maps/_mod_celadon/shuttles/independent/independent_tranquility.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/western",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/inteq_hound.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"map_path": "_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm",
"map_id": "inteq_hound",
"limit": 2,
"limit": 1,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/inteq/captain/celadon",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/inteq_iron_maiden.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"INTEQ"
],
"map_path": "_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm",
"limit": 2,
"limit": 1,
"job_slots": {
"Vanguard": {
"outfit": "/datum/outfit/job/inteq/captain/celadon",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/nanotrasen_delta.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
],
"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_delta.dmm",
"starting_funds": 4000,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/nanotrasen/captain",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/nanotrasen_gecko.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"Mining",
"Engineering"
],
"limit": 2,
"limit": 1,
"starting_funds": 5000,
"job_slots": {
"Captain": {
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/nanotrasen_meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
],
"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_meta.dmm",
"starting_funds": 5000,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/nanotrasen/captain",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/nanotrasen_savior.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"Medical"
],
"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_savior.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/nanotrasen/captain",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/nanotrasen_skipper.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
],
"starting_funds": 4500,
"roundstart": true,
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/nanotrasen/captain",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/nanotrasen_venture.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm",
"description": "Небольшой шахтерский шатл для поддержки флота. Создан для обслуживания и технической поддержки более крупных судов. Данный экземпляр производства Нанотрейзен. Расчитан для кофмортной работы экипажа из двух человек.",
"tags": ["Cargo", "Generalist"],
"limit": 4,
"limit": 1,
"starting_funds": 2000,
"job_slots": {
"Captain": {
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/pirate_libertatia.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"PIRATES",
"NATURAL_AGGRESSIVE"
],
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/independent/captain/pirate",
Expand Down
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/pirate_noderider.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"Riot",
"Combat"
],
"limit": 1,
"job_slots": {
"Command Node": {
"outfit": "/datum/outfit/job/independent/captain/pirate/jupiter",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"map_short_name": "Kansatsu-class",
"map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm",
"map_id": "cybersun_kansatsu",
"limit": 1,
"job_slots": {
"Commander": {
"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/syndicate_eligia.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
],
"map_short_name": "Battle Schnau",
"map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_eligia.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
Expand Down Expand Up @@ -43,6 +44,5 @@
"slots": 2
}
},
"limit": 1,
"enabled": true
}
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/syndicate_gorlex_hyena.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@
"slots": 2
}
},
"limit": 1,
"enabled": true
}
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/configs/syndicate_gorlex_komodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
],
"map_path": "_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm",
"map_id": "syndicate_gorlex_komodo",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/gorlex",
Expand Down Expand Up @@ -53,5 +52,6 @@
"slots": 1
}
},
"limit": 1,
"enabled": true
}
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/syndicate_litieguai.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
"slots": 3
}
},
"limit": 1,
"enabled": true
}
1 change: 1 addition & 0 deletions _maps/_mod_celadon/configs/syndicate_twinkleshine.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@
"slots": 2
}
},
"limit": 1,
"enabled" : false
}

0 comments on commit 1185d3a

Please sign in to comment.