Merge pull request #1210 from Yawn-Wider/izac

Voreupdate [MDB IGNORE] [IDB IGNORE]

code/ATMOSPHERICS/components/tvalve.dm

@@ -329,9 +329,6 @@
 /obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
 	if (!W.is_wrench())
 		return ..()
-	if (istype(src, /obj/machinery/atmospherics/tvalve/digital))
-		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it's too complicated.</span>")
-		return 1
 	if(!can_unwrench())
 		to_chat(user, "<span class='warnng'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")
 		add_fingerprint(user)

code/game/objects/effects/decals/posters/voreposters_vr.dm

@@ -363,7 +363,7 @@
 	name = "Virgo Orbital Research Establishment"
 	desc = "It features the logo of the local branch of Nanotrasen; Virgo Orbital Research Establishment."
 /decl/poster/vore_95
-	icon_state = "3btetherposter"
+	icon_state = "tetherposter"
 	name = "The Frontier Awaits"
 	desc = "A stunning depiction of Virgo 3b in front of a field of stars, a purple nebula laces in from behind, while the shining tower of NSB Adephagia gleams in the starlight. 'The Frontier Awaits' is printed in silver lettering. It looks like a recruitment ad."
 /decl/poster/vore_96

code/modules/client/preference_setup/loadout/loadout_mask.dm

@@ -46,13 +46,13 @@
 
 /datum/gear/mask/gaiter
 	display_name = "neck gaiter selection"
-	path = /obj/item/clothing/mask/gaiter
+	path = /obj/item/clothing/accessory/gaiter
 	cost = 1
 
 /datum/gear/mask/gaiter/New()
 	..()
 	var/list/gaiters = list()
-	for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter))
-		var/obj/item/clothing/mask/gaiter_type = gaiter
+	for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
+		var/obj/item/clothing/accessory/gaiter_type = gaiter
 		gaiters[initial(gaiter_type.name)] = gaiter_type
 	gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))

code/modules/clothing/masks/miscellaneous.dm

@@ -362,33 +362,6 @@
 				src.icon_state = "flushed"
 	return
 
-//Gaiter scarves
-/obj/item/clothing/mask/gaiter
-	name = "red neck gaiter"
-	desc = "A slightly worn neck gaiter, it's loose enough to be worn comfortably like a scarf. Commonly used by outdoorsmen and mercenaries, both to keep warm and keep debris away from the face."
-	icon_state = "gaiter_red"
-
-/obj/item/clothing/mask/gaiter/attack_self(mob/user as mob)
-	if(src.icon_state == initial(icon_state))
-		src.icon_state = "[icon_state]_up"
-		to_chat(user, "You pull the gaiter up over your nose.")
-	else
-		src.icon_state = initial(icon_state)
-		to_chat(user, "You tug the gaiter down around your neck.")
-	update_clothing_icon()	//so our mob-overlays update
-
-/obj/item/clothing/mask/gaiter/tan
-	name = "tan neck gaiter"
-	icon_state = "gaiter_tan"
-
-/obj/item/clothing/mask/gaiter/gray
-	name = "gray neck gaiter"
-	icon_state = "gaiter_gray"
-
-/obj/item/clothing/mask/gaiter/green
-	name = "green neck gaiter"
-	icon_state = "gaiter_green"
-
 /obj/item/clothing/mask/mouthwheat
 	name = "mouth wheat"
 	desc = "100% synthetic \"Country Girls LLC.\" brand mouth wheat. Warning: not for actual consumption."

code/modules/clothing/under/accessories/accessory.dm

@@ -450,4 +450,73 @@
 	name = "sash"
 	desc = "A plain, unadorned sash."
 	icon_state = "sash"
