mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
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:
@@ -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"
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user