Steelpoint · Steelpoint · Jun 17, 2026 · Jun 16, 2026 · Jun 16, 2026 · Jun 16, 2026
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -400,6 +400,7 @@
 #define WALL_FOREST "forest_veg"
 #define WALL_FOREST_ROCK "rock_forest"
 #define WALL_FOREST_ROCK_DIRTY "rock_forest_dirty"
+#define WALL_SWAMP "swamp_veg"
 #define WALL_STRATA_OUTPOST_RIBBED "strata_ribbed_outpost_"
 #define WALL_STRATA_OUTPOST_BARE "strata_bare_outpost_"
 #define WALL_SHIVA_ICE "shiva_ice"

diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm
@@ -90,6 +90,7 @@
 #define AMBIENCE_JUNGLE 'sound/ambience/ambienceLV624.ogg'
 #define AMBIENCE_JUNGLEMOON 'sound/ambience/junglemoon.ogg'
 #define AMBIENCE_JUNGLE_ALT 'sound/ambience/ambience_strata.ogg'
+#define AMBIENCE_SWAMP 'sound/ambience/swamp.ogg'
 #define AMBIENCE_RIVER  'sound/ambience/ambienceriver.ogg'
 #define AMBIENCE_MALL 'sound/ambience/medbay1.ogg'
 #define AMBIENCE_CAVE 'sound/ambience/desert.ogg'

diff --git a/code/datums/vehicles.dm b/code/datums/vehicles.dm
@@ -53,3 +53,7 @@
 /datum/map_template/interior/arc
 	name = "ARC"
 	interior_id = "arc"
+
+/datum/map_template/interior/hovercraft
+	name = "Hovercraft"
+	interior_id = "hovercraft"
diff --git a/code/game/area/SekhmetSwamp.dm b/code/game/area/SekhmetSwamp.dm
@@ -37,20 +37,23 @@
 	minimap_color = MINIMAP_AREA_LZ
 	soundscape_playlist = SCAPE_PL_LV759_INDOORS
 	ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+
 /area/sekhmet/shuttles/drop2
 	name = "Sekhmet - Open Field"
 	icon_state = "shuttle2"
 	icon = 'icons/turf/area_varadero.dmi'
 	minimap_color = MINIMAP_AREA_LZ
-	soundscape_playlist = SCAPE_PL_LV759_INDOORS
-	ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+	ceiling = CEILING_NONE
+	ambience_exterior = AMBIENCE_JUNGLE_ALT
+
 /area/sekhmet/shuttles/drop3
 	name = "Sekhmet - Research Landing Pad"
 	icon_state = "shuttle"
 	icon = 'icons/turf/area_varadero.dmi'
 	minimap_color = MINIMAP_AREA_LZ
-	soundscape_playlist = SCAPE_PL_LV759_INDOORS
-	ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+	ceiling = CEILING_NONE
+	ambience_exterior = AMBIENCE_JUNGLE_ALT
+
 //============================================================ Communications
 /area/sekhmet/int_reg/telecomm
 	name = "Sekhmet - Communications Relay"
@@ -71,10 +74,11 @@
 	icon_state = "away1"
 /area/sekhmet/int_reg/catwalk
 	name = "Swamp Catwalk"
-	icon_state = "away2"
+	icon_state = "away1"
 /area/sekhmet/outside/swamp
 	name = "Sekhmet Swamp"
 	icon_state = "northwest"
+	ambience_exterior = AMBIENCE_SWAMP
 /area/sekhmet/int_reg/comms_lower
 	name = "Sekhmet Lower Commmunication Hall"
 	icon_state = "away3"
@@ -84,6 +88,9 @@
 /area/sekhmet/caves/west_cave
 	name = "Sekhmet West Caves"
 	icon_state = "cave"
+/area/sekhmet/int_reg/small_power
+	name = "Sekhmet Small Power Station"
+	icon_state = "away3"
 //============================================================SOUTHWEST PORTION (airfield, medbay, warehouse)
 /area/sekhmet/outside/airfield
 	name = "Sekhmet Clearing"
@@ -96,7 +103,7 @@
 	icon_state = "away1"
 /area/sekhmet/int_reg/warehouse
 	name = "Sekhmet Warehouse"
-	icon_state = "cargo"
+	icon_state = "yellow"
 /area/sekhmet/outside/southroad
 	name = "Sekhmet Southern Path"
 	icon_state = "south"