-	slot = ACCESSORY_SLOT_OVER
+	slot = ACCESSORY_SLOT_OVER
+
+//Gaiter scarves
+/obj/item/clothing/accessory/gaiter
+	name = "red neck gaiter"
+	desc = "A slightly worn neck gaiter, it's loose enough to be worn comfortably like a scarf. Commonly used by outdoorsmen and mercenaries, both to keep warm and keep debris away from the face."
+	icon_state = "gaiter_red"
+	slot_flags = SLOT_MASK | SLOT_TIE
+	body_parts_covered = FACE
+	w_class = ITEMSIZE_SMALL
+	slot = ACCESSORY_SLOT_INSIGNIA // snowflakey, i know, shut up
+	item_flags = FLEXIBLEMATERIAL
+	var/breath_masked = FALSE
+	var/obj/item/clothing/mask/breath/breathmask
+	action_button_name = "Pull On Gaiter"
+
+/obj/item/clothing/accessory/gaiter/update_clothing_icon()
+	. = ..()
+	if(ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_wear_mask()
+
+/obj/item/clothing/accessory/gaiter/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/clothing/mask/breath))
+		to_chat(user, SPAN_NOTICE("You tuck [I] behind [src]."))
+		breathmask = I
+		breath_masked = TRUE
+		user.drop_from_inventory(I, drop_location())
+		I.forceMove(src)
+		item_flags &= ~FLEXIBLEMATERIAL
+	. = ..()
+
+/obj/item/clothing/accessory/gaiter/AltClick(mob/user)
+	. = ..()
+	if(breath_masked && breathmask)
+		to_chat(user, SPAN_NOTICE("You pull [breathmask] out from behind [src], and it drops to your feet."))
+		breathmask.forceMove(drop_location())
+		breathmask = null
+		breath_masked = FALSE
+		item_flags &= ~AIRTIGHT
+		item_flags |= FLEXIBLEMATERIAL
+
+/obj/item/clothing/accessory/gaiter/attack_self(mob/user)
+	var/gaiterstring = "You pull [src] "
+	if(src.icon_state == initial(icon_state))
+		src.icon_state = "[icon_state]_up"
+		gaiterstring += "up over your nose[breath_masked ? " and secure the mask tucked underneath." : "."]"
+		if(breath_masked)
+			item_flags |= AIRTIGHT
+	else
+		src.icon_state = initial(icon_state)
+		gaiterstring += "down around your neck[breath_masked ? " and dislodge the mask tucked underneath." : "."]"
+		body_parts_covered &= ~FACE
+		if(breath_masked)
+			item_flags &= ~AIRTIGHT
+	to_chat(user, SPAN_NOTICE(gaiterstring))
+	qdel(mob_overlay) // we're gonna need to refresh these
+	update_clothing_icon()	//so our mob-overlays update
+
+/obj/item/clothing/accessory/gaiter/tan
+	name = "tan neck gaiter"
+	icon_state = "gaiter_tan"
+
+/obj/item/clothing/accessory/gaiter/gray
+	name = "gray neck gaiter"
+	icon_state = "gaiter_gray"
+
+/obj/item/clothing/accessory/gaiter/green
+	name = "green neck gaiter"
+	icon_state = "gaiter_green"

code/modules/emotes/definitions/audible.dm

@@ -227,3 +227,11 @@
 	emote_message_1p_target = "You trill at TARGET."
 	emote_message_3p_target = "trills at TARGET."
 	emote_sound = 'sound/voice/teshtrill.ogg' // Copyright CC BY-NC 3.0 Arnaud Coutancier (freesound.org) for the source audio.
+
+/decl/emote/audible/prbt
+	key = "prbt"
+	emote_message_1p = "You prbt."
+	emote_message_3p = "prbts."
+	emote_message_1p_target = "You prbt at TARGET."
+	emote_message_3p_target = "prbts at TARGET."
+	emote_sound = 'sound/voice/prbt.ogg'

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

@@ -135,15 +135,16 @@ var/list/_human_default_emotes = list(
 
 	/decl/emote/helper/vwag,
 	/decl/emote/helper/vflap,
-	//YW ADDITION: start
+	/decl/emote/audible/prbt,
+	//VOREStation Add End
+	//YW ADDITION: Add Start
 	/decl/emote/audible/chirp,
 	/decl/emote/audible/hooh,
 	/decl/emote/audible/ack,
 	/decl/emote/audible/ough,
 	/decl/emote/audible/howl,
-
 	/decl/emote/visible/cross
-	//YW ADDITION: stop
+	//YW ADDITION: Add End
 )
 
 	//VOREStation Add Start
