From 7008dac8ddd1d83326a16bb7028b50529ed8ad96 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Tue, 11 Aug 2020 11:49:25 +0800
Subject: [PATCH] what if the maps aren't causing runtims

---
 _maps/map_files/Mafia/mafia_ayylmao.dmm |   2 +-
 _maps/map_files/Mafia/mafia_ball.dmm    | 323 ++++++------
 _maps/map_files/Mafia/mafia_gothic.dmm  |   3 +-
 _maps/map_files/Mafia/mafia_reebe.dmm   | 658 ++++++++++++++++++++++++
 _maps/map_files/Mafia/mafia_snow.dmm    | 107 ++--
 _maps/map_files/Mafia/mafia_syndie.dmm  |   3 +-
 _maps/map_files/generic/CentCom.dmm     |   6 +-
 code/modules/mafia/controller.dm        |   2 +
 code/modules/mafia/map_pieces.dm        |   5 +
 9 files changed, 887 insertions(+), 222 deletions(-)
 create mode 100644 _maps/map_files/Mafia/mafia_reebe.dmm

diff --git a/_maps/map_files/Mafia/mafia_ayylmao.dmm b/_maps/map_files/Mafia/mafia_ayylmao.dmm
index 9c4fcdf326..5d6f2aec5f 100644
--- a/_maps/map_files/Mafia/mafia_ayylmao.dmm
+++ b/_maps/map_files/Mafia/mafia_ayylmao.dmm
@@ -87,7 +87,7 @@
 	max_integrity = 99999;
 	name = "Station Night Shutters"
 	},
