Merge remote-tracking branch 'upstream/master'

code/datums/helper_datums/teleport_vr.dm

@@ -1,5 +1,5 @@
 //wrapper
-/proc/do_noeffect_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=TRUE)
+/proc/do_noeffect_teleport(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null, local=FALSE)
 	new /datum/teleport/instant/science/noeffect(arglist(args))
 	return
 

code/datums/supplypacks/engineering.dm

@@ -21,6 +21,20 @@
 	containertype = /obj/structure/closet/crate/engineering
 	containername = "Superconducting Magnetic Coil crate"
 
+/datum/supply_pack/eng/smescoil/super_capacity
+	name = "Superconducting Capacitance Coil"
+	contains = list(/obj/item/weapon/smes_coil/super_capacity)
+	cost = 90
+	containertype = /obj/structure/closet/crate/engineering
+	containername = "Superconducting Capacitance Coil crate"
+
+/datum/supply_pack/eng/smescoil/super_io
+	name = "Superconducting Transmission Coil"
+	contains = list(/obj/item/weapon/smes_coil/super_io)
+	cost = 90
+	containertype = /obj/structure/closet/crate/engineering
+	containername = "Superconducting Transmission Coil crate"
+
 /datum/supply_pack/eng/shield_capacitor
 	name = "Shield Capacitor"
 	contains = list(/obj/machinery/shield_capacitor)
@@ -291,27 +305,3 @@
 	containername = "Tritium crate"
 	containertype = /obj/structure/closet/crate/engineering
 	contains = list(/obj/fiftyspawner/tritium)
-
-/datum/supply_pack/eng/am_shielding
-	contains = list(/obj/item/device/am_shielding_container = 3)
-	name = "Antimatter shielding three units"
-	cost = 50
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Antimatter shielding crate"
-	access = access_engine
-
-/datum/supply_pack/eng/am_container
-	contains = list(/obj/item/weapon/am_containment)
-	name = "Antimatter container"
-	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "AM container crate"
-	access = access_engine
-
-/datum/supply_pack/eng/am_controlunit
-	contains = list(/obj/machinery/power/am_control_unit)
-	name = "Antimatter control unit"
-	cost = 75
-	containertype = /obj/structure/closet/crate/secure/large
-	containername = "AM control unit crate"
-	access = access_engine

code/datums/supplypacks/misc_vr.dm

@@ -43,6 +43,7 @@
 				  access_eva,
 				  access_explorer,
 				  access_pilot)
+	one_access = TRUE
 
 /datum/supply_pack/misc/mining_rig
 	name = "industrial hardsuit (empty)"
@@ -53,4 +54,5 @@
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "industrial hardsuit crate"
 	access = list(access_mining,
-				  access_eva)
+				  access_eva)
+	one_access = TRUE

code/datums/supplypacks/recreation.dm

@@ -87,4 +87,14 @@
 	contains = list(
 			/obj/item/weapon/storage/box/wormcan,
 			/obj/item/weapon/storage/box/wormcan/deluxe
+			)
+
+/datum/supply_pack/recreation/ltagturrets
+	name = "Laser Tag Turrets"
+	cost = 40
+	containername = "laser tag turret crate"
+	containertype = /obj/structure/closet/crate
+	contains = list(
+			/obj/machinery/porta_turret/lasertag/blue,
+			/obj/machinery/porta_turret/lasertag/red
 			)

code/datums/supplypacks/security_vr.dm

@@ -6,6 +6,7 @@
 	access = list(
 			access_security,
 			access_xenobiology)
+	one_access = TRUE
 
 /datum/supply_pack/security/guardmutant
 	name = "VARMAcorp autoNOMous security solution for hostile environments"
@@ -15,6 +16,7 @@
 	access = list(
 			access_security,
 			access_xenobiology)
+	one_access = TRUE
 */
 
 /datum/supply_pack/randomised/security/armor