@@ -269,7 +270,8 @@ var/list/_simple_mob_default_emotes = list(
 	/decl/emote/audible/spiderpurr,
 	/decl/emote/audible/squeaky,
 	/decl/emote/visible/mlem,
-	/decl/emote/visible/blep
+	/decl/emote/visible/blep,
+	/decl/emote/audible/prbt
 	)
 	//VOREStation Add End
 

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

@@ -208,6 +208,7 @@
 	var/greater_form										// Greater form, if any, ie. human for monkeys.
 	var/holder_type
 	var/gluttonous											// Can eat some mobs. 1 for mice, 2 for monkeys, 3 for people.
+	var/soft_landing = FALSE								// Can fall down and land safely on small falls.
 
 	var/rarity_value = 1									// Relative rarity/collector value for this species.
 	var/economic_modifier = 2								// How much money this species makes
@@ -541,6 +542,20 @@
 		H.adjustToxLoss(amount)
 
 /datum/species/proc/handle_falling(mob/living/carbon/human/H, atom/hit_atom, damage_min, damage_max, silent, planetary)
+	if(soft_landing)
+		if(planetary || !istype(H))
+			return FALSE
+
+		var/turf/landing = get_turf(hit_atom)
+		if(!istype(landing))
+			return FALSE
+
+		if(!silent)
+			to_chat(H, SPAN_NOTICE("You manage to lower impact of the fall and land safely."))
+			landing.visible_message("<b>\The [H]</b> lowers down from above, landing safely.")
+			playsound(H, "rustle", 25, 1)
+		return TRUE
+
 	return FALSE
 
 /datum/species/proc/post_spawn_special(mob/living/carbon/human/H)

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

@@ -123,6 +123,7 @@
 	//brute_mod = 1.15
 	//burn_mod =  1.15
 	//gluttonous = 1
+	soft_landing = TRUE
 	num_alternate_languages = 3
 	secondary_langs = list(LANGUAGE_BIRDSONG)
 	name_language = LANGUAGE_BIRDSONG
@@ -362,6 +363,8 @@
 	min_age = 18
 	max_age = 80
 
+	soft_landing = TRUE
+
 	base_color = "#EECEB3"
 
 	blurb = "An Avian species, coming from a distant planet, the Rapalas are the very proud race.\

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

@@ -146,7 +146,7 @@
 		/datum/mob_descriptor/build = -3
 	)
 