@@ -106,7 +113,7 @@
 //============================================================CENTRAL PORTION (central complex, yard, roadways, comms)
 /area/sekhmet/outside/central_road
 	name = "Sekhmet Central Path"
-	icon_state = "away2"
+	icon_state = "northwest"
 /area/sekhmet/int_glass/complex_generic
 	name = "Sekhmet Central Complex"
 	icon_state = "away1"
@@ -130,7 +137,7 @@
 	icon_state = "yellow"
 /area/sekhmet/int_reg/engineering
 	name = "Sekhmet Engineering"
-	icon_state = "SMES"
+	icon_state = "ass_line"
 /area/sekhmet/int_heavy/entry_zone
 	name = "Sekhmet Entry Zone"
 	icon_state = "red"

diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
@@ -453,3 +453,8 @@
 	SEND_SIGNAL(src, COMSIG_CAMERA_SET_NVG, 5, NV_COLOR_RED)
 
 #undef DEFAULT_MAP_SIZE
+
+/obj/structure/machinery/computer/cameras/colony_camera
+	name = "security cameras console"
+	desc = "Used to access the various cameras of the colony."
+	icon_state = "dark_com"
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -259,7 +259,7 @@
 
 /obj/structure/machinery/door/airlock/multi_tile/almayer/maint/reinforced/colony/autoname
 	autoname = TRUE
- 
+
 //------Containment 3-tile Doors -----//
 
 /obj/structure/machinery/door/airlock/multi_tile/almayer/containment
@@ -523,6 +523,7 @@
 
 // Elevator door
 /obj/structure/machinery/door/airlock/multi_tile/elevator
+	name = "Elevator Hatch"
 	icon = 'icons/obj/structures/doors/4x1_elevator.dmi'
 	icon_state = "door_closed"
 	width = 4

diff --git a/code/game/machinery/doors/poddoor/almayer.dm b/code/game/machinery/doors/poddoor/almayer.dm
@@ -73,6 +73,11 @@
 	opacity = TRUE
 
 /obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor
+	name = "Lockdown"
 	density = TRUE
 	opacity = TRUE
 	vehicle_resistant = TRUE
+	needs_power = FALSE
+	unacidable = TRUE
+	emp_proof = TRUE
+	explo_proof = TRUE
diff --git a/code/game/objects/effects/landmarks/item_pool.dm b/code/game/objects/effects/landmarks/item_pool.dm
@@ -41,3 +41,7 @@
 /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot
 	icon_state = "ipool_bubshot"
 	type_to_spawn = /obj/item/ammo_magazine/shotgun/buckshot
+
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot/UPP
+	icon_state = "ipool_bubshot_upp"
+	type_to_spawn = /obj/item/ammo_magazine/shotgun/heavy/buckshot
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
@@ -303,3 +303,19 @@
 /obj/item/clock/get_examine_text(mob/user)
 	. = ..()
 	. += SPAN_NOTICE("The [name] reads: [GLOB.current_date_string] - [worldtime2text()]")
+
+/obj/item/lifesaver
+	name = "lifesaver"
+	desc = "A buoyant flotation device designed to keep those in water afloat."
+	icon = 'icons/obj/items/misc.dmi'
+	item_icons = list(
+		WEAR_L_HAND = 'icons/mob/humans/onmob/inhands/items/toys_lefthand.dmi',
+		WEAR_R_HAND = 'icons/mob/humans/onmob/inhands/items/toys_righthand.dmi',
+		WEAR_WAIST = 'icons/mob/humans/onmob/clothing/belts/misc.dmi'
+	)
+	icon_state = "lifesaver"
+	throwforce = 0
+	throw_speed = SPEED_VERY_FAST
+	throw_range = 20
+	force = 0
+	flags_equip_slot = SLOT_WAIST
diff --git a/code/game/objects/items/props/rocks.dm b/code/game/objects/items/props/rocks.dm
@@ -55,6 +55,7 @@
 	icon = 'icons/obj/structures/props/natural/rocks.dmi'
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	layer = TURF_LAYER
+	plane = FLOOR_PLANE
 
 /obj/structure/prop/colorable_rock/colorable/alt
 	icon_state = "ground_colorable_alt"
diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm
@@ -240,6 +240,17 @@
 /obj/structure/barricade/handrail/kutjevo
 	icon_state = "hr_kutjevo"
 
