Merge branch 'master' into cargo

Signed-off-by: homexp13 <[email protected]>
PMC-Unga-Marines · Jul 29, 2024 · bd14092 · bd14092
2 parents 456b752 + 4b8e273
commit bd14092
Show file tree

Hide file tree

Showing 1,100 changed files with 19,451 additions and 24,079 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@
 
 ## `Ченджлог`
 
-<!-- Данная форма позволяет игрокам наблюдать историю изменений прямо в игре и должна содержать тезисную информацию о том, как этот ПР полияет на игрока, нежели его общее содержание. -->
+<!-- Данная форма позволяет игрокам наблюдать историю изменений прямо в игре и должна содержать тезисную информацию о том, как этот ПР повлияет на игрока, нежели его общее содержание. -->
 
 <!-- Не удалять апострофы -->
 ```

diff --git a/_maps/interiors/apc_cloner.dmm b/_maps/interiors/apc_cloner.dmm
@@ -0,0 +1,194 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/interior/apc/nineteen,
+/area/interior/apc)
+"b" = (
+/obj/structure/bed/chair/driver_gunner_seat{
+	pixel_x = -3;
+	pixel_y = -5
+	},
+/turf/open/interior/apc/eleven,
+/area/interior/apc)
+"c" = (
+/obj/machinery/computer/cloning_console/vats{
+	dir = 2;
+	layer = 2.99;
+	pixel_x = 8
+	},
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"d" = (
+/turf/closed/interior/apc/twenty,
+/area/interior/apc)
+"e" = (
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"g" = (
+/turf/closed/interior/apc/five,
+/area/interior/apc)
+"h" = (
+/turf/closed/interior/apc/twelve,
+/area/interior/apc)
+"l" = (
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"m" = (
+/obj/structure/gun_breech/secondary,
+/obj/machinery/gibber/apc,
+/turf/open/interior/apc/twentytwo,
+/area/interior/apc)
+"n" = (
+/turf/open/interior/apc/ten,
+/area/interior/apc)
+"o" = (
+/turf/open/interior/apc/sixteen,
+/area/interior/apc)
+"p" = (
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"s" = (
+/turf/open/interior/apc/eight,
+/area/interior/apc)
+"t" = (
+/obj/machinery/cloning/vats/apc/south{
+	pixel_y = -16
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"B" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
+/turf/closed/interior/apc/six,
+/area/interior/apc)
+"C" = (
+/turf/closed/interior/tank/door,
+/area/interior/apc)
+"D" = (
+/turf/open/interior/apc/fifteen,
+/area/interior/apc)
+"F" = (
+/obj/machinery/quick_vendor/beginner{
+	pixel_x = 28
+	},
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"H" = (
+/obj/machinery/cloning/vats/apc/south{
+	pixel_y = -16
+	},
+/turf/closed/interior/apc/four,
+/area/interior/apc)
+"I" = (
+/turf/closed/interior/apc/twentythree,
+/area/interior/apc)
+"J" = (
+/turf/open/interior/apc/fourteen,
+/area/interior/apc)
+"L" = (
+/turf/closed/interior/apc/twentyeight,
+/area/interior/apc)
+"P" = (
+/turf/closed/interior/apc/twentyfour,
+/area/interior/apc)
+"R" = (
+/obj/machinery/cloning/vats/apc{
+	dir = 1;
+	pixel_y = 16
+	},
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"S" = (
+/turf/closed/interior/apc/seventeen,
+/area/interior/apc)
+"T" = (
+/obj/machinery/computer/cloning_console/vats{
+	dir = 1;
+	pixel_x = 8
+	},
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"U" = (
+/obj/machinery/cloning/vats/apc/south{
+	pixel_y = -16
+	},
+/turf/closed/interior/apc/three,
+/area/interior/apc)
+"W" = (
+/obj/structure/ammo_rack/secondary{
+	pixel_y = -13
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"Y" = (
+/turf/closed/interior/apc/one,
+/area/interior/apc)
+"Z" = (
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/obj/structure/periscope/apc,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+
+(1,1,1) = {"
+Y
+C
+F
+p
+a
+"}
+(2,1,1) = {"
+e
+s
+J
+T
+R
+"}
+(3,1,1) = {"
+t
+c
+D
+T
+R
+"}
+(4,1,1) = {"
+t
+c
+D
+T
+R
+"}
+(5,1,1) = {"
+U
+c
+D
+T
+R
+"}
+(6,1,1) = {"
+H
+c
+D
+Z
+l
+"}
+(7,1,1) = {"
+W
+n
+o
+m
+l
+"}
+(8,1,1) = {"
+g
+b
+S
+I
+d
+"}
+(9,1,1) = {"
+B
+h
+P
+P
+L
+"}
diff --git a/_maps/interiors/apc_medical.dmm b/_maps/interiors/apc_medical.dmm
@@ -0,0 +1,180 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/interior/apc/nineteen,
+/area/interior/apc)
+"b" = (
+/obj/structure/bed/chair/driver_gunner_seat{
+	pixel_x = -3;
+	pixel_y = -5
+	},
+/turf/open/interior/apc/eleven,
+/area/interior/apc)
+"c" = (
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"d" = (
+/turf/closed/interior/apc/twenty,
+/area/interior/apc)
+"e" = (
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"g" = (
+/turf/closed/interior/apc/five,
+/area/interior/apc)
+"h" = (
+/turf/closed/interior/apc/twelve,
+/area/interior/apc)
+"k" = (
+/obj/machinery/optable,
+/obj/item/tank/anesthetic,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"l" = (
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"m" = (
+/obj/structure/gun_breech/secondary,
+/turf/open/interior/apc/twentytwo,
+/area/interior/apc)
+"n" = (
+/turf/open/interior/apc/ten,
+/area/interior/apc)
+"o" = (
+/turf/open/interior/apc/sixteen,
+/area/interior/apc)
+"p" = (
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"s" = (
+/turf/open/interior/apc/eight,
+/area/interior/apc)
+"t" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"B" = (
+/turf/closed/interior/apc/six,
+/area/interior/apc)
+"C" = (
+/turf/closed/interior/tank/door,
+/area/interior/apc)
+"D" = (
+/turf/open/interior/apc/fifteen,
+/area/interior/apc)
+"F" = (
+/obj/machinery/vending/MarineMed,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"H" = (
+/turf/closed/interior/apc/four,
+/area/interior/apc)
+"I" = (
+/turf/closed/interior/apc/twentythree,
+/area/interior/apc)
+"J" = (
+/turf/open/interior/apc/fourteen,
+/area/interior/apc)
+"L" = (
+/turf/closed/interior/apc/twentyeight,
+/area/interior/apc)
+"O" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"P" = (
+/turf/closed/interior/apc/twentyfour,
+/area/interior/apc)
+"S" = (
+/turf/closed/interior/apc/seventeen,
+/area/interior/apc)
+"T" = (
+/obj/structure/bed/chair/comfy{
+	dir = 8
+	},
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"U" = (
+/turf/closed/interior/apc/three,
+/area/interior/apc)
+"W" = (
+/obj/structure/ammo_rack/secondary{
+	pixel_y = -13
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"Y" = (
+/turf/closed/interior/apc/one,
+/area/interior/apc)
+"Z" = (
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/obj/structure/periscope/apc,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+
+(1,1,1) = {"
+Y
+C
+p
+p
+a
+"}
+(2,1,1) = {"
+e
+s
+J
+F
+l
+"}
+(3,1,1) = {"
+e
+c
+D
+k
+l
+"}
+(4,1,1) = {"
+e
+t
+D
+T
+l
+"}
+(5,1,1) = {"
+U
+t
+D
+O
+l
+"}
+(6,1,1) = {"
+H
+t
+D
+Z
+l
+"}
+(7,1,1) = {"
+W
+n
+o
+m
+l
+"}
+(8,1,1) = {"
+g
+b
+S
+I
+d
+"}
+(9,1,1) = {"
+B
+h
+P
+P
+L
+"}