-	var/static/list/flight_bodyparts = list(
+/*	var/static/list/flight_bodyparts = list(
 		BP_L_ARM,
 		BP_R_ARM,
 		BP_L_HAND,
@@ -155,7 +155,7 @@
 	var/static/list/flight_suit_blacklisted_types = list(
 		/obj/item/clothing/suit/space,
 		/obj/item/clothing/suit/straight_jacket
-	)
+	)*/
 
 	default_emotes = list(
 		/decl/emote/audible/teshsqueak,
@@ -166,13 +166,13 @@
 /datum/species/teshari/equip_survival_gear(var/mob/living/carbon/human/H)
 	..()
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
-
+/*
 /datum/species/teshari/handle_falling(mob/living/carbon/human/H, atom/hit_atom, damage_min, damage_max, silent, planetary)
 
 	// Tesh can glide to save themselves from some falls. Basejumping bird
 	// without parachute, or falling bird without free wings, goes splat.
 
-	// Are we landing from orbit, or handcuffed/unconscious/tied to something? 
+	// Are we landing from orbit, or handcuffed/unconscious/tied to something?
 	if(planetary || !istype(H) || H.incapacitated(INCAPACITATION_DEFAULT|INCAPACITATION_DISABLED))
 		return ..()
 
@@ -216,7 +216,7 @@
 		H.Stun(1)
 		playsound(H, "rustle", 25, 1)
 	return TRUE
-
+*/
 
 //YW EDIT Start: loneliness
 /datum/species/teshari/handle_environment_special(var/mob/living/carbon/human/H)
@@ -312,4 +312,4 @@
 		return SEE_SELF|SEE_MOBS
 	else
 		return SEE_SELF
-//YW EDIT End
+//YW EDIT End

code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm

@@ -202,6 +202,12 @@
 	H.verbs |= /mob/living/proc/flying_toggle
 	H.verbs |= /mob/living/proc/start_wings_hovering
 
+/datum/trait/positive/soft_landing
+	name = "Soft Landing"
+	desc = "You can fall from certain heights without suffering any injuries, be it via wings, lightness of frame or general dexterity."
+	cost = 1
+	var_changes = list("soft_landing" = TRUE)
+
 /datum/trait/positive/hardfeet
 	name = "Hard Feet"
 	desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards."

code/modules/multiz/movement_vr.dm

@@ -36,6 +36,11 @@
 	if(pred.softfall || (istype(pred, /mob/living/simple_mob) && pred.mob_size <= MOB_SMALL))		// TODO: add ability for mob below to be 'soft' and cushion fall
 		safe_fall = TRUE
 
+	if(istype(pred, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = pred
+		if(H.species.soft_landing)
+			safe_fall = TRUE
+
 	var/mob/living/prey = src
 	var/fallloc = prey.loc
 	if(pred.can_be_drop_pred && prey.can_be_drop_prey)

code/modules/multiz/stairs.dm

@@ -466,11 +466,15 @@
 		if(L.buckled)
 			L.buckled.forceMove(get_turf(bottom))
 
+		var/atom/movable/P = null
+		if(L.pulling && !L.pulling.anchored)
+			P = L.pulling
+			P.forceMove(get_turf(L))
+
 		L.forceMove(get_turf(bottom))
 
 		// If the object is pulling or grabbing anything, we'll want to move those too. A grab chain may be disrupted in doing so.
-		if(L.pulling && !L.pulling.anchored)
-			var/atom/movable/P = L.pulling
+		if(P)
 			P.forceMove(get_turf(bottom))
 			L.start_pulling(P)
 

maps/gateway_vr/eggnogtownunderground.dmm

@@ -142,7 +142,7 @@
 	},
 /area/gateway/eggnogtown/vibeout)
 "gA" = (
-/turf/unsimulated/beach/water{
+/turf/simulated/floor/beach/water{
 	name = "hot spring";
 	temperature = 303.15
 	},
@@ -267,7 +267,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/turf/unsimulated/beach/water{
+/turf/simulated/floor/beach/water{
 	name = "hot spring";
 	temperature = 303.15
 	},
@@ -345,7 +345,7 @@
 /area/gateway/eggnogtown/vibeout)
 "sc" = (
 /obj/random/mob/semirandom_mob_spawner/vore/passive,
-/turf/unsimulated/beach/water{
+/turf/simulated/floor/beach/water{
 	name = "hot spring";
 	temperature = 303.15
 	},
@@ -705,6 +705,13 @@
 	temperature = 303.15
 	},
 /area/gateway/eggnogtown/underground)
+"QL" = (
+/obj/effect/map_effect/interval/effect_emitter/steam,
+/turf/simulated/floor/beach/water{
+	name = "hot spring";
+	temperature = 303.15
+	},
+/area/gateway/eggnogtown/underground)
 "Rv" = (
 /obj/structure/railing,
 /obj/structure/bonfire,
@@ -1784,7 +1791,7 @@ Da
 ab
 gA
 gA
-gA
+QL
 gA
 gA
 gA
@@ -2078,7 +2085,7 @@ gA
 gA
 gA
 gA
-gA
+QL
 gA
 gA
 gA
@@ -2202,7 +2209,7 @@ Da
 gA
 gA
 gA
-gA
+QL
 gA
 gA
 gA
@@ -11982,7 +11989,7 @@ Da
 Da
 gA
 gA
-gA
+QL
 gA
 gA
 gA
@@ -12460,7 +12467,7 @@ Da
 gA
 gA
 gA
-gA
+QL
 gA
 gA
 gA
@@ -13541,7 +13548,7 @@ Da
 gA
 gA
 gA
-gA
+QL
 gA
 gA
 gA

maps/stellardelight/ship_centcom.dmm

@@ -8,6 +8,20 @@
 /obj/item/weapon/gun/energy/lasercannon,
 /turf/simulated/floor/tiled/dark,
 /area/centcom/specops)
+"ac" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1;
+	frequency = 1380;
+	id_tag = null
+	},
+/obj/effect/map_helper/airlock/atmos/pump_out_internal,
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	frequency = 1380;
+	id_tag = "ccboat";
+	pixel_y = 29
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/ccboat)
 "ad" = (
 /obj/structure/table/rack,
 /obj/item/weapon/gun/energy/xray,
@@ -515,6 +529,43 @@
 /obj/structure/bed/chair/shuttle,
 /turf/simulated/floor/tiled/eris/dark/techfloor_grid,
 /area/shuttle/ccboat)
+"bB" = (
+/obj/machinery/airlock_sensor{
+	dir = 8;
+	frequency = 1380;
+	id_tag = null;
+	pixel_x = 24
+	},
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 1;
+	frequency = 1380;
+	id_tag = null
+	},
+/obj/effect/map_helper/airlock/atmos/pump_out_internal,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/ccboat)
+"bC" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	frequency = 1380;
+	id_tag = null
+	},
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
+/obj/effect/overmap/visitable/ship/landable/ccboat,
+/turf/simulated/floor/plating,
+/area/shuttle/ccboat)
+"bD" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	frequency = 1380;
+	id_tag = null
+	},
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/turf/simulated/floor/plating,
+/area/shuttle/ccboat)
 "bE" = (
 /obj/effect/floor_decal/fancy_shuttle{
 	fancy_shuttle_tag = "tram"
@@ -2391,16 +2442,6 @@
 	},
 /turf/simulated/shuttle/floor/white,
 /area/shuttle/escape)
