Tg port 2 15 (#230)

* defines/helpers * globalvars, onclick, controllers * datums and game * woooooooooorld. Uh. dm * modules sans mobs client admin * modules/admin * pref shit * modules/mob * icon updates * extra things * Cherrypicked fixes from open PRs * metastation.tgm fix * a better meta fix * reverts async breakings
2017-02-15 03:35:32 -06:00
parent fd3923d684
commit fc2dbcd9fe
192 changed files with 10451 additions and 160669 deletions
@@ -110,7 +110,7 @@
 	projectile_type = /obj/item/projectile/magic/aoe/fireball
 	base_icon_state = "fireball"
 	action_icon_state = "fireball0"
-	sound = "sound/magic/Fireball.ogg"
+	sound = 'sound/magic/Fireball.ogg'
 	active_msg = "You prepare to cast your fireball spell!"
 	deactive_msg = "You extinguish your fireball... for now."
 	active = FALSE
@@ -5,8 +5,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)
@@ -32,7 +32,7 @@
 		return

 	var/list/masks = list(/obj/item/clothing/mask/spig, /obj/item/clothing/mask/cowmask, /obj/item/clothing/mask/horsehead)
-	var/list/mSounds = list("sound/magic/PigHead_curse.ogg", "sound/magic/CowHead_Curse.ogg", "sound/magic/HorseHead_curse.ogg")
+	var/list/mSounds = list('sound/magic/PigHead_curse.ogg', 'sound/magic/CowHead_Curse.ogg', 'sound/magic/HorseHead_curse.ogg')
 	var/randM = rand(1,3)


@@ -95,5 +95,5 @@
 		else if(burnt_out)
 			L << "<span class='caution'>[charged_item] doesn't seem to be reacting to the spell...</span>"
 		else
-			playsound(get_turf(L), "sound/magic/Charge.ogg", 50, 1)
+			playsound(get_turf(L), 'sound/magic/Charge.ogg', 50, 1)
 			L << "<span class='notice'>[charged_item] suddenly feels very warm!</span>"
@@ -6,7 +6,7 @@
 	var/emp_light = 3

 	action_icon_state = "emp"
-	sound = "sound/weapons/ZapBang.ogg"
+	sound = 'sound/weapons/ZapBang.ogg'

 /obj/effect/proc_holder/spell/targeted/emplosion/cast(list/targets,mob/user = usr)
 	playsound(get_turf(user), sound, 50,1)
@@ -6,7 +6,7 @@
 	clothes_req = 0
 	invocation = "TARCOL MINTI ZHERI"
 	invocation_type = "shout"
-	sound =  "sound/magic/ForceWall.ogg"
+	sound = 'sound/magic/ForceWall.ogg'
 	action_icon_state = "shield"
 	range = -1
 	include_user = 1
@@ -42,7 +42,7 @@
 	name = "\improper disintegrating touch"
 	desc = "This hand of mine glows with an awesome power!"
 	catchphrase = "EI NATH!!"
-	on_use_sound = "sound/magic/Disintegrate.ogg"
+	on_use_sound = 'sound/magic/Disintegrate.ogg'
 	icon_state = "disintegrate"
 	item_state = "disintegrate"

@@ -60,7 +60,7 @@
 	name = "\improper petrifying touch"
 	desc = "That's the bottom line, because flesh to stone said so!"
 	catchphrase = "STAUN EI!!"
-	on_use_sound = "sound/magic/FleshToStone.ogg"
+	on_use_sound = 'sound/magic/FleshToStone.ogg'
 	icon_state = "fleshtostone"
 	item_state = "fleshtostone"

@@ -13,7 +13,7 @@
 	action_icon_state = "knock"

 /obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets,mob/user = usr)
-	user << sound("sound/magic/Knock.ogg")
+	user << sound('sound/magic/Knock.ogg')
 	for(var/turf/T in targets)
 		for(var/obj/machinery/door/door in T.contents)
 			INVOKE_ASYNC(src, .proc/open_door, door)
@@ -7,7 +7,7 @@
 	var/list/effects
 	var/ready = TRUE
 	centcom_cancast = FALSE
-	sound = "sound/effects/magic.ogg"
+	sound = 'sound/effects/magic.ogg'
 	cooldown_min = 300
 	level_max = 0

@@ -103,10 +103,10 @@
 			if(!L.put_in_hands(item_to_retrieve))
 				item_to_retrieve.loc = L.loc
 				item_to_retrieve.loc.visible_message("<span class='caution'>The [item_to_retrieve.name] suddenly appears!</span>")
-				playsound(get_turf(L),"sound/magic/SummonItems_generic.ogg",50,1)
+				playsound(get_turf(L), 'sound/magic/SummonItems_generic.ogg', 50, 1)
 			else
 				item_to_retrieve.loc.visible_message("<span class='caution'>The [item_to_retrieve.name] suddenly appears in [L]'s hand!</span>")
-				playsound(get_turf(L),"sound/magic/SummonItems_generic.ogg",50,1)
+				playsound(get_turf(L), 'sound/magic/SummonItems_generic.ogg', 50, 1)


 		if(message)
@@ -58,4 +58,4 @@
 	cooldown_min = 200 //100 deciseconds reduction per rank

 	action_icon_state = "statue"
-	sound = "sound/magic/FleshToStone.ogg"
+	sound = 'sound/magic/FleshToStone.ogg'
@@ -8,8 +8,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/user = usr)
 	playsound(get_turf(user), sound1, 50,1)
@@ -25,11 +25,11 @@
 	proj_trail_icon_state = "magicmd"

 	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/targeted/genetic/mutate
 	name = "Mutate"
@@ -48,7 +48,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/smoke
@@ -82,7 +82,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"
@@ -105,8 +105,8 @@
 	outer_tele_radius = 6

 	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/turf_teleport/blink/cult
 	name = "quickstep"
@@ -130,8 +130,8 @@

 	smoke_spread = 1
 	smoke_amt = 2
-	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/timestop
 	name = "Stop Time"
@@ -159,7 +159,7 @@
 	range = 1

 	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
@@ -176,7 +176,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
@@ -192,7 +192,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"
@@ -221,12 +221,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
 	mutations = list(BLINDMUT)
 	duration = 300
-	sound="sound/magic/Blind.ogg"
+	sound = 'sound/magic/Blind.ogg'
 /obj/effect/proc_holder/spell/aoe_turf/repulse
 	name = "Repulse"
 	desc = "This spell throws everything around the user away."
@@ -305,7 +305,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)