From ab4703623c101f21ae3f488cccba692e0ebd5ea8 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Fri, 27 Jan 2017 17:46:38 +0100
Subject: [PATCH] Review changes

---
 code/__HELPERS/unsorted.dm                    |  1 +
 code/datums/spells/area_teleport.dm           |  4 +--
 code/datums/spells/conjure.dm                 |  2 +-
 code/datums/spells/horsemask.dm               |  2 +-
 code/datums/spells/knock.dm                   |  2 +-
 code/datums/spells/turf_teleport.dm           |  4 +--
 code/datums/spells/wizard.dm                  | 32 +++++++++----------
 code/game/objects/effects/mines.dm            | 18 +++++------
 .../game/turfs/simulated/floor/fancy_floor.dm |  5 ++-
 code/modules/mining/lavaland/colossus_loot.dm |  1 -
 .../mining/lavaland/necropolis_chests.dm      |  4 +--
 11 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 1db9b88a526..9644b4348b3 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1817,6 +1817,7 @@ var/global/list/g_fancy_list_of_types = null
 			//you might be thinking of adding more steps to this, or making it use a loop and a counter var
 			//	not worth it.
 
+// This proc gets a list of all "points of interest" (poi's) that can be used by admins to track valuable mobs or atoms (such as the nuke disk).
 /proc/getpois(mobs_only=0,skip_mindless=0)
 	var/list/mobs = sortmobs()
 	var/list/names = list()
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index c213828cf29..46def2b5a9c 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -6,8 +6,8 @@
 	var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list
 	var/invocation_area = 1 //if the invocation appends the selected area
 	
-	var/sound1 = "sound/weapons/ZapBang.ogg"
-	var/sound2 = "sound/weapons/ZapBang.ogg"	
+	var/sound1 = 'sound/weapons/ZapBang.ogg'
+	var/sound2 = 'sound/weapons/ZapBang.ogg'	
 	
 /obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1, mob/living/user = usr)
 	var/thearea = before_cast(targets)
diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index aa0b524ec5a..fe0ffd9c1c0 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -21,7 +21,7 @@
 	for(var/turf/T in targets)
 		if(T.density && !summon_ignore_density)
 			targets -= T
-	playsound(get_turf(src), 'sound/items/welder.ogg', 50, 1)
+	playsound(get_turf(src), cast_sound, 50, 1)
 
 	if(do_after(user,delay, target = user))
 		for(var/i=0,i<summon_amt,i++)
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index 7d865190f51..b3ca73fe367 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -14,7 +14,7 @@
 	selection_type = "range"
 
 	action_icon_state = "barn"
-	sound = "sound/magic/HorseHead_curse.ogg"
+	sound = 'sound/magic/HorseHead_curse.ogg'
 
 /obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr)
 	if(!targets.len)
diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm
index 8351d4739fb..1d296c26d41 100644
--- a/code/datums/spells/knock.dm
+++ b/code/datums/spells/knock.dm
@@ -11,7 +11,7 @@
 	cooldown_min = 20 //20 deciseconds reduction per rank
 
 	action_icon_state = "knock"
-	sound = "sound/magic/Knock.ogg"
+	sound = 'sound/magic/Knock.ogg'
 
 /obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr)
 	for(var/turf/T in targets)
diff --git a/code/datums/spells/turf_teleport.dm b/code/datums/spells/turf_teleport.dm
index bcde1d0c2e9..8d4562aa1dc 100644
--- a/code/datums/spells/turf_teleport.dm
+++ b/code/datums/spells/turf_teleport.dm
@@ -9,8 +9,8 @@
 	var/include_space = 0 //whether it includes space tiles in possible teleport locations
 	var/include_dense = 0 //whether it includes dense tiles in possible teleport locations
 	
-	var/sound1 = "sound/weapons/ZapBang.ogg"
-	var/sound2 = "sound/weapons/ZapBang.ogg"
+	var/sound1 = 'sound/weapons/ZapBang.ogg'
+	var/sound2 = 'sound/weapons/ZapBang.ogg'
 
 /obj/effect/proc_holder/spell/targeted/turf_teleport/cast(list/targets,mob/living/user = usr)
 	playsound(get_turf(user), sound1, 50,1)
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index f3aae0ba6e7..e3892baac2f 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -26,11 +26,11 @@
 
 	action_icon_state = "magicm"
 	
