From bfba7307ecd6cd89c340aff3d7e3ef71cd62068b Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Sun, 9 Aug 2020 21:29:08 +0800
Subject: [PATCH] fix

---
 code/modules/mafia/controller.dm                |   2 +-
 code/modules/mafia/map_pieces.dm                |   2 +-
 code/modules/procedural_mapping/mapGenerator.dm |  12 ++++++++++--
 icons/obj/mafia.dmi                             | Bin 0 -> 668 bytes
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 icons/obj/mafia.dmi

diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm
index f4897a5fe5..172f9dca50 100644
--- a/code/modules/mafia/controller.dm
+++ b/code/modules/mafia/controller.dm
@@ -33,7 +33,7 @@
 	///template picked when the game starts. used for the name and desc reading
 	var/datum/map_template/mafia/current_map
 	///map generation tool that deletes the current map after the game finishes
-	var/datum/map_generator/massdelete/map_deleter
+	var/datum/mapGenerator/massdelete/map_deleter
 
 	///Readable list of roles in current game, sent to the tgui panel for roles list > list("Psychologist x1", "Clown x2")
 	var/list/current_setup_text
diff --git a/code/modules/mafia/map_pieces.dm b/code/modules/mafia/map_pieces.dm
index f0472c7e9f..1bca4467a1 100644
--- a/code/modules/mafia/map_pieces.dm
+++ b/code/modules/mafia/map_pieces.dm
@@ -30,7 +30,7 @@
 	requires_power = FALSE
 	has_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
-	block_suicide = TRUE
+	//block_suicide = TRUE
 
 /datum/map_template/mafia
 	var/description = ""
diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm
index f509c409ce..323f74d0ef 100644
--- a/code/modules/procedural_mapping/mapGenerator.dm
+++ b/code/modules/procedural_mapping/mapGenerator.dm
@@ -147,8 +147,16 @@
 	set category = "Debug"
 
 	var/datum/mapGenerator/nature/N = new()
-	var/startInput = input(usr,"Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text
-	var/endInput = input(usr,"End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text
+	var/startInput = input(usr,"Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text|null
+
+	if (isnull(startInput))
+		return
+
+	var/endInput = input(usr,"End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text|null
+	
+	if (isnull(endInput))
+		return
+	
 	//maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe
 	if(!startInput || !endInput)
 		to_chat(src, "Missing Input")
diff --git a/icons/obj/mafia.dmi b/icons/obj/mafia.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..fc0426a19fe6f4871c275acf461ebe6ff3a304bb
GIT binary patch
literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq004jh003YD0{{R3s1%ag0000CP)t-sz`(%&
z005Z)0GTrY$<$!j00001bW%=J06^y0W&i*Hn|f4ObVOxyV{&P5bZKvH004NLQ&w<t
zb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)ClAe`co#FA7XQ>iS!
zBsJbpiHkEOv#1y-V93RpR+N~V3SpxvGa^ozF>%UFh*M@toH8@wl$jH!%z`*&mc%JD
zG$5$1I5R!3w1A+pr2NF96kMv56<qyXz=;3=dZ3ciFy3Ff0004(Nkl<ZNQv!~J#ND=
z3`Qk`S~6*nFVPOYf;x29k$jZQUV4OFC6_2rWQa>rloXjZiY`T3<Qx1D^F{ti^ci!P
z@!ttaiMD5|bTVk9FWKl!WWhOEZ4_bT&o+*hg*bu;L4?2qD>N}cUaH<z;sLIkuNf0$
zGavKCF(9<B5v<t|kRU>EtEYq&1DHOrq7UYgNB(u<4r#B^(I&r1OmGf>P9TjU#*aWk
zOrzT%2?0YVf`}dIZj$#Nw<?_pioDHJLV>nB4OT?KMhwD6AG{(Nh6EyAO7j=fs>&CJ
z9U&F^9U&H`PN<bGy@`ySP&-frz*o5~xI$~T)0Wy19=V$wX3Py$A3QJ1ay>SxK6t^w
za&A<8@V<O3%V(qNgOdzSP3Zf82bV_G2Ryhosy@)dst?wJ>Vp$K-nCJM2babTp?}O8
z*{OpJhAL1GP!YUl4zw}}!rTL%1!f+cEAyL5EHDSYxnpJS0sN`$Tc(+398Hbf10)Dp
znWr0453t}$`5elBO9(c1N})MSrlZQ!)br=U-^&;8W$>EcASp-y0000<MNUMnLSTX`
CPa9$Y

literal 0
HcmV?d00001