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

code/game/objects/structures/bonfire.dm

@@ -240,6 +240,16 @@
 
 						removed.add_thermal_energy(heat_transfer)
 
+				for(var/mob/living/L in view(3, src))
+					L.add_modifier(/datum/modifier/endothermic, 10 SECONDS, null, TRUE)
+
+				for(var/obj/item/stack/wetleather/WL in view(2, src))
+					if(WL.wetness >= 0)
+						WL.dry()
+						continue
+
+					WL.wetness = max(0, WL.wetness - rand(1, 4))
+
 				env.merge(removed)
 
 /obj/structure/bonfire/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)

code/game/objects/structures/flora/flora.dm

@@ -235,7 +235,7 @@
 /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user)
 	if(issilicon(user))
 		return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass.
-	
+
 	if(stored_item)
 		to_chat(user, "<span class='notice'>[I] won't fit in. There already appears to be something in here...</span>")
 		return
@@ -494,3 +494,47 @@
 
 /obj/structure/flora/sif/tendrils/get_harvestable_desc()
 	return "<span class='notice'>\The [src] seems to be growing over something.</span>"
+
+/datum/category_item/catalogue/flora/frostbelle
+	name = "Sivian Flora - Frostbelle"
+	desc = "A rare plant native to Sif, with very peculiar growing requirements. Rarely seen outside of their original habitat,\
+	or the homes of the wealthy, the plant's unique vein structure is actually used to carry the plant's reproductive material \
+	to forming buds, the petals of which secrete the luminescent sap containing the pollen at the time of blooming. Certain \
+	horticulturists have found ways of halting this process prior to the secretion of the sap, leaving the flower's petals \
+	bright, at the cost of making that bud sterile."
+	value = CATALOGUER_REWARD_HARD
+
+/obj/structure/flora/sif/frostbelle
+	name = "gnarly shrub"
+	desc = "A stocky plant with fins bearing luminescent veins along its branches."
+	icon_state = "grass"
+	randomize_size = TRUE
+	catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle)
+
+	harvest_tool = /obj/item/weapon/material/knife
+	max_harvests = 2
+	min_harvests = -4
+	harvest_loot = list(
+		/obj/item/weapon/reagent_containers/food/snacks/frostbelle = 1
+		)
+
+	var/variantnum = null
+
+/obj/structure/flora/sif/frostbelle/Initialize()
+	. = ..()
+
+	variantnum = rand(1,3)
+
+	update_icon()
+
+/obj/structure/flora/sif/frostbelle/update_icon()
+	..()
+
+	if(max_harvests > 0 && harvest_count < max_harvests)
+		icon_state = "[initial(icon_state)][variantnum]"
+
+	else
+		icon_state = initial(icon_state)
+
+/obj/structure/flora/sif/frostbelle/get_harvestable_desc()
+	return "<span class='notice'>\The [src] seems to be budding.</span>"

code/game/objects/structures/ghost_pods/human.dm

@@ -8,9 +8,10 @@
 	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "sleeper_1"
 	icon_state_opened = "sleeper_0"
-	density = TRUE
+	density = FALSE
 	ghost_query_type = /datum/ghost_query/stowaway
-	anchored = FALSE
+	anchored = TRUE
+	invisibility = 60
 
 	var/occupant_type = "stowaway"
 
@@ -123,7 +124,9 @@
 	if(allow_appearance_change)
 		H.change_appearance(APPEARANCE_ALL, H, check_species_whitelist = 1)
 
-	visible_message("<span class='aliem'>\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!</span>")
+//	visible_message("<span class='aliem'>\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!</span>")
+
+	qdel(src)
 
 // Manual Variant
 // This one lacks the emag option due to the fact someone has to activate it, and they will probably help the person.

code/game/objects/structures/watercloset.dm

@@ -451,6 +451,7 @@
 	busy = 0
 
 	O.clean_blood()
+	O.water_act(rand(1,10))
 	user.visible_message( \
 		"<span class='notice'>[user] washes \a [I] using \the [src].</span>", \
 		"<span class='notice'>You wash \a [I] using \the [src].</span>")