mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
Revert "adds cat meteors"
This commit is contained in:
@@ -18,8 +18,6 @@ GLOBAL_LIST_INIT(meteorsB, list(/obj/effect/meteor/meaty=5, /obj/effect/meteor/m
|
|||||||
|
|
||||||
GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
|
GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
|
||||||
|
|
||||||
GLOBAL_LIST_INIT(meteorsCat, list(/obj/effect/meteor/cat)) //for cat meteors
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////
|
///////////////////////////////
|
||||||
//Meteor spawning global procs
|
//Meteor spawning global procs
|
||||||
@@ -348,17 +346,6 @@ GLOBAL_LIST_INIT(meteorsCat, list(/obj/effect/meteor/cat)) //for cat meteors
|
|||||||
if(prob(20))
|
if(prob(20))
|
||||||
explosion(src.loc,2,4,6,8)
|
explosion(src.loc,2,4,6,8)
|
||||||
|
|
||||||
/obj/effect/meteor/cat
|
|
||||||
name = "space cat"
|
|
||||||
icon_state = "catmeteor"
|
|
||||||
desc = "Meow."
|
|
||||||
hits = 1
|
|
||||||
heavy = FALSE
|
|
||||||
meteorsound = 'sound/effects/meow1.ogg'
|
|
||||||
meteordrop = list(/mob/living/simple_animal/pet/cat/space)
|
|
||||||
threat = 0
|
|
||||||
dropamt = 1
|
|
||||||
|
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
//Spookoween meteors
|
//Spookoween meteors
|
||||||
/////////////////////////
|
/////////////////////////
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
/datum/round_event_control/meteor_wave/cat
|
|
||||||
name = "Meteor Wave: CATastrophic"
|
|
||||||
typepath = /datum/round_event/meteor_wave/cat
|
|
||||||
weight = 10
|
|
||||||
max_occurrences = 1
|
|
||||||
|
|
||||||
/datum/round_event/meteor_wave/cat
|
|
||||||
wave_name = "cat"
|
|
||||||
|
|
||||||
/datum/round_event/meteor_wave/cat/announce(fake)
|
|
||||||
priority_announce("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert", "meteors")
|
|
||||||
@@ -56,8 +56,6 @@
|
|||||||
wave_type = GLOB.meteorsC
|
wave_type = GLOB.meteorsC
|
||||||
if("halloween")
|
if("halloween")
|
||||||
wave_type = GLOB.meteorsSPOOKY
|
wave_type = GLOB.meteorsSPOOKY
|
||||||
if("cat")
|
|
||||||
wave_type = GLOB.meteorsCat
|
|
||||||
else
|
else
|
||||||
WARNING("Wave name of [wave_name] not recognised.")
|
WARNING("Wave name of [wave_name] not recognised.")
|
||||||
kill()
|
kill()
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 12 KiB |
Reference in New Issue
Block a user