Merge branch 'upstream-master' into placeholder

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -124,6 +124,7 @@
 	new /obj/item/clothing/mask/gas/alt(src)
 	new /obj/item/clothing/mask/gas/half(src)
 	new /obj/item/auto_cpr(src)
+	new /obj/item/clothing/suit/storage/toggle/first_responder_jacket(src)
 
 /obj/structure/closet/secure_closet/CMO
 	name = "chief medical officer's locker"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -371,7 +371,7 @@
 	//Tools
 	new /obj/item/device/radio/headset/headset_sec(src)
 	new /obj/item/device/radio/headset/headset_sec/alt(src)
-	new /obj/item/clothing/suit/armor/carrier/generic(src)
+	new /obj/item/clothing/suit/armor/carrier/officer(src)
 	new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
 	new /obj/item/taperoll/police(src)
 	new /obj/item/device/flash(src)

code/game/objects/structures/crates_lockers/crates/gear_loadout.dm

@@ -406,8 +406,8 @@
 	..()
 	new /obj/item/clothing/accessory/holster/armpit/brown(src)
 	new /obj/item/gun/projectile/automatic/x9(src)
-	new /obj/item/ammo_magazine/c45x(src)
-	new /obj/item/ammo_magazine/c45x(src)
+	new /obj/item/ammo_magazine/c45m/auto(src)
+	new /obj/item/ammo_magazine/c45m/auto(src)
 
 /obj/structure/closet/crate/secure/gear_loadout/ninja/jinxiang
 	associated_hardsuit = /obj/item/rig/jinxiang/ninja

code/game/objects/structures/vr/human_chair.dm

@@ -0,0 +1,9 @@
+/obj/structure/bed/chair/remote/human
+	name = "virtual reality centre"
+	desc = "A comfortable chair with full audio-visual transposition centres. This one gives you access to a virtual reality body."
+
+/obj/structure/bed/chair/remote/human/user_buckle(mob/user)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		SSvirtualreality.create_virtual_reality_avatar(H)