-"id" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1380;
-	id_tag = null
-	},
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
-/obj/effect/overmap/visitable/ship/landable/ccboat,
-/turf/simulated/floor/airless,
-/area/shuttle/ccboat)
 "ih" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -4530,20 +4571,6 @@
 /obj/machinery/door/airlock/glass,
 /turf/simulated/floor/tiled,
 /area/centcom/main_hall)
-"qV" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1380;
-	id_tag = null
-	},
-/obj/effect/map_helper/airlock/atmos/pump_out_internal,
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "ccboat";
-	pixel_y = 29
-	},
-/turf/simulated/floor/airless,
-/area/shuttle/ccboat)
 "qZ" = (
 /obj/machinery/body_scanconsole{
 	dir = 4
@@ -4649,14 +4676,6 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
-"rR" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	frequency = 1380;
-	id_tag = null
-	},
-/obj/effect/map_helper/airlock/atmos/chamber_pump,
-/turf/simulated/floor/airless,
-/area/shuttle/ccboat)
 "rU" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
 	frequency = 1380;
@@ -6060,25 +6079,6 @@
 	name = "reinforced floor"
 	},
 /area/centcom)
-"zx" = (
-/obj/machinery/airlock_sensor{
-	dir = 8;
-	frequency = 1380;
-	id_tag = null;
-	pixel_x = 24
-	},
-/obj/effect/map_helper/airlock/sensor/chamber_sensor,
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
-	dir = 1;
-	frequency = 1380;
-	id_tag = null
-	},
-/obj/effect/map_helper/airlock/atmos/pump_out_internal,
-/obj/machinery/light/small{
-	dir = 1
-	},
-/turf/simulated/floor/airless,
-/area/shuttle/ccboat)
 "zy" = (
 /obj/effect/floor_decal/derelict/d11,
 /turf/simulated/floor/tiled,
@@ -25760,8 +25760,8 @@ kX
 TF
 TF
 Cr
-qV
-id
+ac
+bC
 wO
 vT
 kX
@@ -25902,8 +25902,8 @@ bA
 GK
 Vw
 Cr
-zx
-rR
+bB
+bD
 xB
 Bj
 AR

maps/stellardelight/stellar_delight1.dmm

@@ -1038,6 +1038,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/item/weapon/material/ashtray/glass,
 /turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/starboard)
 "cm" = (
@@ -5527,7 +5528,7 @@
 	dir = 4;
 	door_color = "#333333";
 	name = "Exploration Equipment Room";
-	req_one_access = list(19,43,67,66);
+	req_one_access = list(19,43,66);
 	stripe_color = "#5a19a8"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
@@ -6153,7 +6154,7 @@
 	dir = 8;
 	door_color = "#333333";
 	name = "Exploration";
-	req_one_access = list(19,43,67,66);
+	req_one_access = list(19,43,66);
 	stripe_color = "#5a19a8"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
@@ -11740,6 +11741,10 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/stellardelight/deck1/exploration)
+"zi" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck1/portcent)
 "zj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -17165,6 +17170,17 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/security/lobby)
