From a3f35977df42717af261bf57ec607341225810dd Mon Sep 17 00:00:00 2001 From: ReoDaProtovali <84661000+ReoDaProtovali@users.noreply.github.com> Date: Fri, 20 Sep 2024 01:42:57 -0500 Subject: [PATCH] Legally Distinct Starbits --- .../code/game/gamemodes/meteor/meteors_gs.dm | 35 ++++++++++-------- .../{starbit.dm => stellar_piece.dm} | 11 ++++-- .../chemistry/reagents/food_reagents_gs.dm | 2 +- code/modules/events/aurora_caelus.dm | 4 +- tgstation.dme | 2 +- .../.gradle/8.8/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes 6 files changed, 30 insertions(+), 24 deletions(-) rename GainStation13/code/modules/food_and_drinks/{starbit.dm => stellar_piece.dm} (86%) diff --git a/GainStation13/code/game/gamemodes/meteor/meteors_gs.dm b/GainStation13/code/game/gamemodes/meteor/meteors_gs.dm index 86c588ed..c6311d4d 100644 --- a/GainStation13/code/game/gamemodes/meteor/meteors_gs.dm +++ b/GainStation13/code/game/gamemodes/meteor/meteors_gs.dm @@ -4,47 +4,50 @@ /////////////////////// //Starbit reference -/obj/effect/meteor/starbit +/obj/effect/meteor/stellar_cluster name = "glittery comet" desc = "A sparkling mass of crystalized spacedust. ...It looks oddly tasty?" + icon = 'GainStation13/icons/obj/starbit.dmi' + icon_state = "cluster" hits = 1 hitpwr = 1 dropamt = 5 threat = 1 meteorsound = 'GainStation13/sound/effects/star.wav' - meteordrop = list(/obj/item/stack/ore/glass) - var/starbits = 3 + meteordrop = list(/obj/item/reagent_containers/food/snacks/stellar_piece) -/obj/effect/meteor/starbit/Initialize(mapload, target) +/obj/effect/meteor/stellar_cluster/Initialize(mapload, target) . = ..() dropamt = rand(3,7) //Random amount of bits... -/obj/effect/meteor/starbit/Move() +/obj/effect/meteor/stellar_cluster/Move() . = ..() if(.) new /obj/effect/temp_visual/telekinesis(get_turf(src)) -/obj/effect/meteor/starbit/ram_turf(turf/T) //Sometimes it'll leave behind bits as it goes +/obj/effect/meteor/stellar_cluster/Bump(atom/A) + if(!A) + return + + ram_turf(get_turf(A)) + playsound(src.loc, meteorsound, 40, 1) + get_hit() + + +/obj/effect/meteor/stellar_cluster/ram_turf(turf/T) //Sometimes it'll leave behind bits as it goes if(isspaceturf(T)) return - if(starbits <= 4) + if(dropamt <= 2) return if(prob(5)) - starbits-- + dropamt-- var/thing_to_spawn = pick(meteordrop) new thing_to_spawn(T) -/obj/effect/meteor/proc/get_hit() +/obj/effect/meteor/stellar_cluster/get_hit() hits-- if(hits <= 0) make_debris() meteor_effect() qdel(src) - else - if(starbits <= 4) //If it doesnt break, it could still drop bits... - if(!prob(5)) - return - starbits-- - var/thing_to_spawn = pick(meteordrop) - new thing_to_spawn(T) diff --git a/GainStation13/code/modules/food_and_drinks/starbit.dm b/GainStation13/code/modules/food_and_drinks/stellar_piece.dm similarity index 86% rename from GainStation13/code/modules/food_and_drinks/starbit.dm rename to GainStation13/code/modules/food_and_drinks/stellar_piece.dm index a5861c9d..2ea6954f 100644 --- a/GainStation13/code/modules/food_and_drinks/starbit.dm +++ b/GainStation13/code/modules/food_and_drinks/stellar_piece.dm @@ -2,18 +2,21 @@ // ~~Starbits~~ Stellar Pieces:tm: drop from meteor-like comets which leave a handful behind when they impact, while // also not actually dealing any damage to whatever they impact. -/obj/item/reagent_containers/food/snacks/starbit +/obj/item/reagent_containers/food/snacks/stellar_piece name = "stellar piece" //PlzDontSueMeNintendo desc = "A small bit of crystalized stellar sugar. They're a rare delicacy that sometimes form under particular conditions inside of comets" // I had help creating these sprites because Im worthless at doing sprites from scratch. // Special thanks to @foxtsra on discord! // -Reo - icon = "GainStation13/icons/obj/starbit.dmi" + icon = 'GainStation13/icons/obj/starbit.dmi' icon_state = "bit" bitesize = 4 list_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/stellarsugar = 5) + tastes = list("nostalgia" = 3) + price = 10 -/obj/item/reagent_containers/food/snacks/starbit/initialize(mapload, var/bit_color) + +/obj/item/reagent_containers/food/snacks/stellar_piece/Initialize(mapload, var/bit_color) . = ..() if(!bit_color) // Color wasnt specified, lets become a random color. @@ -40,7 +43,7 @@ color = "#e0e0e0" // White... I was considering leaving it unmodified, but this makes it contrast a bit better. else color = bit_color // Some other color. - add_overlay(bit_glimmer) + add_overlay("bit_glimmer") return desc += "\nThis one seems to be [bit_color]." diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/food_reagents_gs.dm b/GainStation13/code/modules/reagents/chemistry/reagents/food_reagents_gs.dm index 518021fd..1303a59e 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/food_reagents_gs.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/food_reagents_gs.dm @@ -2,7 +2,7 @@ /datum/reagent/consumable/stellarsugar //Starbit Essence. name = "Stellar Sugar" - desc = "An edible substance formed by extremely unlikely celestial events, ground into a powder. A rare delicacy!" + description = "An edible substance formed by rare peculiar and celestial events, ground into a powder. Delicious!" reagent_state = SOLID color = "#722be3" taste_mult = 5 // It's rare... and has a pretty powerful (albeit positive) presence! diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 6017e67f..ded65d8f 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -76,8 +76,8 @@ for(var/turf/S in applicable_areas) S.set_light(l_color = aurora_color) //GS Add: Starbits rarely come durring caelus events! - if(prob(1)) - spawn_meteors(rand(1,3) list(/obj/effect/meteor/starbit)) + if(prob(10)) + spawn_meteors(rand(3,6), list(/obj/effect/meteor/stellar_cluster)) //GS Add end. /datum/round_event/aurora_caelus/end() diff --git a/tgstation.dme b/tgstation.dme index e3c2a774..f1e1a7c2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3121,7 +3121,7 @@ #include "GainStation13\code\modules\food_and_drinks\drinks.dm" #include "GainStation13\code\modules\food_and_drinks\food.dm" #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm" -#include "GainStation13\code\modules\food_and_drinks\starbit.dm" +#include "GainStation13\code\modules\food_and_drinks\stellar_piece.dm" #include "GainStation13\code\modules\food_and_drinks\objects\candy_flora.dm" #include "GainStation13\code\modules\food_and_drinks\recipes\recipes_ported.dm" #include "GainStation13\code\modules\gym\gym.dm" diff --git a/tools/dmitool/.gradle/8.8/fileHashes/fileHashes.lock b/tools/dmitool/.gradle/8.8/fileHashes/fileHashes.lock index 34990877c55db0591c487174970fc4a99b4ceecb..fc1d5c5ba0ecbf43a6cd50b3fd48543e2424f137 100644 GIT binary patch literal 17 UcmZR!PLF!!@$3F<1_)pU05=x|s{jB1 literal 17 UcmZR!PLF!!@$3F<1_)pV05=r`sQ>@~