-	sound = "sound/magic/MAGIC_MISSILE.ogg"
+	sound = 'sound/magic/MAGIC_MISSILE.ogg'
 
 /obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile
 	amt_weakened = 3
-	sound = "sound/magic/MM_Hit.ogg"
+	sound = 'sound/magic/MM_Hit.ogg'
 
 /obj/effect/proc_holder/spell/noclothes
 	name = "No Clothes"
@@ -55,7 +55,7 @@
 	cooldown_min = 300 //25 deciseconds reduction per rank
 
 	action_icon_state = "mutate"
-	sound = "sound/magic/Mutate.ogg"
+	sound = 'sound/magic/Mutate.ogg'
 
 /obj/effect/proc_holder/spell/targeted/genetic/mutate/cast(list/targets, mob/user = usr)
 	for(var/mob/living/target in targets)
@@ -98,7 +98,7 @@
 	emp_heavy = 6
 	emp_light = 10
 	
-	sound = "sound/magic/Disable_Tech.ogg"
+	sound = 'sound/magic/Disable_Tech.ogg'
 
 /obj/effect/proc_holder/spell/targeted/turf_teleport/blink
 	name = "Blink"
@@ -124,8 +124,8 @@
 
 	action_icon_state = "blink"
 	
-	sound1 = "sound/magic/blink.ogg"
-	sound2 = "sound/magic/blink.ogg"
+	sound1 = 'sound/magic/blink.ogg'
+	sound2 = 'sound/magic/blink.ogg'
 
 /obj/effect/proc_holder/spell/targeted/area_teleport/teleport
 	name = "Teleport"
@@ -145,8 +145,8 @@
 
 	action_icon_state = "spell_teleport"
 	
-	sound1 = "sound/magic/Teleport_diss.ogg"
-	sound2 = "sound/magic/Teleport_app.ogg"
+	sound1 = 'sound/magic/Teleport_diss.ogg'
+	sound2 = 'sound/magic/Teleport_app.ogg'
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
 	name = "Forcewall"
@@ -164,7 +164,7 @@
 	summon_lifespan = 300
 
 	action_icon_state = "shield"
-	cast_sound = "sound/magic/ForceWall.ogg"
+	cast_sound = 'sound/magic/ForceWall.ogg'
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/timestop
 	name = "Stop Time"
@@ -193,7 +193,7 @@
 
 	summon_type = list(/mob/living/simple_animal/hostile/carp)
 
-	cast_sound = "sound/magic/Summon_Karp.ogg"
+	cast_sound = 'sound/magic/Summon_Karp.ogg'
 	
 /obj/effect/proc_holder/spell/aoe_turf/conjure/construct
 	name = "Artificer"
@@ -209,7 +209,7 @@
 	summon_type = list(/obj/structure/constructshell)
 
 	action_icon_state = "artificer"
-	cast_sound = "sound/magic/SummonItems_generic.ogg"
+	cast_sound = 'sound/magic/SummonItems_generic.ogg'
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/creature
 	name = "Summon Creature Swarm"
@@ -224,7 +224,7 @@
 	range = 3
 
 	summon_type = list(/mob/living/simple_animal/hostile/creature)
-	cast_sound = "sound/magic/SummonItems_generic.ogg"
+	cast_sound = 'sound/magic/SummonItems_generic.ogg'
 
 /obj/effect/proc_holder/spell/targeted/trigger/blind
 	name = "Blind"
@@ -245,12 +245,12 @@
 /obj/effect/proc_holder/spell/targeted/inflict_handler/blind
 	amt_eye_blind = 10
 	amt_eye_blurry = 20
-	sound = "sound/magic/Blind.ogg"
+	sound = 'sound/magic/Blind.ogg'
 
 /obj/effect/proc_holder/spell/targeted/genetic/blind
 	disabilities = BLIND
 	duration = 300
-	sound = "sound/magic/Blind.ogg"
+	sound = 'sound/magic/Blind.ogg'
 
 /obj/effect/proc_holder/spell/fireball
 	name = "Fireball"