+"Lf" = (
+/obj/structure/cable/green{
+	color = "#42038a";
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/space_heater,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck1/starboardaft)
 "Lg" = (
 /turf/simulated/wall/bay/r_wall/steel,
 /area/chapel/chapel_morgue)
@@ -22439,6 +22455,7 @@
 	dir = 4
 	},
 /obj/random/coin/sometimes,
+/obj/item/weapon/material/ashtray/glass,
 /turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/port)
 "Wg" = (
@@ -23137,7 +23154,7 @@
 	dir = 4;
 	door_color = "#ffffff";
 	name = "maintenance access";
-	req_one_access = list(19,43,67,66);
+	req_one_access = list(19,43,66);
 	stripe_color = "#5a19a8"
 	},
 /turf/simulated/floor/tiled/steel_ridged,
@@ -32158,7 +32175,7 @@ gY
 gY
 km
 QB
-gY
+zi
 gY
 HY
 GN
@@ -36862,7 +36879,7 @@ Dv
 il
 OR
 CY
-Dv
+Lf
 Qz
 Dv
 Dv

maps/stellardelight/stellar_delight2.dmm

@@ -812,6 +812,7 @@
 	dir = 6
 	},
 /obj/machinery/alarm/angled,
+/obj/machinery/space_heater,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portfore)
 "bR" = (
@@ -11771,16 +11772,15 @@
 /obj/machinery/computer/skills{
 	pixel_y = 7
 	},
-/obj/machinery/button/remote/blast_door{
-	id = "captaindoor";
-	name = "Door Remote";
-	pixel_x = -15;
-	pixel_y = 2
-	},
 /obj/structure/table/darkglass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/machinery/button/remote/airlock{
+	id = "captaindoor";
+	pixel_x = -15;
+	pixel_y = 2
+	},
 /turf/simulated/floor/carpet/blucarpet,
 /area/crew_quarters/captain)
 "AP" = (
@@ -12236,6 +12236,16 @@
 	},
 /turf/simulated/floor/tiled/eris/white/cargo,
 /area/stellardelight/deck2/triage)
+"BV" = (
+/obj/structure/table/marble,
+/obj/machinery/door/blast/shutters{
+	id = "bar";
+	layer = 3.3;
+	name = "Bar Shutters"
+	},
+/obj/item/weapon/material/ashtray/glass,
+/turf/simulated/floor/lino,
+/area/crew_quarters/bar)
 "BW" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/angled_bay/external/glass{
@@ -13835,6 +13845,7 @@
 /obj/machinery/light/floortube{
 	pixel_y = -6
 	},
+/obj/item/weapon/material/ashtray/glass,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
 "Fx" = (
@@ -16778,6 +16789,7 @@
 	pixel_x = 2;
 	pixel_y = 7
 	},
+/obj/item/weapon/material/ashtray/glass,
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/crew_quarters/bar)
 "LQ" = (
@@ -33626,7 +33638,7 @@ Gn
 zw
 fi
 dw
-On
+BV
 py
 fp
 mn

maps/stellardelight/stellar_delight3.dmm

@@ -1407,6 +1407,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
+"fP" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/portaft)
 "fS" = (
 /turf/simulated/wall/bay/steel,
 /area/crew_quarters/heads/hop)
@@ -3192,6 +3196,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/open,
 /area/stellardelight/deck2/starboard)
