Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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/crates_lockers/_closets_appearance_definitions.dm

@@ -1380,6 +1380,36 @@
 		"glass" = COLOR_WHITE
 	)
 
+// Wall cabinets
+/decl/closet_appearance/wall_double
+	base_icon =  'icons/obj/closets/bases/wall_double.dmi'
+	decal_icon = 'icons/obj/closets/decals/wall_double.dmi'
+	decals = list(
+		"vent"
+	)
+	extra_decals = null
+
+/decl/closet_appearance/wall_double/kitchen
+	decals = null
+	color = COLOR_OFF_WHITE
+
+/decl/closet_appearance/wall_double/medical
+	decals = null
+	color = COLOR_OFF_WHITE
+	extra_decals = list(
+		"stripe_outer" = COLOR_BLUE_GRAY,
+		"stripe_inner" = COLOR_OFF_WHITE,
+		"cross" = COLOR_BLUE_GRAY
+	)
+
+/decl/closet_appearance/wall_double/fire_safety
+	color = COLOR_RED_LIGHT
+	decals = null
+	extra_decals = list(
+		"stripes" = COLOR_OFF_WHITE,
+		"glass" = COLOR_WHITE
+	)
+
 // Carts
 /decl/closet_appearance/cart
 	color = COLOR_GRAY20

code/game/objects/structures/crates_lockers/closets/walllocker.dm

@@ -10,7 +10,7 @@
 	anchored = 1
 	store_mobs = 0
 
-//spawns endless (3 sets) amounts of breathmask, emergency oxy tank and crowbar
+//spawns 2 sets of breathmask, emergency oxy tank and crowbar
 
 /obj/structure/closet/walllocker/emerglocker
 	name = "emergency locker"
@@ -54,3 +54,130 @@
 /obj/structure/closet/walllocker/emerglocker/east
 	pixel_x = 32
 	dir = EAST
+
+//VOREStation Add Start
+/obj/structure/closet/walllocker/medical
+	name = "first-aid closet"
+	desc = "It's wall-mounted storage unit for first aid supplies."
+	closet_appearance = /decl/closet_appearance/wall/medical
+
+/obj/structure/closet/walllocker/medical/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker/medical/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker/medical/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker/medical/east
+	pixel_x = 32
+	dir = EAST
+//VOREStation Add End
+
+//double-size "cabinet" lockers, from Killian
+/obj/structure/closet/walllocker_double
+	desc = "A wall mounted storage cabinet."
+	name = "Wall Cabinet"
+	icon = 'icons/obj/closets/bases/wall_double.dmi'
+	closet_appearance = /decl/closet_appearance/wall_double
+	density = 0
+	anchored = 1
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+
+/obj/structure/closet/walllocker_double/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/east
+	pixel_x = 32
+	dir = EAST
+
+/obj/structure/closet/walllocker_double/kitchen
+	desc = "A wall mounted storage cabinet, for the kitchen. Now where's the flour gone..?"
+	name = "Kitchen Cabinet"
+	icon = 'icons/obj/closets/bases/wall_double.dmi'
+	closet_appearance = /decl/closet_appearance/wall_double/kitchen
+	density = 0
+	anchored = 1
+
+/obj/structure/closet/walllocker_double/kitchen/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/kitchen/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/kitchen/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/kitchen/east
+	pixel_x = 32
+	dir = EAST
+	
+/obj/structure/closet/walllocker_double/medical
+	name = "Medical Cabinet"
+	desc = "A wall mounted medical supply cabinet. Probably full of drugs!"	//not actually full of drugs, sorry!
+	closet_appearance = /decl/closet_appearance/wall_double/medical
+
+/obj/structure/closet/walllocker_double/medical/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/medical/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/medical/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/medical/east
+	pixel_x = 32
+	dir = EAST
+	
+/obj/structure/closet/walllocker_double/hydrant
+	name = "fire-safety closet"
+	desc = "It's a storage cabinet packed with fire-fighting supplies."
+	closet_appearance = /decl/closet_appearance/wall_double/fire_safety
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+	starts_with = list(
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/mask/gas,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/extinguisher,
+		/obj/item/clothing/head/hardhat/red)
+
+/obj/structure/closet/walllocker_double/hydrant/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/hydrant/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/hydrant/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/hydrant/east
+	pixel_x = 32
+	dir = EAST

code/game/objects/structures/extinguisher.dm

