Skip to content

Commit

Permalink
Лаения, баги, одним словом мердж.
Browse files Browse the repository at this point in the history
  • Loading branch information
SmiLeYre committed Jul 21, 2023
2 parents 8a2b0a5 + 650642d commit ecdd4ff
Show file tree
Hide file tree
Showing 50 changed files with 321,631 additions and 22,938 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3671,6 +3671,13 @@
/obj/item/storage/backpack/duffelbag/syndie/surgery,
/turf/open/floor/pod/dark,
/area/ruin/lavaland/unpowered/deepspaceone/medbay)
"BE" = (
/obj/machinery/stasis{
dir = 8
},
/obj/structure/railing,
/turf/open/floor/plasteel/shuttle,
/area/ruin/lavaland/unpowered/deepspaceone/medbay)
"BH" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
Expand Down Expand Up @@ -7141,6 +7148,15 @@
/obj/machinery/airalarm/directional/west{
req_access = list("syndicate")
},
/obj/item/reagent_containers/glass/beaker/cryoxadone{
pixel_y = 5;
pixel_x = -1
},
/obj/item/reagent_containers/glass/bottle/cryoxadone{
pixel_x = 8
},
/obj/structure/table/reinforced,
/obj/structure/railing,
/turf/open/floor/plasteel/shuttle,
/area/ruin/lavaland/unpowered/deepspaceone/medbay)
"Zz" = (
Expand Down Expand Up @@ -9770,7 +9786,7 @@ ab
xL
TG
HW
FO
BE
WU
FI
FT
Expand Down
1 change: 1 addition & 0 deletions _maps/layeniastation.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/layeniastation.json"
24 changes: 24 additions & 0 deletions _maps/layeniastation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"map_name": "LayeniaStation",
"map_path": "map_files/layenia",
"map_file": "layeniastation.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
},
"traits": [
{
"Up": 1,
"Baseturf": "/area/space",
"Linkage": "Cross"
},
{
"Down": -1,
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
}
]
}
Loading

0 comments on commit ecdd4ff

Please sign in to comment.