+"mT" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/starboardcent)
 "mU" = (
 /obj/structure/table/steel_reinforced,
 /turf/simulated/floor/tiled/eris/dark/cargo,
@@ -6426,6 +6434,12 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/crew_quarters/heads/hop)
+"yP" = (
+/obj/structure/sign/warning/falling{
+	pixel_x = 32
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/starboard)
 "yR" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/window/bay/reinforced,
@@ -6789,6 +6803,9 @@
 /area/maintenance/stellardelight/deck3/aftstarroom)
 "zW" = (
 /obj/structure/lattice,
+/obj/structure/sign/warning/falling{
+	pixel_y = 32
+	},
 /turf/simulated/open,
 /area/stellardelight/deck2/fore)
 "zX" = (
@@ -8012,6 +8029,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hos)
+"Eu" = (
+/turf/simulated/wall/bay/r_wall/blue,
+/area/stellardelight/deck2/port)
 "Ev" = (
 /obj/structure/cable/blue{
 	icon_state = "1-4"
@@ -8104,6 +8124,7 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/angled{
+	cell_type = /obj/item/weapon/cell/super;
 	dir = 1;
 	name = "night shift APC";
 	nightshift_setting = 2
@@ -8765,6 +8786,12 @@
 /obj/random/maintenance/clean,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/aftstarroom)
+"Hq" = (
+/obj/structure/sign/warning/falling{
+	pixel_y = 32
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/fore)
 "Hs" = (
 /turf/simulated/wall/bay/orange,
 /area/crew_quarters/heads/chief)
@@ -9786,6 +9813,12 @@
 /obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
+"Lf" = (
+/obj/structure/sign/warning/falling{
+	pixel_x = -32
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/starboard)
 "Lh" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/cable/blue{
@@ -11077,6 +11110,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/stellardelight/deck3/foreportrooma)
+"Ps" = (
+/obj/machinery/space_heater,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/forestarroomb)
 "Px" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -12804,6 +12841,12 @@
 /obj/machinery/computer/ship/helm/adv,
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/sdboat/fore)
+"Wl" = (
+/obj/structure/sign/warning/falling{
+	pixel_x = -32
+	},
+/turf/simulated/open,
+/area/stellardelight/deck2/port)
 "Wn" = (
 /obj/structure/bed/chair/shuttle{
 	dir = 4
@@ -20867,7 +20910,7 @@ dE
 dE
 dE
 dE
-dE
+fP
 HY
 ed
 Bm
@@ -21295,7 +21338,7 @@ oW
 oW
 QF
 oW
-oW
+Wl
 CS
 Ii
 Qu
@@ -21579,7 +21622,7 @@ oW
 oW
 ZS
 oW
-oW
+Eu
 NI
 IO
 Ii
@@ -22126,7 +22169,7 @@ QF
 oW
 dT
 hY
-oW
+Wl
 oW
 QF
 oW
@@ -23519,7 +23562,7 @@ qp
 Vm
 qp
 Qp
-qF
+Hq
 bn
 tV
 rc
@@ -25248,7 +25291,7 @@ aJ
 ow
 ZC
 ow
-ow
+yP
 Ks
 RG
 ow
@@ -25516,7 +25559,7 @@ Yj
 Yj
 Ef
 FE
-FE
+Ps
 eE
 dx
 ch
@@ -25536,7 +25579,7 @@ Io
 QP
 xH
 OG
-xH
+mT
 Yx
 me
 ow
@@ -25831,7 +25874,7 @@ ow
 OE
 ow
 ow
-ow
+Lf
 CH
 ow
 ow
@@ -26122,7 +26165,7 @@ ow
 ow
 ow
 ZC
-ow
+yP
 ow
 ZM
 ow

maps/submaps/pois_vr/debris_field/mining_drones.dmm

@@ -95,13 +95,6 @@
 	},
 /turf/simulated/floor/airless,
 /area/submap/debrisfield/mining_outpost)
-"r" = (
-/obj/random/multiple/underdark/ores,
-/obj/structure/closet/syndicate/resources{
-	name = "storage locker"
-	},
-/turf/simulated/floor/tiled/airless,
-/area/submap/debrisfield/mining_outpost)
 "s" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -303,7 +296,7 @@ d
 h
 m
 z
-r
+H
 g
 S
 g

maps/submaps/surface_submaps/mountains/temple.dmm

@@ -3,7 +3,7 @@
 /turf/template_noop,
 /area/submap/AbandonedTemple)
 "b" = (
-/turf/simulated/mineral/floor,
+/turf/simulated/mineral/floor/cave,
 /area/submap/AbandonedTemple)
 "c" = (
 /turf/simulated/floor/tiled/asteroid_steel,
@@ -206,7 +206,7 @@
 /area/submap/AbandonedTemple)
 "O" = (
 /obj/effect/decal/cleanable/blood,
-/turf/simulated/mineral/floor,
+/turf/simulated/mineral/floor/cave,
 /area/submap/AbandonedTemple)
 
 (1,1,1) = {"