Revert "Beware of Meaty Ores, for the Meatball Man comes" (#9883)

* Revert "Beware of Meaty Ores, for the Meatball Man comes (#9719)"

This reverts commit 1a9005a360.

* Update code/game/gamemodes/meteor/meteors.dm

* Update code/game/gamemodes/meteor/meteors.dm

* Update meteors.dm
This commit is contained in:
jcatjmeow
2020-10-17 07:49:23 -04:00
committed by GitHub
parent 238ebc0ebd
commit 96797a9eaa
4 changed files with 33 additions and 166 deletions

View File

@@ -6,17 +6,6 @@
/datum/round_event/meteor_wave/meaty
wave_name = "meaty"
possible_waves = (list(
"meaty" = 90,
"meatball" = 10)) // Same chance as a catastrophic meteor wave if wave_name isn't set (10%).
/datum/round_event/meteor_wave/meaty/announce(fake)
priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.",'sound/ai/meteors.ogg')
/datum/round_event_control/meteor_wave/meaty/meatball
name = "Meteor Wave: Extra Meaty"
typepath = /datum/round_event/meteor_wave/meaty/meatball
weight = 1
/datum/round_event/meteor_wave/meaty/meatball
wave_name = "meatball"

View File

@@ -13,10 +13,6 @@
endWhen = 66
announceWhen = 1
var/list/wave_type
var/list/possible_waves = (list(
"normal" = 50,
"threatening" = 40,
"catastrophic" = 10))
var/wave_name = "normal"
/datum/round_event/meteor_wave/New()
@@ -26,7 +22,10 @@
/datum/round_event/meteor_wave/proc/determine_wave_type()
if(!wave_name)
wave_name = pickweight(possible_waves)
wave_name = pickweight(list(
"normal" = 50,
"threatening" = 40,
"catastrophic" = 10))
switch(wave_name)
if("normal")
wave_type = GLOB.meteors_normal
@@ -38,9 +37,7 @@
else
wave_type = GLOB.meteors_catastrophic
if("meaty")
wave_type = GLOB.meteors_meaty_normal
if("meatball")
wave_type = GLOB.meteors_meaty_ball
wave_type = GLOB.meteorsB
if("space dust")
wave_type = GLOB.meteorsC
if("halloween")