Fix some artifact stuff (#4072)

monkestation/code/modules/art_sci_overrides/faults/clowning.dm

@@ -1,7 +1,11 @@
 /datum/artifact_fault/clown
 	name = "Funny Fault"
 	trigger_chance = 5
-	inspect_warning = list("Smells faintly of bananas","Looks Funny.","Hates mimes.")
+	inspect_warning = list(
+		"Smells faintly of bananas",
+		"Looks funny.",
+		"Hates mimes.",
+	)
 	visible_message = "summons a portal to the HONK DIMENSION!"
 	discovered_credits = -500
 	research_value = 250
@@ -14,6 +18,5 @@
 	if(!center_turf)
 		CRASH("[src] had attempted to trigger, but failed to find the center turf!")
 
-	var/obj/structure/spawner/clown/hehe = new(src)
-
-	addtimer(CALLBACK(hehe,PROC_REF(Destroy)),3 MINUTE)
+	var/obj/structure/spawner/clown/hehe = new(center_turf)
+	QDEL_IN(hehe, 3 MINUTES)

monkestation/code/modules/art_sci_overrides/faults/just_death.dm

@@ -2,9 +2,11 @@
 	name = "Instant Death Fault"
 	trigger_chance = 50 //God forbid this actually rolls on a touch artifact,like it did during my testing.
 	visible_message = "blows someone up with mind."
-	inspect_warning = list(span_danger("The grim reapers scythe seems to be reflected in its surface!"),
-	span_danger("An Aura of death surrounds this object!"),
-	span_danger("I'd bet 50/50 someone dies if this turns on!"))
+	inspect_warning = list(
+		span_danger("The grim reapers scythe seems to be reflected in its surface!"),
+		span_danger("An aura of death surrounds this object!"),
+		span_danger("I'd bet 50/50 someone dies if this turns on!")
+	)
 
 	research_value = 10000 //Wow, this would make a fucking amazing weapon
 

monkestation/code/modules/art_sci_overrides/faults/monkey_mode.dm

@@ -8,27 +8,22 @@
 	weight = ARTIFACT_VERYUNCOMMON
 
 /datum/artifact_fault/monkey_mode/on_trigger()
-	var/monkey = rand(1,4)
+	var/monkeys_to_spawn = rand(1,4)
 	var/center_turf = get_turf(our_artifact.parent)
 	var/list/turf/valid_turfs = list()
 	if(!center_turf)
 		CRASH("[src] had attempted to trigger, but failed to find the center turf!")
-	for(var/turf/boi in range(rand(3,6),center_turf))
-		if(boi.density)
+	for(var/turf/boi in range(rand(3, 6), center_turf))
+		if(boi.is_blocked_turf(source_atom = our_artifact.parent))
 			continue
 		valid_turfs += boi
-	for(var/i in 1 to monkey)
-		var/turf/spawnon = pick(valid_turfs)
-		valid_turfs -= spawnon
-		var/pain = roll(1,100)
-		var/mob/living/M //For monkey
-		switch(pain)
+	for(var/i in 1 to min(monkeys_to_spawn, length(valid_turfs)))
+		var/turf/spawnon = pick_n_take(valid_turfs)
+		switch(rand(1, 100))
 			if(1 to 75)
-				M = new /mob/living/carbon/human/species/monkey/angry(spawnon)
+				new /mob/living/carbon/human/species/monkey/angry(spawnon)
 			if(75 to 95)
-				M = new /mob/living/basic/gorilla(spawnon)
+				new /mob/living/basic/gorilla(spawnon)
 			if(95 to 100)
-				M = new /mob/living/basic/gorilla/lesser(spawnon)//OH GOD ITS TINY
-		if(M) //Just in case.
-			M.forceMove(spawnon)
+				new /mob/living/basic/gorilla/lesser(spawnon)//OH GOD ITS TINY
 

monkestation/code/modules/art_sci_overrides/faults/whispers.dm

@@ -1,5 +1,5 @@
 /datum/artifact_fault/whisper
-	name = "Wispering Fault"
+	name = "Whispering Fault"
 	trigger_chance = 75
 	var/list/whispers = list("Help me!","I've seen your sins","Egg.")