Lotsa stuff

Several bugs dealt with, atmos is ready, science, hydrophonics, and some other stuff added.

code/controllers/evacuation/evacuation_bspods.dm

@@ -1,4 +1,8 @@
 //modified evacuation_pods code, for the perseverance, some of the stuff might not be completely necessary
+var/bsdrivestatus//I present to you, a global variable! It's a normal variable, except it's GLOBAL! Used to check and change the status of the bluespace drive
+//-1 = busy/shutting down, 0 = not ready/maybe ready, 1 = slowmode, 2 = quickmode, 3 = activated (slowmode), 4 = activated (quickmode), 5 = shutdown (slowmode), 6 = shutdown (quickmode), 7 = destroyed
+var/bsdelay//for changing the time needed for spoolup, used in XIV_bsdrive.dm, just like bsdrivestatus
+
 
 #define EVAC_OPT_ABANDON_BSSHIP "abandon_ship"
 #define EVAC_OPT_BS_JUMP "bluespace_jump"

maps/perseverance/XIV.dm

@@ -1,7 +1,7 @@
 //Made by Domic(mapping, bad coding, spriting), additional credits to: Sibg (mapping) and DoctorDerp (spriting). If you have any questions or feedback, ping me on discord (Domic#7513)
 
 #if !defined(using_map_DATUM)
-    #include "XIV_unit_testing.dm"
+	#include "XIV_unit_testing.dm"
 
     #include "XIV_areas.dm"
     #include "XIV_announcements.dm"

maps/perseverance/XIV_areas.dm

@@ -55,6 +55,18 @@
 	req_access = list(access_XIV)
 	sound_env = SMALL_ENCLOSED
 
+/area/ship/perseverance/midship/chemistry
+	name = "\improper Perseverance Chemistry"
+	icon_state = "chem"
+	req_access = list(access_XIV, access_medical)
+	sound_env = SMALL_ENCLOSED
+
+/area/ship/perseverance/midship/robotics
+	name = "\improper Perseverance Robotics Workshop"
+	icon_state = "robotics"
+	req_access = list(access_XIV, access_robotics)
+	sound_env = SMALL_ENCLOSED
+
 /area/ship/perseverance/midship/bathroom
 	name = "\improper Perseverance Bathroom"
 	icon_state = "toilet"
@@ -70,6 +82,17 @@
 	icon_state = "shuttle"
 	sound_env = SMALL_ENCLOSED
 
+/area/ship/perseverance/midship/hydroponics
+	name = "\improper Perseverance Hydroponics"
+	icon_state = "hydro"
+	req_access = list(access_XIV, access_research)
+	sound_env = SMALL_ENCLOSED
+
+/area/ship/perseverance/midship/xenoflora
+	name = "\improper Perseverance Xenoflora Lab"
+	icon_state = "xeno_lab"
+	sound_env = SMALL_ENCLOSED
+
 //cargo bay
 
 /area/ship/perseverance/cargobay/fore
@@ -101,12 +124,24 @@
 	req_access = list(access_XIV, access_engine)
 	sound_env = SMALL_ENCLOSED
 
+/area/ship/perseverance/eng/atmos_injection
+	name = "\improper Perseverance Atmospherics Air Injection"
+	icon_state = "atmos"
+	req_access = list(access_XIV, access_engine)
+	sound_env = SMALL_ENCLOSED
+
 /area/ship/perseverance/eng/atmos_in
 	name = "\improper Perseverance Atmospherics Filtering"
 	icon_state = "atmos"
 	req_access = list(access_XIV, access_engine)
 	sound_env = SMALL_ENCLOSED
 
+/area/ship/perseverance/eng/atmos_mixing
+	name = "\improper Perseverance Atmospherics Mixing"
+	icon_state = "atmos"
+	req_access = list(access_XIV, access_engine)
+	sound_env = SMALL_ENCLOSED
+
 //hallways
 
 /area/ship/perseverance/hall/chall
@@ -160,25 +195,25 @@
 /area/ship/perseverance/bridge/storage
 	name = "\improper Perseverance Bridge Storage"
 	icon_state = "quartstorage"
