Oshan Laboratory map port

_maps/_basemap.dm

@@ -18,6 +18,7 @@
 		#include "map_files\SyndicateStation\SyndicateBoxStation.dmm"
 		#include "splurt_maps\map_files\Smexistation\Snaxi_Splurt.dmm"
 		#include "map_files\BoxedInStation\BoxedInStation.dmm"
+		#include "map_files\OshanLaboratory\oshanlaboratory.dmm"
 
 		#ifdef CIBUILDING
 			#include "templates.dm"

_maps/oshanlaboratory.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/oshanlaboratory.json"

_maps/oshanlaboratory.json

@@ -0,0 +1,11 @@
+{
+    "map_name": "Oshan Laboratory",
+    "map_path": "map_files/OshanLaboratory",
+    "map_file": "oshanlaboratory.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_box",
+	    "emergency": "emergency_oshan"
+    }
+}

_maps/shuttles/emergency_oshan.dmm

@@ -0,0 +1,59 @@
+"a" = (/turf/closed/wall/mineral/titanium,/area/shuttle/escape)
+"b" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/obj/structure/window/reinforced,/turf/open/floor/plating,/area/shuttle/escape)
+"c" = (/obj/structure/table/optable,/obj/machinery/vending/wallmed{pixel_x = -28},/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"d" = (/obj/effect/spawner/structure/window/shuttle,/turf/open/floor/plating,/area/shuttle/escape)
+"f" = (/obj/structure/chair/comfy/shuttle{dir = 4},/turf/open/floor/mineral/plastitanium/red/brig,/area/shuttle/escape)
+"h" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"i" = (/obj/machinery/sleeper{dir = 8},/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"j" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/open/floor/plating,/area/shuttle/escape)
+"k" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced,/turf/open/floor/plating,/area/shuttle/escape)
+"l" = (/obj/machinery/computer/emergency_shuttle{dir = 4},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"o" = (/obj/structure/chair/comfy/teal{dir = 8},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"p" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/open/floor/mineral/titanium/blue,/area/shuttle/escape)
+"q" = (/obj/machinery/door/airlock/public/glass{name = "Emergency Shuttle Cockpit"; req_access_txt = "19"},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"r" = (/obj/structure/chair/comfy/shuttle,/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"s" = (/obj/machinery/light/floor,/turf/open/floor/mineral/plastitanium/red/brig,/area/shuttle/escape)
+"t" = (/obj/structure/table/reinforced,/obj/item/storage/toolbox/emergency,/obj/structure/window/reinforced{dir = 4},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"v" = (/obj/structure/table/reinforced,/obj/item/radio,/obj/structure/window/reinforced{dir = 8},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"w" = (/obj/machinery/status_display/evac,/turf/closed/wall/mineral/titanium,/area/shuttle/escape)
+"x" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/structure/window/reinforced{dir = 8},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"y" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plating,/area/shuttle/escape)
+"z" = (/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plating,/area/shuttle/escape)
+"A" = (/turf/open/floor/mineral/titanium/blue,/area/shuttle/escape)
+"B" = (/obj/machinery/light/floor,/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"C" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plating,/area/shuttle/escape)
+"E" = (/obj/structure/chair/comfy/shuttle{dir = 4},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"G" = (/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"I" = (/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"J" = (/obj/structure/table,/obj/item/storage/backpack/duffelbag/med/surgery,/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"L" = (/turf/template_noop,/area/template_noop)
+"M" = (/obj/machinery/door/airlock/titanium{name = "Emergency Shuttle Airlock"},/obj/structure/fans/tiny,/obj/structure/fans/tiny/shield{color = "#33FF33"; name = "Atmospheric/Liquid Forcefield"},/turf/open/floor/plating,/area/shuttle/escape)
+"N" = (/obj/structure/chair/comfy/shuttle{dir = 4},/turf/open/floor/mineral/titanium/blue,/area/shuttle/escape)
+"O" = (/obj/structure/table,/turf/open/floor/mineral/titanium,/area/shuttle/escape)
+"P" = (/obj/machinery/door/airlock/public/glass{name = "Emergency Shuttle Infirmary"},/turf/open/floor/mineral/titanium/blue,/area/shuttle/escape)
+"Q" = (/turf/open/floor/mineral/plastitanium/red/brig,/area/shuttle/escape)
+"S" = (/obj/machinery/light/floor,/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+"T" = (/obj/machinery/light/floor,/turf/open/floor/mineral/titanium/blue,/area/shuttle/escape)
+"V" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/open/space/basic,/area/shuttle/escape)
+"W" = (/obj/structure/chair/comfy/shuttle{dir = 8},/turf/open/floor/mineral/plastitanium/red/brig,/area/shuttle/escape)
+"X" = (/obj/machinery/door/airlock/public/glass{name = "Emergency Shuttle Brig"; req_access_txt = "2"},/turf/open/floor/mineral/titanium/blue,/area/shuttle/escape)
+"Y" = (/turf/closed/wall/mineral/titanium/nodiagonal,/area/shuttle/escape)
+"Z" = (/obj/structure/table/reinforced,/obj/item/storage/firstaid/regular,/obj/structure/window/reinforced{dir = 4},/turf/open/floor/mineral/titanium/yellow,/area/shuttle/escape)
+
+(1,1,1) = {"
+LCyYaadaMdMadaaL
+LaaaaaNNAAAppaaa
+LarOaNNNAAApppaa
+jzIiaNAAAAAAATpa
+jzIBPATYaqaYAApd
+jzIiaNAdxStdNApd
+LacJaNAaEGhaNApd
+LaaawNAalGowNApa
+LafWaNAaEGhaNApd
+VzfQaNAdvSZdNApd
+jzQsXATYaqaYAApd
+jzfQaNAAAAAAATpa
+LafWaNNNAAApppaa
+LaaaaNNNAAAppaaa
+LbkYaadaMdMadaaL
+"}

code/__DEFINES/atmospherics.dm

@@ -165,6 +165,7 @@
 #define AIRLESS_ATMOS				"TEMP=2.7" //space
 #define FROZEN_ATMOS				"o2=21.78;n2=82.36;TEMP=180" //-93.15degC snow and ice turfs
 #define BURNMIX_ATMOS				"o2=2500;plasma=5000;TEMP=370" //used in the holodeck burn test program
+#define OCEAN_ATMOS					"water=50;TEMP=40"
 
 //ATMOSPHERICS DEPARTMENT GAS TANK TURFS
 #define ATMOS_TANK_N2O				"n2o=6000;TEMP=293.15"

code/__SPLURTCODE/DEFINES/atmospherics.dm

@@ -1,2 +1,3 @@
 // Gas defines here because somebody hates typepaths
 #define GAS_COPIUM "copium"
+#define LIQUID_H2O "water"

code/_compile_options.dm

@@ -1,4 +1,4 @@
-//#define TESTING //By using the testing("message") proc you can create debug-feedback for people with this
+#define TESTING //By using the testing("message") proc you can create debug-feedback for people with this
 								//uncommented, but not visible in the release version)
 
 //#define DATUMVAR_DEBUGGING_MODE //Enables the ability to cache datum vars and retrieve later for debugging which vars changed.

code/datums/atmosphere/planetary.dm

@@ -50,11 +50,11 @@
 	id = ICEMOON_DEFAULT_ATMOS
 
 	base_gases = list(
-		GAS_O2=10,
+		GAS_METHANE=5,
 		GAS_N2=10,
 	)
 	normal_gases = list(
-		GAS_O2=10,
+		GAS_METHANE=5,
 		GAS_N2=10
 	)
 	restricted_gases = list(
@@ -66,21 +66,43 @@
 	minimum_pressure = HAZARD_LOW_PRESSURE + 10
 	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
 
-	minimum_temp = 150
-	maximum_temp = 150
+	minimum_temp = 180
+	maximum_temp = 180
 
 /datum/atmosphere/icemoon/generate_gas_string()
 	if(prob(restricted_chance))
 		base_gases = list(
-			GAS_O2=10,
+			GAS_O2=5,
 			GAS_N2=10,
 		)
 		normal_gases = list(
-			GAS_O2=10,
+			GAS_O2=5,
 			GAS_N2=10,
 		)
 		restricted_gases = list(
 			GAS_BZ = 0.1,
 			GAS_METHYL_BROMIDE = 0.1,
 		)
 	return ..()
+
+/datum/atmosphere/ocean
+	id = OCEAN_ATMOS
+
+	base_gases = list(
+		GAS_WATER=50
+
+	)
+	normal_gases = list(
+		GAS_WATER=50
+
+	)
+	restricted_gases = list(
+		GAS_H2O=0.1
+
+	)
+
+	minimum_pressure = HAZARD_LOW_PRESSURE + 10
+	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
+
+	minimum_temp = 40
+	maximum_temp = 320

code/game/turfs/simulated/floor/reinf_floor.dm

@@ -123,7 +123,11 @@
 	name = "air floor"
 	initial_gas_mix = ATMOS_TANK_AIRMIX
 
-
+/turf/open/floor/watersand
+	name = "sand"
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "sand"
+	initial_gas_mix = OCEAN_ATMOS
 
 /turf/open/floor/engine/cult
 	name = "engraved floor"

code/modules/mining/equipment/survival_pod.dm

@@ -107,7 +107,7 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "beacon"
 	template_id = "reactor"
-	
+
 //Pod objects
 
 //Window
@@ -314,6 +314,11 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	invisibility = INVISIBILITY_ABSTRACT
 
+/obj/structure/fans/tiny/shield
+	icon_state = "fan_tiny_shield"
+	name = "Atmospheric Forcefield"
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
 //Signs
 /obj/structure/sign/mining
 	name = "nanotrasen mining corps sign"

modular_citadel/code/modules/vectorcrafts/vectorcar_heads.dm

@@ -26,3 +26,27 @@
 	name = "Captain\'s hovercar"
 	icon_state = "zoomscoot_CAPT"
 	boost_power = 20 //gosh capt how come CC lets you have more boost power?
+
+/obj/vehicle/sealed/vectorcraft/minisub
+	name = "Minisub"
+	icon_state = "minisub"
+
+/obj/vehicle/sealed/vectorcraft/secsub
+	name = "Security Minisub"
+	icon_state = "secsub"
+
+/obj/vehicle/sealed/vectorcraft/syndsub
+	name = "Syndicate Minisub"
+	icon_state = "syndsub"
+
+/obj/vehicle/sealed/vectorcraft/engsub
+	name = "Engineering Minisub"
+	icon_state = "engsub"
+
+/obj/vehicle/sealed/vectorcraft/whitesub
+	name = "Civillian Minisub"
+	icon_state = "whitesub"
+
+/obj/vehicle/sealed/vectorcraft/miningsub
+	name = "Mining Minisub"
+	icon_state = "miningsub"

modular_splurt/code/game/area/areas/station_areas.dm

@@ -9,3 +9,75 @@
 
 /area/engineering/break_room/atmos
 	name = "Atmospherics Break Room"
+
+/area/service/chapel/morgue
+	name = "Crematorium"
+
+/area/commons/lounge/upper
+	name = "Upper Crew Lounge"
+
+/area/commons/lounge/gooncave
+	name = "Nerd Dungeon"
+
+/area/service/bar/baroffice
+	name = "Bar Office"
+
+/area/commons/vacant_room/info
+	name = "Information Office"
+
+/area/commons/radio_lab
+	name = "Radio Lab"
+	icon_state = "escape_lounge"
+
+/area/commons/radio_lab/toilet
+	name = "Radio Lab Bathroom"
+	icon_state = "escape_lounge"
+
+/area/service/hydroponics/ranch
+	name = "Ranch"
+
+/area/oshan_hangars/engineering
+	name = "Engineering Dock"
+	icon_state = "yellow"
+
+/area/oshan_hangars/main
+	name = "Pod Bay"
+	icon_state = "yellow"
+
+/area/oshan_hangars/service
+	name = "Catering Hangar"
+	icon_state = "yellow"
+
+/area/oshan_hangars/sci
+	name = "Research Dock"
+	icon_state = "yellow"
+
+/area/oshan_hangars/elevator
+	name = "Sea Elevator"
+	icon_state = "yellow"
+
+/area/oshan_hangars/sec
+	name = "Secure Dock"
+	icon_state = "yellow"
+
+/area/security/interrogation
+	name = "Interrogation Room"
+
+/area/security/checkpoint/foyer
+	name = "Security Foyer Checkpoint"
+
+/area/security/beepsky
+	name = "Beepsky's House"
+
+/area/commons/lounge/sauna
+	name = "Sauna"
+
+/area/science/data
+	name = "Data Center"
+
+/area/science/outpost
+	name = "Science Outpost"
+
+/area/oshan_hangars/sci/outpost
+	name = "Science Outpost Hangar"
+	icon_state = "yellow"