Abductor Ship

code/ATMOSPHERICS/pipes/tank_vr.dm

@@ -0,0 +1,5 @@
+/obj/machinery/atmospherics/pipe/tank/phoron/full
+	start_pressure = 15000
+
+/obj/machinery/atmospherics/pipe/tank/air/full
+	start_pressure = 15000

code/game/machinery/computer/camera_vr.dm

@@ -0,0 +1,26 @@
+/obj/machinery/computer/security/abductor
+	name = "camera uplink"
+	desc = "Used for hacking into camera networks"
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "camera"
+	network = list(	"Mercenary",
+					"Cargo",
+					"Circuits",
+					"Civilian",
+					"Command",
+					"Engine",
+					"Engineering",
+					"Exploration",
+					"Medical",
+					"Mining Outpost",
+					"Outside",
+					"Research",
+					"Research Outpost",
+					"Robots",
+					"Security",
+					"Telecommunications",
+					"Tether",
+					"TalonShip",
+					"Entertainment",
+					"Communicators"
+					)

code/game/machinery/vending_machines_vr.dm

@@ -1456,6 +1456,25 @@
 	req_log_access = access_cmo
 	has_logs = 1
 
+/obj/machinery/vending/abductor
+	name = "Abduct-U"
+	desc = "A mysterious machine which can fabricate many tools for acquiring test subjects."
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "dispenser_2way"
+	products = list(/obj/item/weapon/card/id/syndicate/station_access = 1,
+					/obj/item/weapon/storage/box/syndie_kit/chameleon = 1,
+					/obj/item/clothing/mask/bandana = 1,
+					/obj/item/device/radio/headset/syndicate/alt = 1,
+					/obj/item/device/pda = 1,
+					/obj/item/device/communicator = 1,
+					/obj/item/weapon/tape_roll = 2,
+					/obj/item/weapon/handcuffs = 4,
+					/obj/item/weapon/cell/device/weapon/recharge/alien = 2,
+					/obj/item/device/chameleon = 1,
+					/obj/item/weapon/storage/mre/menu11 = 2
+					)
+	vend_delay = 15
+
 /obj/machinery/vending/loadout
 	name = "Fingers and Toes"
 	desc = "A special vendor for gloves and shoes!"

code/game/objects/structures/props/alien_props_vr.dm

@@ -10,4 +10,8 @@
 	desc = "This seems to be a container for something."
 	icon = 'icons/obj/abductor_vr.dmi'
 	icon_state = "experiment"
-	interaction_message = "<span class='warning'>You don't see any mechanism to open this thing. Probably for the best.</span>"
+	interaction_message = "<span class='warning'>You don't see any mechanism to open this thing. Probably for the best.</span>"
+
+/obj/structure/prop/alien/dispenser/twoway
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "dispenser_2way"

code/game/turfs/simulated/floor_types_vr.dm

@@ -12,6 +12,11 @@
 	light_power = 0.8
 	light_color = "#66ffff" // Bright cyan.
 
+/turf/simulated/shuttle/floor/alienplating/vacuum
+	oxygen = 0
+	nitrogen = 0
+	temperature = TCMB
+
 /turf/simulated/floor/flesh
 	name = "flesh"
 	desc = "This slick flesh ripples and squishes under your touch"
@@ -83,3 +88,4 @@
 	desc = "It is entirely made of sick, gurgling flesh. It is releasing a sickly odour."
 	icon_state = "bloodfloor_2"
 	icon = 'icons/goonstation/turf/meatland.dmi'
+

code/modules/mining/shelter_atoms_vr.dm

@@ -326,6 +326,15 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	light_power = 1
 	light_color = "#FFFFFF"
 
+/obj/structure/fans/hardlight/colorable
+	name = "hardlight shield"
+	icon_state = "hardlight_colorable"
+
+/obj/structure/fans/hardlight/colorable/abductor
+	name = "hardlight shield"
+	icon_state = "hardlight_colorable"
+	color = "#ff0099"
+
 //Signs
 /obj/structure/sign/mining
 	name = "nanotrasen mining corps sign"

code/modules/overmap/abductor_vr.dm

@@ -0,0 +1,17 @@
+// The alien ships should use fancy consoles and things
+/obj/machinery/computer/ship/helm/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "console"
+
+/obj/machinery/computer/ship/engines/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "camera_flipped"
+
+/obj/machinery/computer/ship/navigation/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "camera"
+
+/obj/machinery/computer/ship/sensors/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "console"
+	icon_screen = null

code/modules/reagents/dispenser/dispenser_presets_vr.dm

@@ -65,3 +65,9 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/nutriment,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/protein
 		)
+
+/obj/machinery/chemical_dispenser/ert/specialops/abductor
+	name = "chemical dispenser"
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "dispenser_2way"
+	desc = "A mysterious machine which can fabricate many chemicals."

