July 5th TG sync (#1883)

July 5th TG sync

code/game/gamemodes/meteor/meteor.dm

@@ -1,55 +1,55 @@
-/datum/game_mode/meteor
-	name = "meteor"
-	config_tag = "meteor"
-	var/meteordelay = 2000
-	var/nometeors = 0
-	var/rampupdelta = 5
-	required_players = 0
-
-	announce_span = "danger"
-	announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
-
-
-/datum/game_mode/meteor/process()
-	if(nometeors || meteordelay > world.time - SSticker.round_start_time)
-		return
-
-	var/list/wavetype = GLOB.meteors_normal
-	var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
-
-
-	if (prob(meteorminutes))
-		wavetype = GLOB.meteors_threatening
-
-	if (prob(meteorminutes/2))
-		wavetype = GLOB.meteors_catastrophic
-
-	var/ramp_up_final = Clamp(round(meteorminutes/rampupdelta), 1, 10)
-
-	spawn_meteors(ramp_up_final, wavetype)
-
-
-/datum/game_mode/meteor/declare_completion()
-	var/text
-	var/survivors = 0
-
-	for(var/mob/living/player in GLOB.player_list)
-		if(player.stat != DEAD)
-			++survivors
-
-			if(player.onCentcom())
-				text += "<br><b><font size=2>[player.real_name] escaped to the safety of Centcom.</font></b>"
-			else if(player.onSyndieBase())
-				text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
-			else
-				text += "<br><font size=1>[player.real_name] survived but is stranded without any hope of rescue.</font>"
-
-
-	if(survivors)
-		to_chat(world, "<span class='boldnotice'>The following survived the meteor storm</span>:[text]")
-	else
-		to_chat(world, "<span class='boldnotice'>Nobody survived the meteor storm!</span>")
-
+/datum/game_mode/meteor
+	name = "meteor"
+	config_tag = "meteor"
+	var/meteordelay = 2000
+	var/nometeors = 0
+	var/rampupdelta = 5
+	required_players = 0
+
+	announce_span = "danger"
+	announce_text = "A major meteor shower is bombarding the station! The crew needs to evacuate or survive the onslaught."
+
+
+/datum/game_mode/meteor/process()
+	if(nometeors || meteordelay > world.time - SSticker.round_start_time)
+		return
+
+	var/list/wavetype = GLOB.meteors_normal
+	var/meteorminutes = (world.time - SSticker.round_start_time - meteordelay) / 10 / 60
+
+
+	if (prob(meteorminutes))
+		wavetype = GLOB.meteors_threatening
+
+	if (prob(meteorminutes/2))
+		wavetype = GLOB.meteors_catastrophic
+
+	var/ramp_up_final = Clamp(round(meteorminutes/rampupdelta), 1, 10)
+
+	spawn_meteors(ramp_up_final, wavetype)
+
+
+/datum/game_mode/meteor/declare_completion()
+	var/text
+	var/survivors = 0
+
+	for(var/mob/living/player in GLOB.player_list)
+		if(player.stat != DEAD)
+			++survivors
+
+			if(player.onCentcom())
+				text += "<br><b><font size=2>[player.real_name] escaped to the safety of Centcom.</font></b>"
+			else if(player.onSyndieBase())
+				text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
+			else
+				text += "<br><font size=1>[player.real_name] survived but is stranded without any hope of rescue.</font>"
+
+
+	if(survivors)
+		to_chat(world, "<span class='boldnotice'>The following survived the meteor storm</span>:[text]")
+	else
+		to_chat(world, "<span class='boldnotice'>Nobody survived the meteor storm!</span>")
+
 	SSticker.mode_result = "end - evacuation"
-	..()
-	return 1
+	..()
+	return 1

code/game/gamemodes/meteor/meteors.dm

@@ -206,7 +206,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
 	pass_flags = PASSTABLE | PASSGRILLE
 	hits = 1
 	hitpwr = 3
-	meteorsound = 'sound/weapons/Gunshot_smg.ogg'
+	meteorsound = 'sound/weapons/gunshot_smg.ogg'
 	meteordrop = list(/obj/item/weapon/ore/glass)
 	threat = 1