-/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/effect/spawner/structure/window/plastitanium,
 /turf/open/floor/plating/abductor2,
 /area/mafia)
 "z" = (
diff --git a/_maps/map_files/Mafia/mafia_ball.dmm b/_maps/map_files/Mafia/mafia_ball.dmm
index 9888821abf..6ca955726b 100644
--- a/_maps/map_files/Mafia/mafia_ball.dmm
+++ b/_maps/map_files/Mafia/mafia_ball.dmm
@@ -2,9 +2,6 @@
 "a" = (
 /turf/closed/indestructible/riveted,
 /area/mafia)
-"b" = (
-/turf/closed/indestructible/riveted/plastinum,
-/area/mafia)
 "c" = (
 /turf/closed/wall/rust,
 /area/mafia)
@@ -128,33 +125,33 @@ a
 "}
 (2,1,1) = {"
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 "}
 (3,1,1) = {"
 a
-b
-b
+a
+a
 c
 c
 c
@@ -172,14 +169,14 @@ c
 c
 c
 c
-b
-b
+a
+a
 a
 "}
 (4,1,1) = {"
 a
-b
-b
+a
+a
 c
 g
 h
@@ -197,67 +194,67 @@ d
 h
 k
 c
-b
-b
+a
+a
 a
 "}
 (5,1,1) = {"
 a
-b
-b
+a
+a
 c
 h
 d
 d
 e
-b
-b
+a
+a
 j
-b
+a
 j
-b
-b
+a
+a
 d
 d
 i
 h
 c
-b
-b
+a
+a
 a
 "}
 (6,1,1) = {"
 a
-b
-b
+a
+a
 c
 i
-b
-b
+a
+a
 j
-b
+a
 l
 q
-b
+a
 r
 o
-b
+a
 j
-b
-b
+a
+a
 d
 c
-b
-b
+a
+a
 a
 "}
 (7,1,1) = {"
 a
-b
+a
 c
 c
 d
-b
+a
 o
 r
 p
@@ -269,45 +266,45 @@ n
 p
 q
 l
-b
+a
 d
 c
 c
-b
+a
 a
 "}
 (8,1,1) = {"
 a
-b
+a
 c
 d
 d
-b
+a
 n
 r
-b
-b
+a
+a
 q
-b
+a
 r
-b
-b
+a
+a
 q
 m
-b
+a
 d
 d
 c
-b
+a
 a
 "}
 (9,1,1) = {"
 a
-b
+a
 c
 d
-b
-b
+a
+a
 p
 r
 r
@@ -319,22 +316,22 @@ p
 q
 q
 p
-b
-b
+a
+a
 d
 c
-b
+a
 a
 "}
 (10,1,1) = {"
 a
-b
+a
 c
 d
-b
+a
 l
 p
-b
+a
 p
 p
 p
@@ -342,18 +339,18 @@ p
 p
 p
 p
-b
+a
 p
 o
-b
+a
 d
 c
-b
+a
 a
 "}
 (11,1,1) = {"
 a
-b
+a
 c
 d
 j
@@ -373,18 +370,18 @@ n
 j
 e
 c
-b
+a
 a
 "}
 (12,1,1) = {"
 a
-b
+a
 c
 e
-b
-b
+a
+a
 p
-b
+a
 p
 p
 t
@@ -392,18 +389,18 @@ u
 t
 p
 p
-b
+a
 p
-b
-b
+a
+a
 d
 c
-b
+a
 a
 "}
 (13,1,1) = {"
 a
-b
+a
 c
 d
 j
@@ -423,18 +420,18 @@ m
 j
 d
 c
-b
+a
 a
 "}
 (14,1,1) = {"
 a
-b
+a
 c
 d
-b
+a
 o
 p
-b
+a
 p
 p
 p
@@ -442,22 +439,22 @@ p
 p
 p
 p
-b
+a
 p
 l
-b
+a
 i
 c
-b
+a
 a
 "}
 (15,1,1) = {"
 a
-b
+a
 c
 d
-b
-b
+a
+a
 p
 q
 q
@@ -469,45 +466,45 @@ p
 r
 r
 p
-b
-b
+a
+a
 d
 c
-b
+a
 a
 "}
 (16,1,1) = {"
 a
-b
+a
 c
 f
 d
-b
+a
 m
 q
-b
-b
+a
+a
 r
-b
+a
 q
-b
-b
+a
+a
 r
 n
-b
+a
 d
 d
 c
-b
+a
 a
 "}
 (17,1,1) = {"
 a
-b
+a
 c
 c
 d
-b
+a
 l
 q
 p
@@ -519,67 +516,67 @@ m
 p
 r
 o
-b
+a
 d
 c
 c
-b
+a
 a
 "}
 (18,1,1) = {"
 a
-b
-b
+a
+a
 c
 d
-b
-b
+a
+a
 j
-b
+a
 o
 r
-b
+a
 q
 l
-b
+a
 j
-b
-b
+a
+a
 d
 c
-b
-b
+a
+a
 a
 "}
 (19,1,1) = {"
 a
-b
-b
+a
+a
 c
 h
 i
 d
 d
-b
-b
+a
+a
 j
-b
+a
 j
-b
-b
+a
+a
 d
 e
 d
 h
 c
-b
-b
+a
+a
 a
 "}
 (20,1,1) = {"
 a
-b
-b
+a
+a
 c
 k
 h
@@ -597,14 +594,14 @@ d
 h
 v
 c
-b
-b
+a
+a
 a
 "}
 (21,1,1) = {"
 a
-b
-b
+a
+a
 c
 c
 c
@@ -622,33 +619,33 @@ c
 c
 c
 c
-b
-b
+a
+a
 a
 "}
 (22,1,1) = {"
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 "}
 (23,1,1) = {"
diff --git a/_maps/map_files/Mafia/mafia_gothic.dmm b/_maps/map_files/Mafia/mafia_gothic.dmm
index 3d41f9b16c..a3c19fee85 100644
--- a/_maps/map_files/Mafia/mafia_gothic.dmm
+++ b/_maps/map_files/Mafia/mafia_gothic.dmm
@@ -70,7 +70,8 @@
 	max_integrity = 99999;
 	name = "Station Night Shutters"
 	},
-/turf/closed/indestructible/opsglass,
+/obj/effect/spawner/structure/window/plastitanium,
+/turf/open/space/basic,
 /area/mafia)
 "q" = (
 /turf/open/floor/carpet/red,
diff --git a/_maps/map_files/Mafia/mafia_reebe.dmm b/_maps/map_files/Mafia/mafia_reebe.dmm
new file mode 100644
index 0000000000..e82174ff93
--- /dev/null
+++ b/_maps/map_files/Mafia/mafia_reebe.dmm
@@ -0,0 +1,658 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/indestructible/riveted,
+/area/mafia)
+"b" = (
+/turf/open/indestructible/reebe_void,
+/area/mafia)
+"c" = (
+/turf/open/indestructible/reebe_void/spawning/lattices,
+/area/mafia)
+"d" = (
+/obj/mafia_game_board,
+/turf/open/indestructible/reebe_void/spawning/lattices,
+/area/mafia)
+"e" = (
+/turf/closed/wall/clockwork,
+/area/mafia)
+"f" = (
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"g" = (
+/obj/effect/landmark/mafia,
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"h" = (
+/obj/structure/window/reinforced/clockwork/fulltile,
+/obj/structure/grille/ratvar,
+/obj/machinery/door/poddoor/preopen{
+	desc = "When it's time to sleep, the lights will go out. Remember - no one in space can hear you scream.";
+	id = "mafia";
+	max_integrity = 99999;
+	name = "Station Night Shutters"
+	},
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"i" = (
+/obj/structure/bed,
+/obj/item/bedsheet/orange,
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"j" = (
+/obj/structure/chair/brass{
+	dir = 4
+	},
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"k" = (
+/obj/structure/chair/brass,
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"l" = (
+/obj/structure/chair/brass{
+	dir = 8
+	},
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"m" = (
+/obj/effect/baseturf_helper/asteroid,
+/obj/effect/landmark/mafia/town_center,
+/obj/structure/chair/brass,
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"n" = (
+/obj/structure/chair/brass{
+	icon_state = "brass_chair";
+	dir = 1
+	},
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"o" = (
+/obj/item/toy/plush/plushvar,
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"p" = (
+/obj/structure/window/reinforced/clockwork/fulltile,
+/obj/structure/grille/ratvar,
+/turf/open/floor/clockwork/reebe,
+/area/mafia)
+"q" = (
+/obj/item/toy/plush/plushvar,
+/turf/open/indestructible/reebe_void/spawning/lattices,
+/area/mafia)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+b
+c
+c
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+b
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+c
+d
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+q
+d
+c
+b
+b
+a
+"}
+(5,1,1) = {"
+a
+b
+b
+c
+c
+c
+c
+b
+e
+e
+p
+e
+p
+e
+e
+b
+b
+c
+c
+c
+b
+b
+a
+"}
+(6,1,1) = {"
+a
+b
+b
+b
+b
+p
+p
+e
+e
+i
+f
+e
+f
+i
+e
+e
+p
+p
+c
+b
+b
+b
+a
+"}
+(7,1,1) = {"
+a
+b
+b
+b
+b
+p
+i
+f
+h
+g
+f
+h
+f
+g
+h
+f
+i
+p
+b
+b
+b
+b
+a
+"}
+(8,1,1) = {"
+a
+b
+b
+b
+b
+e
+g
+f
+e
+e
+f
+e
+f
+e
+e
+f
+g
+e
+b
+b
+b
+b
+a
+"}
+(9,1,1) = {"
+a
+b
+b
+b
+e
+e
+h
+f
+j
+h
+j
+h
+j
+h
+j
+f
+h
+e
+e
+b
+b
+b
+a
+"}
+(10,1,1) = {"
+a
+b
+b
+b
+e
+i
+h
+e
+h
+h
+h
+h
+h
+h
+h
+e
+h
+i
+e
+b
+b
+b
+a
+"}
+(11,1,1) = {"
+a
+b
+b
+b
+p
+g
+f
+f
+k
+h
+f
+f
+o
+h
+n
+f
+f
+g
+p
+b
+b
+b
+a
+"}
+(12,1,1) = {"
+a
+b
+b
+b
+e
+e
+h
+e
+h
+h
+f
+m
+f
+h
+h
+e
+h
+e
+e
+b
+b
+b
+a
+"}
+(13,1,1) = {"
+a
+b
+b
+b
+p
+g
+f
+f
+k
+h
+f
+f
+f
+h
+n
+f
+f
+g
+p
+b
+b
+b
+a
+"}
+(14,1,1) = {"
+a
+b
+b
+b
+e
+i
+h
+e
+h
+h
+h
+h
+h
+h
+h
+e
+h
+i
+e
+b
+b
+b
+a
+"}
+(15,1,1) = {"
+a
+b
+b
+b
+e
+e
+h
+f
+l
+h
+l
+h
+l
+h
+l
+f
+h
+e
+e
+b
+b
+b
+a
+"}
+(16,1,1) = {"
+a
+b
+b
+b
+b
+e
+g
+f
+e
+e
+f
+e
+f
+e
+e
+f
+g
+e
+b
+b
+b
+b
+a
+"}
+(17,1,1) = {"
+a
+b
+b
+b
+b
+p
+i
+f
+h
+g
+f
+h
+f
+g
+h
+f
+i
+p
+b
+b
+b
+b
+a
+"}
+(18,1,1) = {"
+a
+b
+b
+b
+b
+p
+p
+e
+e
+f
+i
+e
+i
+f
+e
+e
+p
+p
+c
+b
+b
+b
+a
+"}
+(19,1,1) = {"
+a
+b
+b
+c
+c
+c
+c
+b
+e
+e
+p
+e
+p
+e
+e
+b
+b
+c
+c
+c
+b
+b
+a
+"}
+(20,1,1) = {"
+a
+b
+b
+c
+d
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+d
+c
+b
+b
+a
+"}
+(21,1,1) = {"
+a
+b
+b
+c
+c
+c
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+c
+c
+c
+b
+b
+a
+"}
+(22,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(23,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/_maps/map_files/Mafia/mafia_snow.dmm b/_maps/map_files/Mafia/mafia_snow.dmm
index 079f985380..a47440f00e 100644
--- a/_maps/map_files/Mafia/mafia_snow.dmm
+++ b/_maps/map_files/Mafia/mafia_snow.dmm
@@ -2,9 +2,6 @@
 "a" = (
 /turf/closed/indestructible/riveted,
 /area/mafia)
-"b" = (
-/turf/closed/indestructible/riveted/plastinum,
-/area/mafia)
 "d" = (
 /turf/open/floor/plating,
 /area/mafia)
@@ -97,7 +94,7 @@
 /turf/open/floor/holofloor/snow,
 /area/mafia)
 "w" = (
-/turf/open/lava/plasma/mafia,
+/turf/open/lava/plasma,
 /area/mafia)
 "x" = (
 /obj/machinery/door/airlock/external{
@@ -119,7 +116,7 @@
 /area/mafia)
 "z" = (
 /obj/structure/lattice/catwalk,
-/turf/open/lava/plasma/mafia,
+/turf/open/lava/plasma,
 /area/mafia)
 "A" = (
 /obj/machinery/door/airlock/external{
@@ -137,7 +134,7 @@
 "B" = (
 /obj/effect/landmark/mafia,
 /obj/structure/lattice/catwalk,
-/turf/open/lava/plasma/mafia,
+/turf/open/lava/plasma,
 /area/mafia)
 "C" = (
 /obj/mafia_game_board,
@@ -154,7 +151,7 @@
 /obj/structure/closet/crate/critter,
 /obj/item/clothing/suit/hooded/wintercoat/miner,
 /obj/item/clothing/shoes/winterboots,
-/turf/open/lava/plasma/mafia,
+/turf/open/lava/plasma,
 /area/mafia)
 "F" = (
 /turf/open/floor/holofloor/wood,
@@ -208,16 +205,16 @@ a
 "}
 (2,1,1) = {"
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 s
 K
 K
@@ -233,8 +230,8 @@ a
 "}
 (3,1,1) = {"
 a
-b
-b
+a
+a
 s
 s
 s
@@ -258,8 +255,8 @@ a
 "}
 (4,1,1) = {"
 a
-b
-b
+a
+a
 s
 g
 h
@@ -283,8 +280,8 @@ a
 "}
 (5,1,1) = {"
 a
-b
-b
+a
+a
 s
 h
 d
@@ -308,8 +305,8 @@ a
 "}
 (6,1,1) = {"
 a
-b
-b
+a
+a
 s
 i
 s
@@ -333,7 +330,7 @@ a
 "}
 (7,1,1) = {"
 a
-b
+a
 s
 s
 d
@@ -358,7 +355,7 @@ a
 "}
 (8,1,1) = {"
 a
-b
+a
 s
 d
 d
@@ -383,7 +380,7 @@ a
 "}
 (9,1,1) = {"
 a
-b
+a
 s
 d
 s
@@ -408,7 +405,7 @@ a
 "}
 (10,1,1) = {"
 a
-b
+a
 s
 d
 s
@@ -433,7 +430,7 @@ a
 "}
 (11,1,1) = {"
 a
-b
+a
 s
 d
 j
@@ -458,11 +455,11 @@ a
 "}
 (12,1,1) = {"
 a
-b
+a
 s
 e
 s
-b
+a
 p
 s
 p
@@ -483,7 +480,7 @@ a
 "}
 (13,1,1) = {"
 a
-b
+a
 s
 d
 j
@@ -508,7 +505,7 @@ a
 "}
 (14,1,1) = {"
 a
-b
+a
 s
 d
 s
@@ -533,7 +530,7 @@ a
 "}
 (15,1,1) = {"
 a
-b
+a
 s
 d
 s
@@ -558,7 +555,7 @@ a
 "}
 (16,1,1) = {"
 a
-b
+a
 s
 f
 d
@@ -583,7 +580,7 @@ a
 "}
 (17,1,1) = {"
 a
-b
+a
 s
 s
 d
@@ -608,8 +605,8 @@ a
 "}
 (18,1,1) = {"
 a
-b
-b
+a
+a
 s
 d
 s
@@ -633,8 +630,8 @@ a
 "}
 (19,1,1) = {"
 a
-b
-b
+a
+a
 s
 h
 i
@@ -658,8 +655,8 @@ a
 "}
 (20,1,1) = {"
 a
-b
-b
+a
+a
 s
 k
 h
@@ -683,8 +680,8 @@ a
 "}
 (21,1,1) = {"
 a
-b
-b
+a
+a
 s
 s
 s
@@ -708,16 +705,16 @@ a
 "}
 (22,1,1) = {"
 a
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 s
 K
 K
diff --git a/_maps/map_files/Mafia/mafia_syndie.dmm b/_maps/map_files/Mafia/mafia_syndie.dmm
index 111df10b67..d56c3cc0c6 100644
--- a/_maps/map_files/Mafia/mafia_syndie.dmm
+++ b/_maps/map_files/Mafia/mafia_syndie.dmm
@@ -116,7 +116,8 @@
 	max_integrity = 99999;
 	name = "Station Night Shutters"
 	},
-/turf/closed/indestructible/opsglass,
+/obj/effect/spawner/structure/window/plastitanium,
+/turf/open/space/basic,
 /area/mafia)
 "q" = (
 /obj/effect/turf_decal/tile/red,
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 5a14eb9041..a123ccab55 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -17249,6 +17249,10 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/centcom/evac)
+"Qc" = (
+/obj/effect/landmark/mafia_game_area,
+/turf/open/space/basic,
+/area/space)
 "Qe" = (
 /turf/open/ai_visible,
 /area/ai_multicam_room)
@@ -58911,7 +58915,7 @@ aa
 aa
 aa
 aa
-aa
+Qc
 aa
 aa
 aa
diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm
index b0aa8774b8..5873decb8f 100644
--- a/code/modules/mafia/controller.dm
+++ b/code/modules/mafia/controller.dm
@@ -873,6 +873,8 @@
 	//if there were not enough players, don't start. we already trimmed the list to now hold only valid signups
 	if(length(possible_keys) < req_players)
 		return
+	else //hacky implementation of max players
+		req_players = clamp(length(possible_keys), 1, max_player)
 
 	//if there were too many players, still start but only make filtered keys as big as it needs to be (cut excess)
 	//also removes people who do get into final player list from the signup so they have to sign up again when game ends
diff --git a/code/modules/mafia/map_pieces.dm b/code/modules/mafia/map_pieces.dm
index d1756d7f11..3459603f3c 100644
--- a/code/modules/mafia/map_pieces.dm
+++ b/code/modules/mafia/map_pieces.dm
@@ -72,3 +72,8 @@
 	name = "Vampire's Castle"
 	description = "Vampires and changelings clash to find out who's the superior bloodsucking monster in this creepy castle map."
 	mappath = "_maps/map_files/Mafia/mafia_gothic.dmm"
+
+/datum/map_template/mafia/gothic
+	name = "Reebe"
+	description = "Trouble in Reebe station! Copypaste guranteed by ClockCo&trade;"
+	mappath = "_maps/map_files/Mafia/mafia_reebe.dmm"
\ No newline at end of file