More miscellaneous changes

code/datums/uplink/ammunition_vr.dm

@@ -0,0 +1,20 @@
+/*************
+* Ammunition *
+*************/
+/datum/uplink_item/item/ammo/cell
+	name = "Weapon cell"
+
+/datum/uplink_item/item/ammo/highcell
+	name = "High capacity cell"
+	path = /obj/item/weapon/cell/high
+	item_cost = 15
+
+/datum/uplink_item/item/ammo/supercell
+	name = "Super capacity cell"
+	path = /obj/item/weapon/cell/super
+	item_cost = 30
+
+/datum/uplink_item/item/ammo/voidcell
+	name = "Void cell"
+	path = /obj/item/weapon/cell/device/weapon/recharge/alien/hybrid
+	item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5

code/datums/uplink/medical_vr.dm

@@ -1,25 +1,10 @@
 /**********
 * Medical *
 **********/
-/datum/uplink_item/item/medical/fire
+/datum/uplink_item/item/medical/pizza
-	name = "Fire medical kit"
+	name = "Free Pizza Voucher"
-	item_cost = 10
+	item_cost = 5
-	path = /obj/item/weapon/storage/firstaid/fire
+	path = /obj/item/pizzavoucher
-
-/datum/uplink_item/item/medical/toxin
-	name = "Toxin medical kit"
-	item_cost = 10
-	path = /obj/item/weapon/storage/firstaid/toxin
-
-/datum/uplink_item/item/medical/o2
-	name = "Oxygen medical kit"
-	item_cost = 10
-	path = /obj/item/weapon/storage/firstaid/o2
-
-/datum/uplink_item/item/medical/adv
-	name = "Advanced medical kit"
-	item_cost = 10
-	path = /obj/item/weapon/storage/firstaid/adv
 
 /datum/uplink_item/item/medical/mre
 	name = "Meal, Ready to eat (Random)"
@@ -36,6 +21,11 @@
 	item_cost = 5
 	path = /obj/item/weapon/storage/mre/menu11
 
+/datum/uplink_item/item/medical/medical
+	name = "Meal, Ready to eat (medical)"
+	item_cost = 5
+	path = /obj/item/weapon/storage/mre/menu13
+
 /datum/uplink_item/item/medical/glucose
 	name = "Glucose injector"
 	item_cost = 5
@@ -71,11 +61,41 @@
 	item_cost = 5
 	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/oxy
 
+/datum/uplink_item/item/medical/fire
+	name = "Fire medical kit"
+	item_cost = 10
+	path = /obj/item/weapon/storage/firstaid/fire
+
+/datum/uplink_item/item/medical/toxin
+	name = "Toxin medical kit"
+	item_cost = 10
+	path = /obj/item/weapon/storage/firstaid/toxin
+
+/datum/uplink_item/item/medical/o2
+	name = "Oxygen medical kit"
+	item_cost = 10
+	path = /obj/item/weapon/storage/firstaid/o2
+
+/datum/uplink_item/item/medical/adv
+	name = "Advanced medical kit"
+	item_cost = 10
+	path = /obj/item/weapon/storage/firstaid/adv
+
 /datum/uplink_item/item/medical/organ
 	name = "Organ Repair injector"
 	item_cost = 10
 	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ
 
+/datum/uplink_item/item/medical/stasis
+	name = "Stasis Bag"
+	item_cost = 20
+	path = /obj/item/bodybag/cryobag
+
+/datum/uplink_item/item/medical/synth
+	name = "Synthmorph Bag"
+	item_cost = 20
+	path = /obj/item/bodybag/cryobag/robobag
+
 /datum/uplink_item/item/medical/nanites
 	name = "Healing Nanite pill bottle"
 	item_cost = 30

code/datums/uplink/tools_vr.dm

@@ -1,6 +1,21 @@
 /********************
 * Devices and Tools *
 ********************/
+/datum/uplink_item/item/tools/oxygen
+	name = "Emergency Oxygen Tank"
+	item_cost = 2
+	path = /obj/item/weapon/tank/emergency/oxygen/double
+
+/datum/uplink_item/item/tools/phoron
+	name = "Emergency Phoron Tank"
+	item_cost = 2
+	path = /obj/item/weapon/tank/emergency/phoron/double
+
+/datum/uplink_item/item/tools/suitcooler
+	name = "Emergency Suit Cooler"
+	item_cost = 2
+	path = /obj/item/device/suit_cooling_unit/emergency
+
 /datum/uplink_item/item/tools/basiclaptop
 	name = "Laptop (Basic)"
 	item_cost = 5
@@ -16,6 +31,11 @@
 	item_cost = 10
 	path = /obj/item/stack/nanopaste/advanced
 
+/datum/uplink_item/item/tools/autolok
+	name = "Autolok Voidsuit"
+	item_cost = 10
+	path = /obj/item/clothing/suit/space/void/autolok
+
 /datum/uplink_item/item/tools/elitetablet
 	name = "Tablet (Advanced)"
 	item_cost = 15

code/game/objects/items/weapons/tanks/tank_types_vr.dm

@@ -85,6 +85,7 @@
 	icon_override = 'icons/mob/belt_vr.dmi'
 	icon_state = "emergency_phoron_vox"
 	gauge_icon = "indicator_smalltank"
+	volume = 6
 	gauge_cap = 3
 
 /obj/item/weapon/tank/nitrogen

code/game/objects/structures/crates_lockers/closets/misc_vr.dm

@@ -214,6 +214,6 @@
 
 	starts_with = list(
 		/obj/item/clothing/suit/space/void/autolok,
-		/obj/item/weapon/tank/emergency/oxygen/double,
+		/obj/item/weapon/tank/emergency/oxygen/engi,
 		/obj/item/device/suit_cooling_unit/emergency
 	)

maps/tether/tether-07-station3.dmm

@@ -30200,7 +30200,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/station/upper)
 "iPK" = (
-/obj/structure/closet/walllocker/emerglocker{
+/obj/structure/closet/autolok_wall{
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/eris/dark/techfloor_grid,
@@ -31583,9 +31583,6 @@
 /turf/simulated/floor/plating,
 /area/shuttle/securiship/general)
 "qcm" = (
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = 32
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden,
@@ -31594,6 +31591,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/closet/autolok_wall{
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
 /area/shuttle/excursion/cargo)
 "qgj" = (

vorestation.dme

@@ -429,6 +429,7 @@
 #include "code\datums\underwear\undershirts.dm"
 #include "code\datums\underwear\underwear.dm"
 #include "code\datums\uplink\ammunition.dm"
+#include "code\datums\uplink\ammunition_vr.dm"
 #include "code\datums\uplink\announcements.dm"
 #include "code\datums\uplink\armor.dm"
 #include "code\datums\uplink\backup.dm"