Merge branch 'master' into nova-ert

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

@@ -0,0 +1,216 @@
+//Gun Cabinets
+
+/obj/structure/closet/secure_closet/guncabinet/sidearm
+	name = "emergency weapon cabinet"
+	req_one_access = list(access_armory,access_captain)
+
+	starts_with = list(
+		/obj/item/weapon/gun/energy/gun = 4)
+
+
+/obj/structure/closet/secure_closet/guncabinet/rifle
+	name = "rifle cabinet"
+	req_one_access = list(access_explorer,access_brig)
+
+	starts_with = list(
+		/obj/item/ammo_magazine/clip/c762/hunter = 9,
+		/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2)
+
+/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize()
+	if(prob(85))
+		starts_with += /obj/item/weapon/gun/projectile/shotgun/pump/rifle
+	else
+		starts_with += /obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
+	return ..()
+
+/obj/structure/closet/secure_closet/guncabinet/phase
+	name = "explorer weapon cabinet"
+	req_one_access = list(access_explorer,access_brig)
+
+	starts_with = list(
+		/obj/item/weapon/gun/energy/phasegun = 2,
+		/obj/item/weapon/gun/energy/phasegun/pistol,
+		/obj/item/weapon/cell/device/weapon = 2,
+		/obj/item/clothing/accessory/permit/gun/planetside)
+
+//Explorer Lockers
+
+/obj/structure/closet/secure_closet/explorer
+	name = "explorer locker"
+	icon = 'icons/obj/closet_vr.dmi'
+	icon_state = "secureexp1"
+	icon_closed = "secureexp"
+	icon_locked = "secureexp1"
+	icon_opened = "secureexpopen"
+	icon_broken = "secureexpbroken"
+	icon_off = "secureexpoff"
+	req_access = list(access_explorer)
+
+	starts_with = list(
+		/obj/item/clothing/under/explorer,
+		/obj/item/clothing/suit/storage/hooded/explorer,
+		/obj/item/clothing/mask/gas/explorer,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/clothing/gloves/black,
+		/obj/item/device/radio/headset/explorer,
+		/obj/item/device/radio/headset/explorer/alt,
+		/obj/item/device/flashlight,
+		/obj/item/device/gps/explorer,
+		/obj/item/weapon/storage/box/flare,
+		/obj/item/device/geiger,
+		/obj/item/weapon/cell/device,
+		/obj/item/device/radio,
+		/obj/item/stack/marker_beacon/thirty,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/material/knife/machete,
+		/obj/item/clothing/accessory/holster/machete,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
+		/obj/item/device/cataloguer)
+
+/obj/structure/closet/secure_closet/explorer/Initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+	return ..()
+
+//SAR Lockers
+
+/obj/structure/closet/secure_closet/sar
+	name = "field medic locker"
+	desc = "Supplies for a wilderness first responder."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_medical_equip)
+
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/dufflebag/emt,
+		/obj/item/weapon/storage/box/autoinjectors,
+		/obj/item/weapon/storage/box/syringes,
+		/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
+		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
+		/obj/item/weapon/storage/belt/medical/emt,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/gun/energy/locked/frontier/holdout,
+		/obj/item/clothing/mask/gas/explorer,
+		/obj/item/clothing/suit/storage/hooded/explorer/medic,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/device/radio/headset/sar,
+		/obj/item/device/radio/headset/sar/alt,
+		/obj/item/weapon/cartridge/medical,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/emergency/oxygen/engi,
+		/obj/item/clothing/glasses/hud/health,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio/off,
+		/obj/random/medical,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 2,
+		/obj/item/weapon/tool/crowbar,
+		/obj/item/weapon/extinguisher/mini,
+		/obj/item/weapon/storage/box/freezer,
+		/obj/item/clothing/accessory/storage/white_vest,
+		/obj/item/taperoll/medical,
+		/obj/item/device/gps/medical,
+		/obj/item/device/geiger,
+		/obj/item/bodybag/cryobag,
+		/obj/item/device/cataloguer/compact)
+
+//Pilot Locker
+
+/obj/structure/closet/secure_closet/pilot
+	name = "pilot locker"
+	req_access = list(access_pilot)
+
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/parachute,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/gun/energy/locked/frontier/holdout,
+		/obj/item/clothing/head/pilot,
+		/obj/item/clothing/under/rank/pilot1,
+		/obj/item/clothing/suit/storage/toggle/bomber/pilot,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/shoes/black,
+		/obj/item/clothing/gloves/fingerless,
+		/obj/item/device/radio/headset/pilot,
+		/obj/item/device/radio/headset/pilot/alt,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
+		/obj/item/weapon/storage/box/flare,
+		/obj/item/weapon/cell/device,
+		/obj/item/device/radio,
+		/obj/item/device/gps/explorer,
+		/obj/item/device/cataloguer/compact)
+
+/obj/structure/closet/secure_closet/pilot/Initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+	return ..()
+
+/obj/structure/closet/secure_closet/pathfinder
+	name = "pathfinder locker"
+	icon = 'icons/obj/closet_vr.dmi'
+	icon_state = "secureexp1"
+	icon_closed = "secureexp"
+	icon_locked = "secureexp1"
+	icon_opened = "secureexpopen"
+	icon_broken = "secureexpbroken"
+	icon_off = "secureexpoff"
+	req_access = list(access_gateway)
+
+	starts_with = list(
+		/obj/item/clothing/under/explorer,
+		/obj/item/clothing/suit/storage/hooded/explorer,
+		/obj/item/clothing/mask/gas/explorer,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/clothing/gloves/black,
+		/obj/item/device/radio/headset/pathfinder,
+		/obj/item/device/radio/headset/pathfinder/alt,
+		/obj/item/device/flashlight,
+		/obj/item/device/gps/explorer,
+		/obj/item/weapon/storage/box/flare,
+		/obj/item/weapon/storage/box/explorerkeys,
+		/obj/item/device/geiger,
+		/obj/item/weapon/cell/device,
+		/obj/item/device/radio,
+		/obj/item/device/bluespaceradio/tether_prelinked,
+		/obj/item/stack/marker_beacon/thirty,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/material/knife/machete/deluxe,
+		/obj/item/weapon/gun/energy/locked/frontier/carbine,
+		/obj/item/clothing/accessory/holster/machete,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
+		/obj/item/device/cataloguer/compact/pathfinder)
+
+/obj/structure/closet/secure_closet/pathfinder/Initialize()
+	if(prob(50))
+		starts_with += /obj/item/weapon/storage/backpack
+	else
+		starts_with += /obj/item/weapon/storage/backpack/satchel/norm
+	return ..()
+
+//Exotic Seeds Crate
+
+/obj/structure/closet/crate/hydroponics/exotic
+	name = "exotic seeds crate"
+	desc = "All you need to destroy that pesky planet."
+
+	starts_with = list(
+		/obj/item/seeds/random = 6,
+		/obj/item/seeds/replicapod = 2,
+		/obj/item/seeds/ambrosiavulgarisseed = 2,
+		/obj/item/seeds/kudzuseed,
+		/obj/item/seeds/libertymycelium,
+		/obj/item/seeds/reishimycelium)

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