@@ -265,7 +265,7 @@
 	cooldown_min = 20 //10 deciseconds reduction per rank
 	var/fireball_type = /obj/item/projectile/magic/fireball
 	action_icon_state = "fireball0"
-	sound = "sound/magic/Fireball.ogg"
+	sound = 'sound/magic/Fireball.ogg'
 
 	active = FALSE
 
@@ -382,7 +382,7 @@
 	include_user = 1
 	selection_type = "view"
 	action_icon_state = "sacredflame"
-	sound = "sound/magic/Fireball.ogg"
+	sound = 'sound/magic/Fireball.ogg'
 
 /obj/effect/proc_holder/spell/targeted/sacred_flame/cast(list/targets, mob/user = usr)
 	for(var/mob/living/L in targets)
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 9af29f08a87..12e26827c56 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -132,12 +132,12 @@
 
 	victim.client.color = pure_red
 	animate(victim.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT)
-	sleep(10)
-	animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT)
-	sleep(duration)
-	to_chat(victim, "<span class='notice'>Your bloodlust seeps back into the bog of your subconscious and you regain self control.<span>")
-	qdel(chainsaw)
-	qdel(src)
+	spawn(10)
+		animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT)
+	spawn(duration)
+		to_chat(victim, "<span class='notice'>Your bloodlust seeps back into the bog of your subconscious and you regain self control.<span>")
+		qdel(chainsaw)
+		qdel(src)
 
 /obj/effect/mine/pickup/healing
 	name = "Blue Orb"
@@ -161,6 +161,6 @@
 		return
 	to_chat(victim, "<span class='notice'>You feel fast!</span>")
 	victim.status_flags |= GOTTAGOREALLYFAST
-	sleep(duration)
-	victim.status_flags &= ~GOTTAGOREALLYFAST
-	to_chat(victim, "<span class='notice'>You slow down.</span>")
\ No newline at end of file
+	spawn(duration)
+		victim.status_flags &= ~GOTTAGOREALLYFAST
+		to_chat(victim, "<span class='notice'>You slow down.</span>")
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index f3a8a9f2a96..b09ef2c168e 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -55,12 +55,15 @@
 	nitrogen = 23
 	temperature = 300
 	
-/turf/simulated/floor/attackby(obj/item/W, mob/user, params)
+/turf/simulated/floor/basalt/attackby(obj/item/W, mob/user, params)
+	if(..())
+		return
 	if(istype(W, /obj/item/weapon/shovel))
 		new /obj/item/weapon/ore/glass/basalt(src)
 		new /obj/item/weapon/ore/glass/basalt(src)
 		user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You uproot [src].</span>")
 		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
+		make_plating()
 
 /turf/simulated/floor/basalt/New()
 	..()
diff --git a/code/modules/mining/lavaland/colossus_loot.dm b/code/modules/mining/lavaland/colossus_loot.dm
index 1fd69bc0c5c..1928ff0f342 100644
--- a/code/modules/mining/lavaland/colossus_loot.dm
+++ b/code/modules/mining/lavaland/colossus_loot.dm
@@ -165,7 +165,6 @@
 			H.unEquip(W)
 		var/datum/job/clown/C = job_master.GetJob("Clown")
 		C.equip(H)
-		qdel(C)
 		affected_targets.Add(H)
 
 /obj/machinery/anomalous_crystal/honk/New()
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a47cac51431..e4d4f9c979d 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -327,7 +327,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "scroll2"
 	color = "#FF0000"
-	desc = "Mark your target for death. "
+	desc = "Mark your target for death."
 	var/used = FALSE
 
 /obj/item/blood_contract/attack_self(mob/user)
@@ -437,7 +437,7 @@
 	slot_flags = SLOT_BACK
 	w_class = 4
 	force = 20
-	hitsound = "swing_hit"
+	hitsound = 'swing_hit'
 	//hitsound = 'sound/weapons/sonic_jackhammer.ogg'
 	actions_types = list(/datum/action/item_action/vortex_recall, /datum/action/item_action/toggle_unfriendly_fire)
 	var/cooldown_time = 20 //how long the cooldown between non-melee ranged attacks is