@@ -3,8 +3,7 @@
 	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "extinguisher_closed"
-	plane = TURF_PLANE
-	layer = ABOVE_TURF_LAYER
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
 	var/obj/item/weapon/extinguisher/has_extinguisher

code/game/objects/structures/fireaxe.dm

@@ -5,6 +5,7 @@
 	var/obj/item/weapon/material/twohanded/fireaxe/fireaxe
 	icon = 'icons/obj/closet.dmi'	//Not bothering to move icons out for now. But its dumb still.
 	icon_state = "fireaxe1000"
+	layer = ABOVE_WINDOW_LAYER
 	anchored = 1
 	density = 0
 	var/open = 0

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/flora/flora_vr.dm

@@ -36,3 +36,66 @@
 /obj/structure/flora/pumpkin/carved/owo
 	desc = "A fat, freshly picked pumpkin. This one has a face carved into it! This one has large, round eyes and a squiggly, cat-like smiling mouth. Its pleasantly surprised expression seems to suggest that the pumpkin has noticed something about you."
 	icon_state = "decor-jackolantern-owo"
+
+// Various decorá 
+/obj/structure/flora/log1
+	name = "waterlogged trunk"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A part of a felled tree. Moss is growing across it."
+	icon_state = "log1"
+	
+/obj/structure/flora/log2
+	name = "driftwood"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "Driftwood carelessly lost in the water."
+	icon_state = "log2"
+
+/obj/structure/flora/lily1
+	name = "red flowered lilypads"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A bunch of lilypads. A beautiful red flower grows in the middle of them."
+	icon_state = "lilypad1"
+	
+/obj/structure/flora/lily2
+	name = "yellow flowered lilypads"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A few lilypads. A sunny yellow flower stems from the water and from between the lilypads."
+	icon_state = "lilypad2"
+	
+/obj/structure/flora/lily3
+	name = "lilypads"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A group of flowerless lilypads."
+	icon_state = "lilypad3"
+
+/obj/structure/flora/smallbould
+	name = "small boulder"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A small boulder, with its top smothered with moss."
+	icon_state = "smallerboulder"
+	
+/obj/structure/flora/bboulder1
+	name = "large boulder"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "Small stones sit beside this large boulder. Moss grows on the top of each of them."
+	icon_state = "bigboulder1"
+	density = 1
+	
+/obj/structure/flora/bboulder2
+	name = "jagged large boulder"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "This boulder has had plates broken off it. Moss grows in the cracks and across the top."
+	icon_state = "bigboulder2"
+	density = 1
+	
+/obj/structure/flora/rocks1
+	name = "rocks"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A bunch of mossy rocks."
+	icon_state = "rocks1"
+	
+/obj/structure/flora/rocks2
+	name = "rocks"
+	icon = 'icons/obj/flora/amayastuff.dmi'
+	desc = "A bunch of mossy rocks."
+	icon_state = "rocks2"

code/game/objects/structures/lattice.dm

@@ -11,12 +11,12 @@
 /obj/structure/lattice/Initialize()
 	. = ..()
 
-	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral)))
+	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral) || istype(src.loc, /turf/simulated/shuttle/plating/airless/carry)))
 		return INITIALIZE_HINT_QDEL
 
 	for(var/obj/structure/lattice/LAT in src.loc)
 		if(LAT != src)
-			crash_with("Found multiple lattices at '[log_info_line(loc)]'")
+			log_debug("Found multiple lattices at '[log_info_line(loc)]'") //VOREStation Edit, why was this a runtime, it's harmless
 			return INITIALIZE_HINT_QDEL
 	icon = 'icons/obj/smoothlattice.dmi'
 	icon_state = "latticeblank"

code/game/objects/structures/mirror.dm

@@ -4,6 +4,7 @@
 	desc = "A SalonPro Nano-Mirror(TM) brand mirror! The leading technology in hair salon products, utilizing nano-machinery to style your hair just right."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "mirror"
+	layer = ABOVE_WINDOW_LAYER
 	density = 0
 	anchored = 1
 	var/shattered = 0

code/game/objects/structures/trash_pile_vr.dm

@@ -252,6 +252,7 @@
 					prob(1);/obj/item/weapon/material/knife/tacknife,
 					prob(1);/obj/item/weapon/storage/box/survival/space,
 					prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney,
+					prob(1);/obj/item/device/survivalcapsule/popcabin,
 					prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)
 
 	var/obj/item/I = new path()