@@ -47,8 +47,8 @@
 		/obj/item/clothing/under/rank/cargo/jeans,
 		/obj/item/clothing/under/rank/cargo/jeans/female,
 		/obj/item/clothing/shoes/brown,
-		/obj/item/device/radio/headset/headset_cargo,
-		/obj/item/device/radio/headset/headset_cargo/alt,
+		/obj/item/device/radio/headset/headset_qm, //VOREStation Edit,
+		/obj/item/device/radio/headset/headset_qm/alt, //VOREStation Edit,
 		/obj/item/clothing/gloves/black,
 		/obj/item/clothing/gloves/fingerless,
 		/obj/item/clothing/suit/fire/firefighter,

code/game/objects/structures/door_assembly.dm

@@ -145,7 +145,7 @@
 			bound_height = width * world.icon_size
 		update_state()
 
-	Move()
+	Moved(atom/old_loc, direction, forced = FALSE)
 		. = ..()
 		if(dir in list(EAST, WEST))
 			bound_width = width * world.icon_size

code/game/objects/structures/janicart.dm

@@ -230,15 +230,6 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
 		to_chat(user, "<span class='notice'>You'll need the keys in one of your hands to drive this [callme].</span>")
 
 
-/obj/structure/bed/chair/janicart/Move()
-	..()
-	if(has_buckled_mobs())
-		for(var/A in buckled_mobs)
-			var/mob/living/L = A
-			if(L.buckled == src)
-				L.loc = loc
-
-
 /obj/structure/bed/chair/janicart/post_buckle_mob(mob/living/M)
 	update_mob()
 	return ..()

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -286,15 +286,10 @@
 	held = null
 
 