code/modules/resleeving/machines_vr.dm

@@ -0,0 +1,12 @@
+/obj/machinery/transhuman/resleever/abductor
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "implantchair"
+
+/obj/machinery/computer/transhuman/resleeving/abductor
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "console"
+
+/obj/machinery/clonepod/transhuman/full/abductor
+	icon = 'icons/obj/abductor_vr.dmi'
+	icon_state = "pod_0"
+	name = "clonepod"

maps/expedition_vr/alienship/_alienship.dm

@@ -178,9 +178,3 @@
 	requires_power = FALSE
 
 /area/tether_away/alienship/equip_dump
-
-// -- Turfs -- //
-/turf/simulated/shuttle/floor/alienplating/vacuum
-	oxygen = 0
-	nitrogen = 0
-	temperature = TCMB

maps/expedition_vr/space/_fueldepot.dm

@@ -36,9 +36,3 @@
 	oxygen = 0
 	nitrogen = 0
 	temperature = TCMB
-	
-/obj/machinery/atmospherics/pipe/tank/phoron/full
-	start_pressure = 15000
-
-/obj/machinery/atmospherics/pipe/tank/air/full
-	start_pressure = 15000

maps/offmap_vr/om_ships/abductor.dm

@@ -0,0 +1,98 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "abductor.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/abductor
+	name = "OM Ship - Abductor Ship (New Z)"
+	desc = "A ship for spooky aliens to kidnap farmers and unfortunate spacemen."
+	mappath = 'abductor.dmm'
+
+/area/abductor
+	requires_power = 0
+	icon_state = "purple"
+
+/area/abductor/
+	name = "Abductor Ship"
+	flags = RAD_SHIELDED | BLUE_SHIELDED
+
+/area/abductor/exterior
+	name = "Abductor Ship Exterior"
+	has_gravity = 0
+
+// The 'Abductor Ship'
+/obj/effect/overmap/visitable/ship/abductor
+	name = "spacecraft"
+	desc = "Spacefaring vessel."
+	icon_state = "shuttle"
+	moving_state = "shuttle"
+	scanner_name = "unknown vessel"
+	scanner_desc = @{"[i]Registration[/i]: Unknown
+[i]Class[/i]: Corvette
+[i]Transponder[/i]: No transponder detected."
+[b]Notice[/b]: Deep scans detect unknown power signatures, and onboard transporter technology."}
+	color = "#11414c" //STEALTH
+	vessel_mass = 8000
+	vessel_size = SHIP_SIZE_SMALL
+	initial_generic_waypoints = list("abductor_port", "abductor_starboard")
+	fore_dir = NORTH
+
+/obj/item/weapon/paper/alien/abductor
+	name = "Read Me"
+	info = {"<b>((Just to state the obvious here, but make sure you're reading OOC notes and all that. This role does not give you any special protections from the rules. Only abduct people who seem like they'd be cool with it.))</b><br><br>
+
+Your mission is to travel out into space to retrieve individuals to experiment upon.<br><br>
+
+Just what experiments you do are up to you, thought it should be noted, we can't do experiments on corpses, so you should be careful not to kill anyone in the process of acquiring your subject. Needless killing is grounds for termination from the organization.<br><br>
+
+The experimentation process however can be fatal if necessary, so long as we get good data. ((And the person's cool with it OOCly))<br><br>
+
+You will find that the ship is equipped with transporter technology. There are teleporters to the outside world on both the port and starboard sides. Each of the experimentation chambers is also outfitted with an advanced translocator device that is linked to its given room. You will want to ensure that you take a translocator device with you BEFORE you leave the ship, as there will be no other way for you to return without assistance.<br><br>
+
+Your translocator device is arguably your most critical piece of equipment, and it is imperative that you not lose it, as possessing it would allow outsiders access to the ship.<br><br>
+
+The center of the ship sports the shield generator, as well as the chemical and resleeving labs. It would be wise to ensure that if your experiments are fatal, to scan the mind and body of your subject before you proceed, so we can ensure that we can return the subjects to where we find them.<br><br>
+
+To the starboard and port sides you will find a total of six experimentation rooms, and two transporter rooms, as well as two engine rooms at the aft.<br><br>
+
+The aft center of the ship is the common equipment room. The items here are limited in quantity, so only take what you intend to use in your given task.<br><br>
+
+At the fore of the vessel are the briefing rooms, and the bridge.<br><br>
+
+Lastly, there are camera uplink consoles scattered around the ship. It is recommended that you take stock of where potential targets are before you depart.<br><br>
+
+You will find a dispenser within the room you started in which contains some basic equipment that you may wish to take with you. Please do not loot the dispensers from other rooms unless the one assigned to it is okay with it.<br><br>
+
+<b>And finally, to leave this room, you will want to put your ID on the table, and pray to the corporate overlords to add access 777 to it.</b>"}
+
+/obj/machinery/porta_turret/alien/abductor
+	name = "anti-personnel turret"
+	installation = /obj/item/weapon/gun/energy/gun/taser
+	lethal = FALSE
+	health = 500 // Sturdier turrets, non-lethal, for capturing people alive
+	maxhealth = 500
+	req_one_access = list(777) // The code I've been using for events, same as the doors
+
+/obj/machinery/porta_turret/alien/abductor/ion
+	name = "anti-personnel turret"
+	installation = /obj/item/weapon/gun/energy/ionrifle/weak
+	lethal = TRUE
+
+/obj/item/device/perfect_tele/frontier/unknown/abductor/one
+	loc_network = "abd1"
+/obj/item/device/perfect_tele/frontier/unknown/abductor/two
+	loc_network = "abd2"
+/obj/item/device/perfect_tele/frontier/unknown/abductor/three
+	loc_network = "abd3"
+/obj/item/device/perfect_tele/frontier/unknown/abductor/four
+	loc_network = "abd4"
+/obj/item/device/perfect_tele/frontier/unknown/abductor/five
+	loc_network = "abd5"
+/obj/item/device/perfect_tele/frontier/unknown/abductor/six
+	loc_network = "abd6"
+
+/obj/machinery/power/rtg/abductor/built/abductor
+	name = "Void Core"
+	power_gen = 5000000
+

maps/tether/submaps/_tether_submaps.dm

@@ -531,6 +531,7 @@
 #include "../../offmap_vr/om_ships/mercship.dm"
 #include "../../offmap_vr/om_ships/curashuttle.dm"
 #include "../../offmap_vr/om_ships/itglight.dm"
+#include "../../offmap_vr/om_ships/abductor.dm"
 
 //////////////////////////////////////////////////////////////////////////////
 //Capsule deployed ships

vorestation.dme

@@ -234,6 +234,7 @@
 #include "code\ATMOSPHERICS\pipes\pipe_base_vr.dm"
 #include "code\ATMOSPHERICS\pipes\simple.dm"
 #include "code\ATMOSPHERICS\pipes\tank.dm"
+#include "code\ATMOSPHERICS\pipes\tank_vr.dm"
 #include "code\ATMOSPHERICS\pipes\universal.dm"
 #include "code\ATMOSPHERICS\pipes\vent.dm"
 #include "code\controllers\autotransfer.dm"
@@ -898,6 +899,7 @@
 #include "code\game\machinery\computer\atmos_alert.dm"
 #include "code\game\machinery\computer\atmos_control.dm"
 #include "code\game\machinery\computer\camera.dm"
+#include "code\game\machinery\computer\camera_vr.dm"
 #include "code\game\machinery\computer\card.dm"
 #include "code\game\machinery\computer\cloning.dm"
 #include "code\game\machinery\computer\communications.dm"
@@ -3284,6 +3286,7 @@
 #include "code\modules\organs\subtypes\vox.dm"
 #include "code\modules\organs\subtypes\vox_vr.dm"
 #include "code\modules\organs\subtypes\xenos.dm"
+#include "code\modules\overmap\abductor_vr.dm"
 #include "code\modules\overmap\bluespace_rift_vr.dm"
 #include "code\modules\overmap\champagne.dm"
 #include "code\modules\overmap\helpers.dm"
@@ -3700,6 +3703,13 @@
 #include "code\modules\resleeving\infomorph.dm"
 #include "code\modules\resleeving\infomorph_software.dm"
 #include "code\modules\resleeving\machines.dm"
+<<<<<<< HEAD
+||||||| parent of 162d018f97... Merge pull request #9431 from Very-Soft/abduct-u
+#include "code\modules\resleeving\resleeving_sickness.dm"
+=======
+#include "code\modules\resleeving\machines_vr.dm"
+#include "code\modules\resleeving\resleeving_sickness.dm"
+>>>>>>> 162d018f97... Merge pull request #9431 from Very-Soft/abduct-u
 #include "code\modules\resleeving\sleevecard.dm"
 #include "code\modules\rogueminer_vr\asteroid.dm"
 #include "code\modules\rogueminer_vr\controller.dm"
@@ -4059,9 +4069,14 @@
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
+<<<<<<< HEAD
 #include "maps\southern_cross\southern_cross.dm"
 #include "maps\southern_cross\items\encryptionkey_sc.dm"
 #include "maps\southern_cross\items\headset_sc.dm"
+||||||| parent of 162d018f97... Merge pull request #9431 from Very-Soft/abduct-u
+=======
+#include "maps\offmap_vr\om_ships\abductor.dm"
+>>>>>>> 162d018f97... Merge pull request #9431 from Very-Soft/abduct-u
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
 #include "maps\southern_cross\items\clothing\sc_suit.dm"
 #include "maps\southern_cross\items\clothing\sc_under.dm"