Final additions and fixes

code/game/machinery/autolathe.dm

@@ -145,7 +145,7 @@
 	if(is_robot_module(O))
 		return 0
 
-	if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38)) // Prevents ammo recycling exploit with speedloaders.
+	if(istype(O,/obj/item/ammo_magazine/clip) || istype(O,/obj/item/ammo_magazine/s357) || istype(O,/obj/item/ammo_magazine/s38) || istype (O,/obj/item/ammo_magazine/s44)/* VOREstation Edit*/) // Prevents ammo recycling exploit with speedloaders.
 		user << "\The [O] is too hazardous to recycle with the autolathe!"
 		return
 		/*  ToDo: Make this actually check for ammo and change the value of the magazine if it's empty. -Spades

code/game/objects/random/random_vr.dm

@@ -33,7 +33,7 @@
 					prob(10);/obj/item/weapon/melee/energy/sword,\
 					prob(9);/obj/item/weapon/gun/projectile/automatic/wt550/lethal,\
 					prob(9);/obj/item/weapon/gun/projectile/automatic/pdw,\
-					prob(9);/obj/item/weapon/gun/projectile/derringer,\
+					prob(9);/obj/item/weapon/gun/projectile/automatic/SMG_sol, \
 					prob(9);/obj/item/weapon/gun/energy/crossbow/largecrossbow,\
 					prob(9);/obj/item/weapon/gun/projectile/automatic/mini_uzi,\
 					prob(9);/obj/item/weapon/gun/projectile/pistol,\
@@ -41,13 +41,14 @@
 					prob(9);/obj/item/weapon/twohanded/fireaxe,\
 					prob(9);/obj/item/weapon/cane/concealed,\
 					prob(9);/obj/item/weapon/gun/energy/gun,\
-					prob(8);/obj/item/weapon/gun/energy/ionrifle,\
 					prob(8);/obj/item/weapon/gun/energy/retro,\
 					prob(8);/obj/item/weapon/gun/energy/gun/eluger,\
 					prob(8);/obj/item/weapon/gun/energy/xray,\
 					prob(8);/obj/item/weapon/gun/projectile/automatic/c20r,\
 					prob(8);/obj/item/weapon/gun/projectile/automatic/stg,\
 					prob(8);/obj/item/weapon/melee/energy/sword,\
+					prob(8);/obj/item/weapon/gun/projectile/derringer,\
+					prob(8);/obj/item/weapon/gun/projectile/revolver/lemat,\
 				/*	prob(8);/obj/item/weapon/gun/projectile/automatic/m41a,\ */
 					prob(7);/obj/item/weapon/gun/energy/captain,\
 					prob(7);/obj/item/weapon/gun/energy/sniperrifle,\
@@ -58,10 +59,12 @@
 					prob(7);/obj/item/weapon/gun/energy/gun/burst,\
 					prob(7);/obj/item/weapon/gun/projectile/shotgun/pump/unsc,\
 					prob(7);/obj/item/weapon/gun/projectile/deagle,\
+					prob(7);/obj/item/weapon/gun/projectile/revolver/consul,\
 					prob(7);/obj/item/weapon/gun/launcher/grenade,\
 					prob(6);/obj/item/weapon/gun/projectile/SVD,\
 					prob(6);/obj/item/weapon/gun/projectile/automatic/l6_saw,\
 					prob(6);/obj/item/weapon/gun/energy/lasercannon,\
+					prob(5);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,\
 					prob(5);/obj/item/weapon/gun/projectile/automatic/carbine,\
 					prob(5);/obj/item/weapon/gun/energy/pulse_rifle,\
 				/*	prob(4);/obj/item/weapon/gun/projectile/automatic/battlerifle,\ */
@@ -73,6 +76,7 @@
 					prob(1);/obj/item/weapon/gun/projectile/gyropistol,\
 					prob(1);/obj/item/weapon/gun/projectile/heavysniper,\
 					prob(1);/obj/item/weapon/plastique,\
+					prob(1);/obj/item/weapon/gun/energy/ionrifle,\
 					prob(1);/obj/item/weapon/material/sword,\
 					prob(1);/obj/item/weapon/cane/concealed,\
 					prob(1);/obj/item/weapon/material/sword/katana)
@@ -114,6 +118,7 @@
 					prob(4);/obj/item/ammo_magazine/m762,\
 					prob(3);/obj/item/ammo_magazine/clip/c10mm,\
 					prob(3);/obj/item/ammo_magazine/clip/c44,\
+					prob(3);/obj/item/ammo_magazine/s44,\
 					prob(3);/obj/item/ammo_magazine/m556,\
 					prob(2);/obj/item/ammo_magazine/m44,\
 					prob(2);/obj/item/ammo_magazine/m556,\
@@ -167,12 +172,13 @@
 /obj/random/trash_pile/item_to_spawn()
 	return	/obj/structure/trash_pile
 
-/obj/random/mob
+/obj/random/outside_mob
 	name = "Random Mob"
 	desc = "Eek!"
-	icon = 'icons/obj/animal.dmi'
+	icon = 'icons/mob/screen1.dmi'
-	icon_state = "mushroom"
+	icon_state = "x"
 	spawn_nothing_percentage = 10
+
 /obj/random/cargopod/item_to_spawn()
 	return pick(prob(20);/mob/living/simple_animal/hostile/scarybat,
 				prob(10);/mob/living/simple_animal/hostile/dino,

code/game/turfs/simulated/outdoors/grass_vr.dm

@@ -17,28 +17,4 @@
 
 /turf/simulated/floor/outdoors/grass/sif/forest/border
 	name = "impassible growth"
-	tree_chance = 100/obj/random/cargopod
+	tree_chance = 100
-	name = "Random Cargo Item"
-	desc = "Hot Stuff."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "purplecomb"
-	spawn_nothing_percentage = 0
-/obj/random/cargopod/item_to_spawn()
-	return pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol,
-				prob(8);/obj/item/weapon/haircomb,
-				prob(4);/obj/item/weapon/storage/pill_bottle/happy,
-				prob(4);/obj/item/weapon/storage/pill_bottle/zoom,
-				prob(10);/obj/item/weapon/contraband/poster,
-				prob(4);/obj/item/weapon/material/butterfly,
-				prob(6);/obj/item/weapon/material/butterflyblade,
-				prob(6);/obj/item/weapon/material/butterflyhandle,
-				prob(6);/obj/item/weapon/material/wirerod,
-				prob(2);/obj/item/weapon/material/butterfly/switchblade,
-				prob(2);/obj/item/weapon/material/knuckledusters,
-				prob(1);/obj/item/weapon/material/hatchet/tacknife,
-				prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
-				prob(1);/obj/item/weapon/beartrap,
-				prob(1);/obj/item/weapon/handcuffs,
-				prob(1);/obj/item/weapon/legcuffs,
-				prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,
-				prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)

code/modules/projectiles/ammunition/magazines.dm

@@ -385,7 +385,7 @@
 
 /obj/item/ammo_magazine/m44
 	name = "magazine (.44)"
-	icon_state = ".44"
+	icon_state = "44" // Vorestation Hotfix
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
 	caliber = ".44"

maps/tether/tether_areas2.dm

@@ -24,6 +24,14 @@
 	name = "Outside - Wilderness"
 	icon_state = "invi"
 
+/area/tether/surfacebase/temple
+	name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
+	icon_state = "red"
+
+/area/tether/surfacebase/crash
+	name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
+	icon_state = "yellow"
+
 /area/tether/surfacebase/tram
 	name = "\improper Tram Station"
 	icon_state = "dk_yellow"