Merge pull request #11710 from Very-Soft/SDremaster

Stellar Delight!

code/game/objects/effects/job_start_landmarks.dm

@@ -0,0 +1,92 @@
+/obj/effect/landmark/start/captain
+	name = "Site Manager"
+/obj/effect/landmark/start/hop
+	name = "Head of Personnel"
+/obj/effect/landmark/start/commandsecretary
+	name = "Command Secretary"
+/obj/effect/landmark/start/hos
+	name = "Head of Security"
+/obj/effect/landmark/start/warden
+	name = "Warden"
+/obj/effect/landmark/start/detective
+	name = "Detective"
+/obj/effect/landmark/start/security
+	name = "Security Officer"
+/obj/effect/landmark/start/ce
+	name = "Chief Engineer"
+/obj/effect/landmark/start/atmostech
+	name = "Atmospheric Technician"
+/obj/effect/landmark/start/engineer
+	name = "Station Engineer"
+/obj/effect/landmark/start/cmo
+	name = "Chief Medical Officer"
+/obj/effect/landmark/start/chemist
+	name = "Chemist"
+/obj/effect/landmark/start/medical
+	name = "Medical Doctor"
+/obj/effect/landmark/start/paramedic
+	name = "Paramedic"
+/obj/effect/landmark/start/psych
+	name = "Psychiatrist"
+/obj/effect/landmark/start/rd
+	name = "Research Director"
+/obj/effect/landmark/start/roboticist
+	name = "Roboticist"
+/obj/effect/landmark/start/scientist
+	name = "Scientist"
+/obj/effect/landmark/start/xenobio
+	name = "Xenobiologist"
+/obj/effect/landmark/start/xenobot
+	name = "Xenobotanist"
+/obj/effect/landmark/start/qm
+	name = "Quartermaster"
+/obj/effect/landmark/start/cargo
+	name = "Cargo Technician"
+/obj/effect/landmark/start/miner
+	name = "Shaft Miner"
+/obj/effect/landmark/start/pf
+	name = "Pathfinder"
+/obj/effect/landmark/start/explorer
+	name = "Explorer"
+/obj/effect/landmark/start/fieldmedic
+	name = "Field Medic"
+/obj/effect/landmark/start/bartender
+	name = "Bartender"
+/obj/effect/landmark/start/botanist
+	name = "Botanist"
+/obj/effect/landmark/start/chaplain
+	name = "Chaplain"
+/obj/effect/landmark/start/chef
+	name = "Chef"
+/obj/effect/landmark/start/clown
+	name = "Clown"
+/obj/effect/landmark/start/entertainer
+	name = "Entertainer"
+/obj/effect/landmark/start/intern
+	name = "Intern"
+/obj/effect/landmark/start/iaa
+	name = "Internal Affairs Agent"
+/obj/effect/landmark/start/janitor
+	name = "Janitor"
+/obj/effect/landmark/start/librarian
+	name = "Librarian"
+/obj/effect/landmark/start/mime
+	name = "Mime"
+/obj/effect/landmark/start/pilot
+	name = "Pilot"
+/obj/effect/landmark/start/visitor
+	name = "Visitor"
+/obj/effect/landmark/start/ai
+	name = "AI"
+/obj/effect/landmark/start/cyborg
+	name = "Cyborg"
+/obj/effect/landmark/start/taloncap
+	name = "Talon Captain"
+/obj/effect/landmark/start/talondoc
+	name = "Talon Doctor"
+/obj/effect/landmark/start/taloneng
+	name = "Talon Engineer"
+/obj/effect/landmark/start/talonguard
+	name = "Talon Guard"
+/obj/effect/landmark/start/talonpilot
+	name = "Talon Pilot"

code/game/objects/random/mapping.dm

@@ -105,10 +105,14 @@
 	icon = 'icons/obj/vending.dmi'
 	icon_state = "Cola_Machine"
 
+//VOREStation Edit Start
 /obj/random/vendordrink/item_to_spawn() //Not including coffee as it's more specific in usage.
 	return pick (/obj/machinery/vending/cola,
+				/obj/machinery/vending/cola/soft,
+				/obj/machinery/vending/bepis,	
 				/obj/machinery/vending/sovietsoda,
 				/obj/machinery/vending/radren)
+//VOREStation Edit End
 
 /obj/random/obstruction //Large objects to block things off in maintenance
 	name = "random obstruction"

code/game/objects/random/misc.dm

@@ -600,6 +600,12 @@
 				prob(2);/obj/item/weapon/coin/platinum,
 				prob(1);/obj/item/weapon/coin/diamond)
 
+//VOREStation Add Start
+/obj/random/coin/sometimes
+	spawn_nothing_percentage = 66
+
+//VOREStation Add End
+
 /obj/random/action_figure
 	name = "random action figure"
 	desc = "This is a random action figure."

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

@@ -93,7 +93,7 @@
  */
 /obj/structure/closet/secure_closet/pathfinder
 	name = "pathfinder locker"
-	req_access = list(access_gateway)
+	req_access = list(access_pathfinder)
 	closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
 
 	starts_with = list(
@@ -113,7 +113,6 @@
 		/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,

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

@@ -49,3 +49,15 @@
 		else
 			add_overlay("open")
 
+//VOREStation Add Start
+/obj/structure/closet/secure_closet/guncabinet/excursion
+	name = "expedition weaponry cabinet"
+	req_one_access = list(access_explorer,access_armory)
+
+/obj/structure/closet/secure_closet/guncabinet/excursion/New()
+	..()
+	for(var/i = 1 to 2)
+		new /obj/item/weapon/gun/energy/locked/frontier(src)
+	for(var/i = 1 to 2)
+		new /obj/item/weapon/gun/energy/locked/frontier/holdout(src)
+//VOREStation Add End