Legally Distinct Starbits

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)
 	

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]."

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!

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()

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"