Remaps the syndicate ambush space ruin. (#34621)

* Remaps the syndicate ambush space ruin completely.

* conflict fixes

* changes station_lock_override vars to lock_override

* banging donk

code/game/area/areas/shuttles.dm

@@ -140,3 +140,28 @@
 /area/shuttle/syndicate_scout
 	name = "Syndicate Scout"
 	blob_allowed = FALSE
+
+/area/shuttle/caravan
+	blob_allowed = FALSE
+	requires_power = TRUE
+
+/area/shuttle/caravan/syndicate1
+	name = "Syndicate Fighter"
+
+/area/shuttle/caravan/syndicate2
+	name = "Syndicate Fighter"
+
+/area/shuttle/caravan/syndicate3
+	name = "Syndicate Drop Ship"
+
+/area/shuttle/caravan/pirate
+	name = "Pirate Cutter"
+
+/area/shuttle/caravan/freighter1
+	name = "Small Freighter"
+
+/area/shuttle/caravan/freighter2
+	name = "Tiny Freighter"
+
+/area/shuttle/caravan/freighter3
+	name = "Tiny Freighter"

code/game/machinery/porta_turret/portable_turret.dm

@@ -569,6 +569,15 @@
 	desc = "A ballistic machine gun auto-turret."
 
 /obj/machinery/porta_turret/syndicate/energy
+	icon_state = "standard_stun"
+	base_icon_state = "standard"
+	stun_projectile = /obj/item/projectile/energy/electrode
+	stun_projectile_sound = 'sound/weapons/taser.ogg'
+	lethal_projectile = /obj/item/projectile/beam/laser
+	lethal_projectile_sound = 'sound/weapons/laser.ogg'
+	desc = "An energy blaster auto-turret."
+
+/obj/machinery/porta_turret/syndicate/energy/heavy
 	icon_state = "standard_stun"
 	base_icon_state = "standard"
 	stun_projectile = /obj/item/projectile/energy/electrode

code/game/machinery/suit_storage_unit.dm

@@ -103,6 +103,10 @@
 	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/tank/internals/emergency_oxygen/double
 
+/obj/machinery/suit_storage_unit/open
+	state_open = TRUE
+	density = FALSE
+
 /obj/machinery/suit_storage_unit/Initialize()
 	. = ..()
 	wires = new /datum/wires/suit_storage_unit(src)

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

@@ -340,6 +340,8 @@
 	icon_state = "vault"
 /turf/open/floor/plasteel/vault/corner
 	icon_state = "vaultcorner"
+/turf/open/floor/plasteel/vault/airless
+	initial_gas_mix = "TEMP=2.7"
 /turf/open/floor/plasteel/vault/telecomms
 	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/vault/telecomms/mainframe

code/modules/awaymissions/corpse.dm

@@ -275,6 +275,10 @@
 /obj/effect/mob_spawn/human/corpse/assistant/spanishflu_infection
 	disease = /datum/disease/fluspanish
 
+/obj/effect/mob_spawn/human/corpse/cargo_tech
+	name = "Cargo Tech"
+	outfit = /datum/outfit/job/cargo_tech
+
 /obj/effect/mob_spawn/human/cook
 	name = "Cook"
 	outfit = /datum/outfit/job/cook

code/modules/ruins/spaceruin_code/caravanambush.dm

@@ -25,3 +25,142 @@
 	desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."
 	name = "experimental crowbar"
 	toolspeed = 0.3
+
+/obj/machinery/computer/shuttle/caravan
+
+/obj/item/circuitboard/computer/caravan
+	build_path = /obj/machinery/computer/shuttle/caravan
+
+/obj/item/circuitboard/computer/caravan/trade1
+	build_path = /obj/machinery/computer/shuttle/caravan/trade1
+
+/obj/item/circuitboard/computer/caravan/pirate
+	build_path = /obj/machinery/computer/shuttle/caravan/pirate
+
+/obj/item/circuitboard/computer/caravan/syndicate1
+	build_path = /obj/machinery/computer/shuttle/caravan/syndicate1
+
+/obj/item/circuitboard/computer/caravan/syndicate2
+	build_path = /obj/machinery/computer/shuttle/caravan/syndicate2
+
+/obj/item/circuitboard/computer/caravan/syndicate3
+	build_path = /obj/machinery/computer/shuttle/caravan/syndicate3
+
+/obj/machinery/computer/shuttle/caravan/trade1
+	name = "Small Freighter Shuttle Console"
+	desc = "Used to control the Small Freighter."
+	circuit = /obj/item/circuitboard/computer/caravan/trade1
+	shuttleId = "caravantrade1"
+	possible_destinations = "whiteship_away;whiteship_home;whiteship_z4;whiteship_lavaland;caravantrade1_custom;caravantrade1_ambush"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/trade1
+	name = "Small Freighter Navigation Computer"
+	desc = "Used to designate a precise transit location for the Small Freighter."
+	shuttleId = "caravantrade1"
+	lock_override = NONE
+	shuttlePortId = "caravantrade1_custom"
+	shuttlePortName = "Custom Location"
+	jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "caravantrade1_ambush" = 1)
+	view_range = 14
+	x_offset = -5
+	y_offset = -5
+	designate_time = 100
+
+/obj/machinery/computer/shuttle/caravan/pirate
+	name = "Pirate Cutter Shuttle Console"
+	desc = "Used to control the Pirate Cutter."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	light_color = LIGHT_COLOR_RED
+	circuit = /obj/item/circuitboard/computer/caravan/pirate
+	shuttleId = "caravanpirate"
+	possible_destinations = "caravanpirate_custom;caravanpirate_ambush"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/pirate
+	name = "Pirate Cutter Navigation Computer"
+	desc = "Used to designate a precise transit location for the Pirate Cutter."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	shuttleId = "caravanpirate"
+	lock_override = NONE
+	shuttlePortId = "caravanpirate_custom"
+	shuttlePortName = "Custom Location"
+	jumpto_ports = list("caravanpirate_ambush" = 1)
+	view_range = 14
+	x_offset = 3
+	y_offset = -6
+
+/obj/machinery/computer/shuttle/caravan/syndicate1
+	name = "Syndicate Fighter Shuttle Console"
+	desc = "Used to control the Syndicate Fighter."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	light_color = LIGHT_COLOR_RED
+	req_access = list(ACCESS_SYNDICATE)
+	circuit = /obj/item/circuitboard/computer/caravan/syndicate1
+	shuttleId = "caravansyndicate1"
+	possible_destinations = "caravansyndicate1_custom;caravansyndicate1_ambush"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1
+	name = "Syndicate Fighter Navigation Computer"
+	desc = "Used to designate a precise transit location for the Syndicate Fighter."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	shuttleId = "caravansyndicate1"
+	lock_override = NONE
+	shuttlePortId = "caravansyndicate1_custom"
+	shuttlePortName = "Custom Location"
+	jumpto_ports = list("caravansyndicate1_ambush" = 1)
+	view_range = 7
+	x_offset = 2
+	y_offset = 0
+
+/obj/machinery/computer/shuttle/caravan/syndicate2
+	name = "Syndicate Fighter Shuttle Console"
+	desc = "Used to control the Syndicate Fighter."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	req_access = list(ACCESS_SYNDICATE)
+	light_color = LIGHT_COLOR_RED
+	circuit = /obj/item/circuitboard/computer/caravan/syndicate2
+	shuttleId = "caravansyndicate2"
+	possible_destinations = "caravansyndicate2_custom;caravansyndicate2_ambush"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate2
+	name = "Syndicate Fighter Navigation Computer"
+	desc = "Used to designate a precise transit location for the Syndicate Fighter."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	shuttleId = "caravansyndicate2"
+	lock_override = NONE
+	shuttlePortId = "caravansyndicate2_custom"
+	shuttlePortName = "Custom Location"
+	jumpto_ports = list("caravansyndicate2_ambush" = 1)
+	view_range = 7
+	x_offset = 0
+	y_offset = 2
+
+/obj/machinery/computer/shuttle/caravan/syndicate3
+	name = "Syndicate Drop Ship Console"
+	desc = "Used to control the Syndicate Drop Ship."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	req_access = list(ACCESS_SYNDICATE)
+	light_color = LIGHT_COLOR_RED
+	circuit = /obj/item/circuitboard/computer/caravan/syndicate3
+	shuttleId = "caravansyndicate3"
+	possible_destinations = "caravansyndicate3_custom;caravansyndicate3_ambush"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate3
+	name = "Syndicate Drop Ship Navigation Computer"
+	desc = "Used to designate a precise transit location for the Syndicate Drop Ship."
+	icon_screen = "syndishuttle"
+	icon_keyboard = "syndie_key"
+	shuttleId = "caravansyndicate3"
+	lock_override = NONE
+	shuttlePortId = "caravansyndicate3_custom"
+	shuttlePortName = "Custom Location"
+	jumpto_ports = list("caravansyndicate3_ambush" = 1)
+	view_range = 10
+	x_offset = -1
+	y_offset = -3