-/obj/structure/bed/roller/Move()
-	..()
+/obj/structure/bed/roller/Moved(atom/old_loc, direction, forced = FALSE)
+	. = ..()
+	
 	playsound(src, 'sound/effects/roll.ogg', 100, 1)
-	if(has_buckled_mobs())
-		for(var/A in buckled_mobs)
-			var/mob/living/L = A
-
-			if(L.buckled == src)
-				L.loc = src.loc
 
 /obj/structure/bed/roller/post_buckle_mob(mob/living/M as mob)
 	if(M.buckled == src)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -140,22 +140,24 @@
 		return
 	..()
 
-/obj/structure/bed/chair/office/Move()
-	..()
+/obj/structure/bed/chair/office/Moved(atom/old_loc, direction, forced = FALSE)
+	. = ..()
+	
 	playsound(src, 'sound/effects/roll.ogg', 100, 1)
-	if(has_buckled_mobs())
-		for(var/A in buckled_mobs)
-			var/mob/living/occupant = A
-			occupant.buckled = null
-			occupant.Move(src.loc)
-			occupant.buckled = src
-			if (occupant && (src.loc != occupant.loc))
-				if (propelled)
-					for (var/mob/O in src.loc)
-						if (O != occupant)
-							Bump(O)
-				else
-					unbuckle_mob()
+
+/obj/structure/bed/chair/office/handle_buckled_mob_movement(atom/new_loc, direction)
+	for(var/A in buckled_mobs)
+		var/mob/living/occupant = A
+		occupant.buckled = null
+		occupant.Move(src.loc)
+		occupant.buckled = src
+		if (occupant && (src.loc != occupant.loc))
+			if (propelled)
+				for (var/mob/O in src.loc)
+					if (O != occupant)
+						Bump(O)
+			else
+				unbuckle_mob()
 
 /obj/structure/bed/chair/office/Bump(atom/A)
 	..()

code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

@@ -91,8 +91,9 @@
 		create_track()
 	driving = 0
 
-/obj/structure/bed/chair/wheelchair/Move()
-	..()
+/obj/structure/bed/chair/wheelchair/Moved(atom/old_loc, direction, forced = FALSE)
+	. = ..()
+	
 	cut_overlays()
 	playsound(src, 'sound/effects/roll.ogg', 75, 1)
 	if(has_buckled_mobs())

code/game/objects/structures/target_stake.dm

@@ -8,11 +8,11 @@
 	w_class = ITEMSIZE_HUGE
 	var/obj/item/target/pinned_target // the current pinned target
 
-	Move()
-		..()
+	Moved(atom/old_loc, direction, forced = FALSE)
+		. = ..()
 		// Move the pinned target along with the stake
 		if(pinned_target in view(3, src))
-			pinned_target.loc = loc
+			pinned_target.forceMove(loc)
 
 		else // Sanity check: if the pinned target can't be found in immediate view
 			pinned_target = null

code/game/objects/structures/window.dm

@@ -413,7 +413,7 @@
 /obj/structure/window/Move()
 	var/ini_dir = dir
 	update_nearby_tiles(need_rebuild=1)
-	..()
+	. = ..()
 	set_dir(ini_dir)
 	update_nearby_tiles(need_rebuild=1)