+/obj/structure/prop/fake/handrail/kutjevo
+	name = "supports"
+	desc = "a series of metal shafts in a pattern meant for holding stuff."
+	icon = 'icons/obj/structures/handrail.dmi'
+	icon_state = "hr_kutjevo"
+	density = FALSE
+	anchored = TRUE
+	layer = TURF_LAYER
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	pixel_y = 12
+
 /obj/structure/barricade/handrail/wire
 	icon_state = "wire_rail"
 	climb_delay = CLIMB_DELAY_SHORT

diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm
@@ -130,3 +130,12 @@
 	. = ..()
 	new /obj/item/book/manual/research_and_development(src)
 	update_icon()
+
+/obj/structure/bookcase
+	icon_state = "woodbook-0"
+
+/obj/structure/bookcase/wood/update_icon()
+	if(length(contents) < 6)
+		icon_state = "woodbook-[length(contents)]"
+	else
+		icon_state = "woodbook-6"
diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm
@@ -222,6 +222,12 @@
 /obj/structure/cargo_container/kelland/right
 	icon_state = "kelland_r"
 
+/obj/structure/cargo_container/kelland/alt/left
+	icon_state = "kelland_red_l"
+
+/obj/structure/cargo_container/kelland/alt/right
+	icon_state = "kelland_red_r"
+
 /obj/structure/cargo_container/ferret
 	name = "Ferret Heavy Industries Cargo Container"
 	desc = "A huge industrial shipping container.\nThis one is from Ferret Heavy Industries, a manufacturer of terrestrial crawlers and powerloaders.\nUnfortunately, the company went bankrupt. Fortunately, these containers are really cheap now."
@@ -310,6 +316,32 @@
 /obj/structure/cargo_container/horizontal/blue/bottom
 	icon_state = "blue_b"
 
+/obj/structure/cargo_container/horizontal/red
+	name = "Generic Cargo Container"
+	desc = "A huge industrial shipping container.\nDespite the logo clearly being on the side, you cannot see it, as the logo is not facing south."
+
+/obj/structure/cargo_container/horizontal/red/top
+	icon_state = "red_t"
+
+/obj/structure/cargo_container/horizontal/red/middle
+	icon_state = "red_m"
+
+/obj/structure/cargo_container/horizontal/red/bottom
+	icon_state = "red_b"
+
+/obj/structure/cargo_container/horizontal/green
+	name = "Generic Cargo Container"
+	desc = "A huge industrial shipping container.\nDespite the logo clearly being on the side, you cannot see it, as the logo is not facing south."
+
+/obj/structure/cargo_container/horizontal/green/top
+	icon_state = "green_t"
+
+/obj/structure/cargo_container/horizontal/green/middle
+	icon_state = "green_m"
+
+/obj/structure/cargo_container/horizontal/green/bottom
+	icon_state = "green_b"
+
 /obj/structure/cargo_container/canc
 	name = "CANC Cargo Container"
 	desc = "A huge industrial shipping container.\nThis one is from the Chinese/Asian–Nation Cooperative, which was absorded into the UPP. Their massive industrial output has ensured that cargo containers bearing their symbols and name won't be disappearing any time soon."

diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -112,6 +112,17 @@
 		icon_state = icon_opened
 
 
+/obj/structure/closet/firecloset/upp_full/Initialize()
+	. = ..()
+	contents = list()
+
+	new /obj/item/clothing/suit/storage/marine/light/vest/fire_light/upp(src)
+	new /obj/item/clothing/mask/gas/upp_pfb(src)
+	new /obj/item/reagent_container/glass/canister/oxygen(src)
+	new /obj/item/tool/extinguisher(src)
+	new /obj/item/clothing/head/helmet/marine/veteran/UPP/firefighter(src)
+	new /obj/item/storage/box/m94(src)
+
 /*
  * Tool Closet
  */

diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm
@@ -277,6 +277,11 @@
 	desc = "A supply crate containing sixty TWE ORP ration packets."
 	supplies = list(/obj/item/ammo_box/magazine/misc/mre/twe = 5)
 
+/obj/structure/largecrate/supply/supplies/mre/upp
+	name = "\improper UPP IRP MRE crate (x60)"
+	desc = "A supply crate containing sixty UPP IRP MRE packets."
+	supplies = list(/obj/item/ammo_box/magazine/misc/mre/upp = 5)
+
 /obj/structure/largecrate/supply/supplies/wy_emergency_food
 	name = "\improper WY emergency nutrition briquettes crate (x100)"
 	desc = "A supply crate containing one hundred WY emergency nutrition briquettes."