Merge remote-tracking branch 'upstream/master' into FactorioFeeding

code/modules/cargo/packs/service.dm

@@ -346,6 +346,6 @@
 /datum/supply_pack/service/vending/mealdor
 	name = "Meal Vendor Supply Crate"
 	desc = "Suprising one to order. If you need a refill for the meal vendor, someone's immobile somewhere. And since you managed to make it to cargo... Well it's not our job to say no!"
-	cost = 10000
+	cost = 5000
 	contains = list(/obj/item/vending_refill/mealdor)
 	crate_name = "meal vendor supply crate"

code/modules/events/aurora_caelus.dm

@@ -75,6 +75,10 @@
 		var/aurora_color = aurora_colors[aurora_progress]
 		for(var/turf/S in applicable_areas)
 			S.set_light(l_color = aurora_color)
+	//GS Add: Starbits rarely come durring caelus events!
+	if(prob(10))
+		spawn_meteors(rand(3,6), list(/obj/effect/meteor/stellar_cluster))
+	//GS Add end.
 
 /datum/round_event/aurora_caelus/end()
 	priority_announce("The aurora caelus event is now ending. Starlight conditions will slowly return to normal. When this has concluded, please return to your workplace and continue work as normal. Have a pleasant shift, [station_name()], and thank you for watching with us.",

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -1001,4 +1001,8 @@
 
 /datum/chemical_reaction/drink/cinderella
 	results = list(/datum/reagent/consumable/cinderella = 50)
-	required_reagents = list(/datum/reagent/consumable/pineapplejuice = 10, /datum/reagent/consumable/orangejuice = 10, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/sol_dry = 20, /datum/reagent/consumable/ethanol/bitters = 2)
+	required_reagents = list(/datum/reagent/consumable/pineapplejuice = 10, /datum/reagent/consumable/orangejuice = 10, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/sol_dry = 20, /datum/reagent/consumable/ethanol/bitters = 2)
+
+/datum/chemical_reaction/drink/maui_sunrise
+	results = list(/datum/reagent/consumable/ethanol/maui_sunrise = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 2, /datum/reagent/consumable/pineapplejuice = 2, /datum/reagent/consumable/ethanol/yuyake = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/lemon_lime = 4)

code/modules/mob/living/carbon/human/species.dm

@@ -1728,6 +1728,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		if(FULLNESS_LEVEL_NOMOREPLZ to INFINITY)
 			H.throw_alert("fullness", /obj/screen/alert/beegbelly)
 
+	// Update here for changing belly to match stuffed-ness
+	var/obj/item/organ/genital/belly/B= H.getorganslot("belly")
+	if(!isnull(B) && istype(B))
+		B.update()
 
 	switch(H.fatness)
 		if(FATNESS_LEVEL_BLOB to INFINITY)

code/modules/recycling/disposal/outlet.dm

@@ -16,10 +16,6 @@
 
 /obj/structure/disposaloutlet/Initialize(mapload, obj/structure/disposalconstruct/make_from)
 	. = ..()
-	//GS Add: Hacky Solution, but it works.
-	if(type == /obj/structure/disposaloutlet/industrial_feeding_tube)
-		return
-	//GS Add End.
 	if(make_from)
 		setDir(make_from.dir)
 		make_from.forceMove(src)

code/modules/research/xenobiology/crossbreeding/_clothing.dm

@@ -139,7 +139,10 @@ Slimecrossing Armor
 /obj/item/clothing/suit/armor/heavy/adamantine/equipped(mob/living/carbon/human/user, slot) //Gives you a trait to prevent increasing speed.
 	. = ..()
 	if(slot == SLOT_WEAR_SUIT)
-		ADD_TRAIT(user, TRAIT_IMMUTABLE_SLOW, "immutableslow_[REF(src)]")
+		ADD_TRAIT(user, TRAIT_IMMUTABLE_SLOW, "immutableslow_[REF(src)]") //Adds trait to prevent increases in movespeed
+		user.unignore_slowdown("slimestatus") //Deletes the stable red trait on equip to prevent bypassing it
+	if(!(slot == SLOT_WEAR_SUIT))
+		REMOVE_TRAIT(user, TRAIT_IMMUTABLE_SLOW, "immutableslow_[REF(src)]") 
 
 /obj/structure/light_prism/spectral
 	name = "spectral light prism"
@@ -155,4 +158,4 @@ Slimecrossing Armor
 	. = ..()
 	color = newcolor
 	light_color = newcolor
-	set_light(5)
+	set_light(5)

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

@@ -772,7 +772,8 @@ datum/status_effect/stabilized/blue/on_remove()
 	if(HAS_TRAIT(owner, TRAIT_IMMUTABLE_SLOW))
 		return ..()
 	else
-		owner.ignore_slowdown("slimestatus")
+		owner.ignore_slowdown("slimestatus") 
+		return ..()
 
 /datum/status_effect/stabilized/red/on_remove()
 	owner.unignore_slowdown("slimestatus")