SI-391 Sekhmet Swamp - PvE to PvP Ground Map Conversion

code/__DEFINES/__game.dm

@@ -42,6 +42,7 @@
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_TYRARGO_RIFT "Tyrargo Rift"
 #define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
+#define MAP_SEKHMET_SWAMP "SI-391 Sekhmet Swamp"
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_ROSTOCK "SSV Rostock" //UPP Warship
 #define MAP_HUNTERSHIP "Hunter Ship"
@@ -399,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"

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'

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"

code/game/area/SekhmetSwamp.dm

@@ -0,0 +1,184 @@
+//==================================================================SEKHMET SWAMP
+//BASE
+/area/sekhmet
+	name = "Sekhmet Swamp"
+	icon_state = "lv626"
+	can_build_special = TRUE
+	powernet_name = "ground"
+	minimap_color = MINIMAP_AREA_COLONY
+//============================================================PARENTS
+/area/sekhmet/outside
+	name = "Sekhmet Exterior"
+	ceiling = CEILING_NONE
+	ambience_exterior = AMBIENCE_JUNGLE_ALT
+/area/sekhmet/int_glass
+	name = "Sekhmet Glass"
+	ceiling = CEILING_GLASS
+	soundscape_playlist = SCAPE_PL_LV759_INDOORS
+	ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+/area/sekhmet/int_reg
+	name = "Sekhmet Metal"
+	ceiling = CEILING_METAL
+	soundscape_playlist = SCAPE_PL_LV759_INDOORS
+	ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+/area/sekhmet/int_heavy
+	name = "Sekhmet Reinforced"
+	ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
+	soundscape_playlist = SCAPE_PL_LV759_INDOORS
+	ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+/area/sekhmet/caves
+	name = "Sekhmet Caves"
+	ceiling = CEILING_SANDSTONE_ALLOW_CAS
+//============================================================SHUTTLES
+/area/sekhmet/shuttles/drop1
+	name = "Sekhmet - Military Landing Pad"
+	icon_state = "shuttle"
+	icon = 'icons/turf/area_varadero.dmi'
+	minimap_color = MINIMAP_AREA_LZ
+	is_landing_zone = TRUE
+	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
+	ceiling = CEILING_NONE
+	is_landing_zone = TRUE
+	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
+	ceiling = CEILING_NONE
+	ambience_exterior = AMBIENCE_JUNGLE_ALT
+
+//============================================================ Communications
+/area/sekhmet/int_reg/telecomm
+	name = "Sekhmet - Communications Relay"
+	icon_state = "ass_line"
+
+/area/sekhmet/int_reg/telecomm/lz1_southeast
+	name = "Sekhmet - South-East LZ2 Communications Relay"
+	minimap_color = MINIMAP_AREA_LZ
+	linked_lz = DROPSHIP_LZ1
+
+/area/sekhmet/int_reg/telecomm/lz2_northeast
+	name = "Sekhmet - North-East LZ2 Communications Relay"
+	minimap_color = MINIMAP_AREA_LZ
+	linked_lz = DROPSHIP_LZ2
+//============================================================NORTHWEST PORTION (military base, swamps, communication lower, air filtration, caves)
+/area/sekhmet/int_reg/military_hangar
+	name = "UPP Military Landing Zone"
+	icon_state = "away1"
+/area/sekhmet/int_reg/catwalk
+	name = "Swamp Catwalk"
+	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"
+/area/sekhmet/int_reg/air_filters
+	name = "Sekhmet Air Filtrators"
+	icon_state = "away3"
+/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"
+	icon_state = "southwest"
+	linked_lz = DROPSHIP_LZ1
+/area/sekhmet/int_glass/hosptial
+	name = "Sekhmet Treatment Center"
+	icon_state = "medbay"
+/area/sekhmet/int_reg/southwest_complex
+	name = "Sekhmet Southwestern Complex"
+	icon_state = "away1"
+/area/sekhmet/int_reg/warehouse
+	name = "Sekhmet Warehouse"
+	icon_state = "yellow"
+/area/sekhmet/outside/southroad
+	name = "Sekhmet Southern Path"
+	icon_state = "south"
+/area/sekhmet/caves/south_cave
+	name = "Sekhmet South Caves"
+	icon_state = "cave"
+//============================================================CENTRAL PORTION (central complex, yard, roadways, comms)
+/area/sekhmet/outside/central_road
+	name = "Sekhmet Central Path"
+	icon_state = "northwest"
+/area/sekhmet/int_glass/complex_generic
+	name = "Sekhmet Central Complex"
+	icon_state = "away1"
+/area/sekhmet/int_reg/complex_intel
+	name = "Sekhmet Intelligence"
+	icon_state = "blue-red2"
+/area/sekhmet/int_reg/complex_operation
+	name = "Sekhmet Operations"
+	icon_state = "blue"
+/area/sekhmet/int_reg/complex_comms
+	name = "Sekhmet Communication Array"
+	icon_state = "away3"
+/area/sekhmet/int_glass/south_complex
+	name = "Sekhmet Southern Complex"
+	icon_state = "green"
+/area/sekhmet/int_reg/water_filters
+	name = "Sekhmet Water Filtration"
+	icon_state = "red"
+/area/sekhmet/int_glass/offices
+	name = "Sekhmet Administrators Office"
+	icon_state = "yellow"
+/area/sekhmet/int_reg/engineering
+	name = "Sekhmet Engineering"
+	icon_state = "ass_line"
+/area/sekhmet/int_heavy/entry_zone
+	name = "Sekhmet Entry Zone"
+	icon_state = "red"
+/area/sekhmet/int_reg/yard
+	name = "Sekhmet Breaking Yard"
+	icon_state = "blue-red2"
+//============================================================EAST PORTION (research, jungle, temple)
+/area/sekhmet/outside/east_jungle
+	name = "Sekhmet Eastern Jungle"
+	icon_state = "east"
+/area/sekhmet/caves/temple
+	name = "Sekhmet North-East Caves"
+	ceiling = CEILING_UNDERGROUND_BLOCK_CAS
+	icon_state = "cave"
+/area/sekhmet/outside/temple_outer
+	name = "Sekhmet North Eastern Jungle"
+	icon_state = "northwest"
+	ceiling = CEILING_DEEP_UNDERGROUND
+/area/sekhmet/outside/southeast_road
+	name = "Sekhmet Southeastern Path"
+	icon_state = "southeast"
+/area/sekhmet/int_heavy/research
+	name = "Sekhmet Research Main Floor"
+	icon_state = "research"
+/area/sekhmet/int_reg/garage
+	name = "Sekhmet Garage"
+	icon_state = "yellow"
+//============================================================UNDERGROUND PORTION (Very Lazy Two Sectors)
+/area/sekhmet/int_heavy/low_level_gen
+	name = "Sekhmet Lower Complex"
+	icon_state = "red"
+/area/sekhmet/int_heavy/low_level_rsr
+	name = "Sekhmet Lower Research"
+	icon_state = "green"
+//============================================================EXTRA PORTION
+/area/sekhmet/int_reg/ship1
+	name = "Mikhail GENESIS-class Freight Hauler"
+	icon_state = "blue-red2"
+/area/sekhmet/int_reg/ship2
+	name = "Atreus SEQUOD-class Transport Ship"
+	icon_state = "blue-red2"

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"

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