-	req_access = list(access_XIV, access_engine)
+	req_access = list(access_XIV, access_bridge)
 	sound_env = SMALL_ENCLOSED
 
 /area/ship/perseverance/bridge/comms
 	name = "\improper Perseverance Communications"
 	icon_state = "tcomsatcham"
-	req_access = list(access_XIV, access_engine)
+	req_access = list(access_XIV, access_network)
 	sound_env = SMALL_ENCLOSED
 
 /area/ship/perseverance/bridge/aisat
 	name = "\improper Perseverance AI Chamber"
 	icon_state = "ai_foyer"
-	req_access = list(access_XIV, access_engine)
+	req_access = list(access_XIV, access_engine, access_bridge)
 	sound_env = SMALL_ENCLOSED
 
 /area/ship/perseverance/bridge/aicore
 	name = "\improper Perseverance AI Core"
 	icon_state = "ai_chamber"
-	req_access = list(access_XIV, access_engine)
+	req_access = list(access_XIV, access_engine, access_bridge)
 	sound_env = SMALL_ENCLOSED
 
 /area/ship/perseverance/bridge/selfdestruct

maps/perseverance/code/XIV_atmos.dm

@@ -1,4 +1,4 @@
-// Lets see if copypaste makes it any easier (or at least less soul-sucking)
+// Copy-pasting makes it easier (and less soul-sucking)
 
 //--------------------------AIRLOCKS----------------------------------
 
@@ -182,6 +182,18 @@ obj/machinery/access_button/airlock_interior/XIV/saft
 //-------------------------TANK CONTROL-------------------------------
 
 obj/machinery/atmospherics/unary/vent_pump/tank/XIV
+	pressure_checks = 2
+	pressure_checks_default = 2
+	use_power = 1
+	internal_pressure_bound = 4000
+	internal_pressure_bound_default = 4000
+
+obj/machinery/atmospherics/unary/vent_pump/high_volume/XIV
+	stock_part_presets = list(
+		/decl/stock_part_preset/radio/receiver/vent_pump/tank = 1,
+		/decl/stock_part_preset/radio/event_transmitter/vent_pump/tank = 1
+	)
+	controlled = FALSE
 	external_pressure_bound = 0
 	external_pressure_bound_default = 0
 	icon_state = "map_vent_in"
@@ -198,17 +210,9 @@ obj/machinery/atmospherics/unary/outlet_injector/XIV
 	icon_state = "map_injector"
 	use_power = 1
 
-obj/machinery/computer/air_control/XIV/bluespacedrive
-	input_tag = "bluespacedrive_in"
-	output_tag = "bluespacedrive_out"
-	name = "Bluespace drive air control"
-	sensor_name = "Bluespace drive air sensor"
-	sensor_tag = "bluespacedrive_sensor"
-
-/obj/item/weapon/stock_parts/circuitboard/air_management/bluespacedrive
-	build_path = /obj/machinery/computer/air_control/XIV/bluespacedrive
+//BS drive
 
-obj/machinery/atmospherics/unary/vent_pump/tank/XIV/bluespacedrive
+obj/machinery/atmospherics/unary/vent_pump/high_volume/XIV/bluespacedrive
 	id_tag = "bluespacedrive_out"
 
 obj/machinery/atmospherics/unary/outlet_injector/XIV/bluespacedrive
@@ -217,18 +221,88 @@ obj/machinery/atmospherics/unary/outlet_injector/XIV/bluespacedrive
 obj/machinery/air_sensor/XIV/bluespacedrive
 	id_tag = "bluespacedrive_sensor"
 
