Skip to content

Commit

Permalink
Merge pull request #1308 from CeladonSS13/beta-dev
Browse files Browse the repository at this point in the history
#28 Перенос обновлений с Beta на Alpha сервер
  • Loading branch information
MysticalFaceLesS authored Dec 28, 2024
2 parents af977a6 + 691a69b commit 7a2695d
Show file tree
Hide file tree
Showing 39 changed files with 12,971 additions and 396 deletions.
7,056 changes: 7,056 additions & 0 deletions _maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_claw_ruin.dmm

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions _maps/_mod_celadon/configs/nanotrasen_skybreaker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Skybreaker-class Assault Vessel",
"map_short_name": "Skybreaker",
"description": "'Skybreaker', передовое боевое судно Нанотрейзен, создано для достижения превосходства в оспариваемых регионах космоса. Название судно получило за свою обтекаемую форму и инновационное расположение стыковочного шлюза, позволяющее с максимальной тягой отдаляться от стремительно разрушающихся объектов Синдиката. Корабль полностью оснащен энергетическим оружием. Конкретно эта версия судна принадлежит Тактическому Штурмовому Отряду Нанотрейзен.",
"map_path": "_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_skybreaker.dmm",
"enabled": true,
"limit": 1,
"prefix": "NTBSV",
"faction": "/datum/faction/nt",
"tags": [
"Nanotrasen",
"Combat",
"Riot",
"Medical",
"Assault"
],
"namelists": [
"NANOTRASEN",
"WEAPONS",
"BRITISH_NAVY"
],
"job_slots": {
"NTAS Leader": {
"outfit": "/datum/outfit/job/nanotrasen/ntas/commander",
"officer": true,
"slots": 1
},
"NTAS Security Operative": {
"outfit": "/datum/outfit/job/nanotrasen/ntas/operative",
"slots": 3
},
"NTAS Medical Operative": {
"outfit": "/datum/outfit/job/nanotrasen/ntas/medic",
"slots": 1
},
"NTAS Engineering Operative": {
"outfit": "/datum/outfit/job/nanotrasen/ntas/engineer",
"slots": 1
}
}
}
4 changes: 4 additions & 0 deletions _maps/_mod_celadon/map_catalogue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
File name = "_maps\RandomRuins\wasteruins\wasteplanet_abandoned_mechbay.dmm"
Size = (x = 45)(y = 47)(z = 1)
Tags = "Boss Combat Challenge", "Medium Loot", "Shelter", "Hazardous"

File name = "_maps\_mod_celadon\RandomRuins\WasteRuins\wasteplanet_claw_ruin.dmm"
Size = (x = 69)(y = 50)(z = 1)
Tags = "Boss Combat Challenge", "Rare Loot", "Shelter", "Hazardous"
4 changes: 2 additions & 2 deletions _maps/_mod_celadon/outpost/elysium_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6101,7 +6101,8 @@
color = "#c1b6a5"
},
/obj/machinery/jukebox/boombox{
pixel_y = 5
pixel_y = 5;
req_one_access_txt = "109"
},
/obj/item/phone{
pixel_x = -11;
Expand Down Expand Up @@ -15277,7 +15278,6 @@
/area/outpost/fraction/nanotrasen)
"MH" = (
/obj/machinery/jukebox/boombox{
req_one_access_txt = "8125";
pixel_x = -8
},
/obj/structure/table/syndi,
Expand Down
Loading

0 comments on commit 7a2695d

Please sign in to comment.