code/game/machinery/doors/poddoor/almayer.dm

@@ -76,6 +76,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

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

code/game/objects/effects/landmarks/landmarks.dm

@@ -152,11 +152,17 @@
 /obj/effect/landmark/lizard_spawn
 	name = "lizard spawn"
 	icon_state = "lizard_spawn"
+	var/lizard_path = /mob/living/simple_animal/hostile/retaliate/giant_lizard
+
+/obj/effect/landmark/lizard_spawn/bortrough
+	name = "bortrough spawn"
+	icon_state = "bortrough_spawn"
+	lizard_path = /mob/living/simple_animal/hostile/retaliate/giant_lizard/bortrough
 
 /obj/effect/landmark/lizard_spawn/Initialize(mapload, ...)
 	. = ..()
 	if(prob(66))
-		new /mob/living/simple_animal/hostile/retaliate/giant_lizard(loc)
+		new lizard_path(loc)
 		addtimer(CALLBACK(src, PROC_REF(latespawn_lizard)), rand(35 MINUTES, 50 MINUTES))
 
 /obj/effect/landmark/lizard_spawn/proc/latespawn_lizard()
@@ -170,7 +176,7 @@
 			continue
 		addtimer(CALLBACK(src, PROC_REF(latespawn_lizard)), 1 MINUTES)
 		return
-	new /mob/living/simple_animal/hostile/retaliate/giant_lizard(loc)
+	new lizard_path(loc)
 
 #undef MAXIMUM_LIZARD_AMOUNT
 

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

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"

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

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"

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."