+//xenoflora, containment unit
+
+obj/machinery/atmospherics/unary/vent_pump/high_volume/XIV/xenoflora
+	id_tag = "xenoflora_out"
+	use_power = 0
+
+obj/machinery/atmospherics/unary/outlet_injector/XIV/xenoflora
+	id = "xenoflora_in"
+
+obj/machinery/air_sensor/XIV/xenoflora
+	id_tag = "xenoflora_sensor"
+
+//atmospherics, both air tanks
+
+obj/machinery/atmospherics/unary/vent_pump/tank/XIV/airtank1
+	id_tag = "airtank1_out"
+	pump_direction = 0
+	use_power = 0//backup tank, best keep it closed for now
+
+obj/machinery/atmospherics/unary/outlet_injector/XIV/airtank1
+	id = "airtank1_in"
+	volume_rate = 700
+	use_power = 0
+
+obj/machinery/air_sensor/XIV/airtank1
+	id_tag = "airtank1_sensor"
+
+obj/machinery/atmospherics/unary/vent_pump/tank/XIV/airtank2
+	id_tag = "airtank2_out"
+	pump_direction = 0
+
+obj/machinery/atmospherics/unary/outlet_injector/XIV/airtank2
+	id = "airtank2_in"
+	volume_rate = 700
+
+obj/machinery/air_sensor/XIV/airtank2
+	id_tag = "airtank2_sensor"
+
 //--------------------VENTILATION SYSTEMS-----------------------------
 
-/obj/machinery/atmospherics/unary/vent_pump/XIV/ventilation/output
-	use_power = 1
+/obj/item/weapon/stock_parts/circuitboard/air_management/ventilation
+	build_path = /obj/machinery/computer/air_control/XIV/ventilation
+
+/obj/machinery/computer/air_control/XIV/ventilation
+	out_pressure_mode = 1
+
+/obj/machinery/computer/air_control/XIV/ventilation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open)
+	data["systemname"] = name
+	get_console_data()
+	if(!ui)
+		ui = new(user, src, ui_key, "ventcontrol.tmpl", data["systemname"], 800, 800)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+/obj/machinery/atmospherics/unary/vent_pump/tank/XIV/ventilation
+	pressure_checks = 1
+	pressure_checks_default = 1
+	use_power = 0//due to big power draw, best activated manually
+
+/obj/machinery/atmospherics/unary/vent_pump/tank/XIV/ventilation/inlet
 	icon_state = "map_vent_out"
-	external_pressure_bound = 1.2 * ONE_ATMOSPHERE
+	id_tag = "ventilation_in"
+	external_pressure_bound = 1.1 * ONE_ATMOSPHERE
+	external_pressure_bound_default = 1.1 * ONE_ATMOSPHERE
+	internal_pressure_bound_default = 1.1 * ONE_ATMOSPHERE//I can't believe this, but the consoles actually take this as the default pressure no matter if it's set to external or internal
+	use_power = 0
 
-/obj/machinery/atmospherics/unary/vent_pump/XIV/ventilation/siphon
+obj/machinery/air_sensor/XIV/ventilation_inlet
+	id_tag = "VI_Sensor"
+
+/obj/machinery/atmospherics/unary/vent_pump/tank/XIV/ventilation/outlet
 	pump_direction = 0
-	use_power = 1
 	icon_state = "map_vent_in"
-	external_pressure_bound = 0.8 * ONE_ATMOSPHERE
+	id_tag = "ventilation_out"
+	external_pressure_bound = 0.9 * ONE_ATMOSPHERE
+	external_pressure_bound_default = 0.9 * ONE_ATMOSPHERE
+	internal_pressure_bound_default = 1.1 * ONE_ATMOSPHERE
+
+obj/machinery/air_sensor/XIV/ventilation_outlet
+	id_tag = "VO_Sensor"
 
 //--------------------------FUEL MIXERS------------------------------
 

maps/perseverance/code/XIV_bsdrive.dm

@@ -1,7 +1,3 @@
-var/bsdrivestatus//I present to you, a global variable! It's a variable, except it's GLOBAL! Used in evacuation_bspods.dm
-//-1 = busy/shutting down, 0 = not ready/maybe ready, 1 = slowmode, 2 = quickmode, 3 = activated (slowmode), 4 = activated (quickmode), 5 = shutdown (slowmode), 6 = shutdown (quickmode), 7 = destroyed
-var/bsdelay// used in its evac controller, for changing the time needed for spoolup
-
 /obj/machinery/bluespacedrive
 	name = "Bluespace drive"
 	desc = "This complex device permits a safe entry into bluespace."

maps/perseverance/code/XIV_clothes.dm

