Meaty ores icons (#7630)

This commit is contained in:
Guti
2024-01-27 18:43:35 +01:00
committed by GitHub
parent cb9eb43237
commit dbb96dfab9
4 changed files with 18 additions and 12 deletions

View File

@@ -1,5 +1,7 @@
/obj/effect/meteor/dust/meatyore
name = "space blood"
icon = 'modular_chomp/icons/obj/meteor.dmi'
icon_state = "meaty_dust"
meteordrop = /obj/item/weapon/reagent_containers/food/snacks/bacon
/obj/effect/meteor/dust/meatyore/Bump()
@@ -8,6 +10,8 @@
/obj/effect/meteor/medium/meatyore
name = "meatyore"
icon = 'modular_chomp/icons/obj/meteor.dmi'
icon_state = "meaty_medium"
meteordrop = /obj/random/organ
/obj/effect/meteor/medium/meatyore/Bump()
@@ -21,6 +25,8 @@
/obj/effect/meteor/big/meatyore
name = "large meatyore"
icon = 'modular_chomp/icons/obj/meteor.dmi'
icon_state = "meaty_big"
meteordrop = /obj/random/organ
/obj/effect/meteor/big/meatyore/Bump()
@@ -32,8 +38,10 @@
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
/obj/effect/meteor/flaming/meatyore
/obj/effect/meteor/flaming/
name = "flaming meatyore"
icon = 'modular_chomp/icons/obj/meteor.dmi'
icon_state = "meaty_flaming"
meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
/obj/effect/meteor/flaming/meatyore/Bump()
@@ -47,6 +55,8 @@
/obj/effect/meteor/irradiated/meatyore
name = "glowing meaty ore"
icon = 'icons/obj/meteor.dmi'
icon_state = "glowing"
meteordrop = /obj/item/weapon/reagent_containers/food/snacks/deathclawmeat
/obj/effect/meteor/irradiated/meatyore/Bump()
@@ -57,11 +67,11 @@
..()
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
new /obj/effect/decal/cleanable/greenglow(get_turf(src))
SSradiation.radiate(src, 50)
/obj/effect/meteor/emp/meatyore
name = "conducting meaty ore"
icon = 'modular_chomp/icons/obj/meteor.dmi'
icon_state = "meaty_glowing"
meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
/obj/effect/meteor/emp/meatyore/Bump()
@@ -72,24 +82,20 @@
..()
if(gib)
new /obj/effect/gibspawner/human
empulse(src, rand(1, 3), rand(2, 4), rand(3, 7), rand(5, 10))
/obj/effect/meteor/emp/meatyore/get_shield_damage()
return ..() * rand(2,4)
/obj/effect/meteor/tunguska/meatyore
name = "tunguska meatyore"
icon = 'modular_chomp/icons/obj/meteor.dmi'
icon_state = "meaty_flaming"
meteordrop = /obj/item/weapon/reagent_containers/food/snacks/phorondragonmeat
/obj/effect/meteor/tunguska/meatyore/meteor_effect(var/gib)
..()
if(gib)
explosion(src.loc, 3, 6, 9, 20, 0)
new /obj/effect/gibspawner/human(get_turf(src))
/obj/effect/meteor/tunguska/meatyore/Bump()
..()
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
if(prob(20))
explosion(src.loc,2,4,6,8)
new /obj/effect/decal/cleanable/blood/gibs(get_turf(src))

View File

@@ -27,9 +27,9 @@
if(!victim)
switch(severity)
if(EVENT_LEVEL_MAJOR)
command_announcement.Announce("Meaty ores have been detected on collision course with \the [location_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
command_announcement.Announce("Meatyores have been detected on collision course with \the [location_name()].", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
else
command_announcement.Announce("\The [location_name()] is now in a meaty ore shower.", "Meteor Alert")
command_announcement.Announce("\The [location_name()] is now in a meatyore shower.", "Meteor Alert")
/datum/event/meteor_wave/meatyores/proc/get_meatyores()
switch(severity)

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@@ -4722,7 +4722,7 @@
#include "modular_chomp\code\modules\event\dangerinfestation.dm"
#include "modular_chomp\code\modules\event\event_container_ch.dm"
#include "modular_chomp\code\modules\event\heavydangerinfestation.dm"
#include "modular_chomp\code\modules\events\meatyores.dm"
#include "modular_chomp\code\modules\event\meatyores.dm"
#include "modular_chomp\code\modules\exploration\lootsafe.dm"
#include "modular_chomp\code\modules\food\drinkgglass\metaglass.dm"
#include "modular_chomp\code\modules\food\food\drinks\bottle.dm"