@@ -1,12 +1,14 @@
 /obj/item/clothing/under/XIV
 	icon = 'maps/perseverance/icons/clothes/XIVitem.dmi'
 	item_icons = list(slot_w_uniform_str = 'maps/perseverance/icons/clothes/XIVunder.dmi')
+	sprite_sheets = list(
+		SPECIES_UNATHI = 'maps/perseverance/icons/clothes/XIVunathi.dmi'
+		)
 
 /obj/item/clothing/under/XIV/xion
 	name = "xion jumpsuit"
 	desc = "A relatively protecive utility jumpsuit produced by Xion Industries."
 	icon_state = "xion"
-	item_state = "xion"
 	worn_state = "xionsuit_s"
 	siemens_coefficient = 0.8
 	armor = list(
@@ -17,10 +19,8 @@
 	name = "xion padded suit"
 	desc = "A special suit used by higher-ranking xion employees."
 	icon = 'maps/perseverance/icons/clothes/XIVunder.dmi'
-	icon_state = "manage"
-	item_state = "manage"
-	worn_state = "manage"
-	gender_icons = 1
+	icon_state = "manage_s"
+	worn_state = "manage_s"
 	armor = list(
 		energy = ARMOR_ENERGY_SMALL,
 		rad = ARMOR_RAD_MINOR,
@@ -29,4 +29,4 @@
 		)
 
 /obj/item/clothing/under/rank/medical/XIV
-	name = "field physicians jumpsuit"
+	name = "field physician's jumpsuit"

maps/perseverance/code/XIV_minor.dm

@@ -1,6 +1,6 @@
 //all the minor overrides and some new stuff
 
-/decl/flooring/reinforced/redgrid//blackgrid is black instead of red and I have no idea why, but I'm not really willing to go diggin through this damned code to find out becauseIcouldntfinditafterafewhours
+/decl/flooring/reinforced/redgrid//blackgrid is black instead of red despite its red sprite in the map editor, so here's something that's actually red
 	name = "processing strata"
 	icon = 'icons/turf/flooring/circuit.dmi'
 	icon_base = "rcircuit"
@@ -44,6 +44,10 @@
 	door_color = COLOR_PALE_ORANGE
 	stripe_color = COLOR_BEASTY_BROWN
 
+/obj/machinery/door/airlock/autoname/research
+	door_color = COLOR_WHITE
+	stripe_color = COLOR_BOTTLE_GREEN
+
 /obj/machinery/door/airlock/hatch/ventilation
 	name = "Ventilation Hatch"
 	stripe_color = COLOR_ORANGE
@@ -191,10 +195,19 @@
 /obj/structure/closet/secure_closet/freezer/kitchen/XIV
 	req_access = list()
 
+/obj/structure/closet/secure_closet/freezer/empty
+	name = "refrigerator"
+	icon = 'icons/obj/closets/fridge.dmi'
+	closet_appearance = null
+	req_access = list()
+
+/turf/simulated/floor/reinforced/airmix/XIV
+	initial_gas = list(GAS_OXYGEN = 3 * MOLES_O2ATMOS, GAS_NITROGEN = 3 * MOLES_N2ATMOS)
+
 // This is for the multi-z gas tanks
 
 /turf/simulated/open/XIV/airmix
-	initial_gas = list(GAS_OXYGEN = MOLES_O2ATMOS, GAS_NITROGEN = MOLES_N2ATMOS)
+	initial_gas = list(GAS_OXYGEN = 3 * MOLES_O2ATMOS, GAS_NITROGEN = 3 * MOLES_N2ATMOS)
 
 /turf/simulated/open/XIV/hydrogen
 	initial_gas = list(GAS_HYDROGEN = ATMOSTANK_HYDROGEN)
@@ -278,4 +291,9 @@ obj/machinery/conveyor/XIV/scitoshuttle
 	id = "scitoshuttle"
 
 obj/machinery/conveyor_switch/oneway/XIV/scitoshuttle
-	id = "scitoshuttle"
+	id = "scitoshuttle"
+
+obj/machinery/atmospherics/unary/outlet_injector/waste
+	volume_rate = 700
+	icon_state = "on"
+	use_power = 1