diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm
index 3acfffdfd15..c4d0cb37d47 100644
--- a/code/datums/outfits/jobs/civilian_vr.dm
+++ b/code/datums/outfits/jobs/civilian_vr.dm
@@ -19,3 +19,6 @@
 
 /decl/hierarchy/outfit/job/assistant/entertainer
 	id_type = /obj/item/weapon/card/id/civilian/entertainer
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur
+	id_type = /obj/item/weapon/card/id/civilian/entrepreneur
diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm
index c4aa64cfb48..e9f105637ed 100644
--- a/code/game/jobs/job/civilian_vr.dm
+++ b/code/game/jobs/job/civilian_vr.dm
@@ -259,7 +259,7 @@
 	alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand,
 						"Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer,
 						"Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian,
-						"Artist" = /datum/alt_title/artist, "Fitness Instructor" = /datum/alt_title/fitnessinstructor)
+						"Artist" = /datum/alt_title/artist, "Game Master" = /datum/alt_title/game_master)
 
 // Entertainer Alt Titles
 /datum/alt_title/actor
@@ -302,6 +302,105 @@
 	title = "Artist"
 	title_blurb = "An Artist's calling is to create beautiful arts! Whatever form may they take, create and have people astonished with your creativity."
 
-/datum/alt_title/fitnessinstructor
+/datum/alt_title/game_master
+	title = "Game Master"
+	title_blurb = "A Game Master provides recreation for the crew by hosting variety of games. From cards to roleplaying to something more personalized."
+
+//////////////////////////////////
+//			Entrepreneur
+//////////////////////////////////
+
+/datum/job/entrepreneur
+	title = "Entrepreneur"
+	flag = ENTREPRENEUR
+	departments = list(DEPARTMENT_CIVILIAN)
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = 4
+	spawn_positions = 4
+	supervisors = "the Head of Personnel"
+	selection_color = "#515151"
+	access = list()
+	minimal_access = list()
+	pto_type = PTO_CIVILIAN
+
+	outfit_type = /decl/hierarchy/outfit/job/assistant/entrepreneur
+	job_description = "An entrepreneur is basically a visitor that obtained special permission to offer personal services to people on station. \
+						They will offer people these services and, potentially, even demand payment!"
+	alt_titles = list("Lawyer" = /datum/alt_title/lawyer, "Private Eye" = /datum/alt_title/private_eye, "Bodyguard" = /datum/alt_title/bodyguard,
+						"Personal Physician" = /datum/alt_title/personal_physician, "Dentist" = /datum/alt_title/dentist, "Fitness Instructor" = /datum/alt_title/fitness_instructor,
+						"Yoga Teacher" = /datum/alt_title/yoga_teacher, "Masseuse" = /datum/alt_title/masseuse, "Tradesperson" = /datum/alt_title/tradesperson,
+						"Streamer" = /datum/alt_title/streamer, "Influencer" = /datum/alt_title/influencer, "Paranormal Investigator" = /datum/alt_title/paranormal_investigator,
+						"Personal Secretary" = /datum/alt_title/personal_secretary, "Stylist" = /datum/alt_title/stylist, "Fisher" = /datum/alt_title/fisher,
+						"Fortune Teller" = /datum/alt_title/fortune_teller, "Spirit Healer" = /datum/alt_title/spirit_healer)
+
+/datum/alt_title/lawyer
+	title = "Lawyer"
+	title_blurb = "A Lawyer is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen."
+
+/datum/alt_title/private_eye
+	title = "Private Eye"
+	title_blurb = "A Private Eye is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to."
+
+/datum/alt_title/bodyguard
+	title = "Bodyguard"
+	title_blurb = "A Bodyguard offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough."
+
+/datum/alt_title/personal_physician
+	title = "Personal Physician"
+	title_blurb = "A Personal Physicial is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be."
+
+/datum/alt_title/dentist
+	title = "Dentist"
+	title_blurb = "A Dentist is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will."
+
+/datum/alt_title/fitness_instructor
 	title = "Fitness Instructor"
 	title_blurb = "A Fitness Instructor dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
+
+/datum/alt_title/yoga_teacher
+	title = "Yoga Teacher"
+	title_blurb = "A Yoga Teacher is similar to fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony."
+
+/datum/alt_title/masseuse
+	title = "Masseuse"
+	title_blurb = "A Masseuse is master of physical therapy and working others' bodies with their hands."
+
+/datum/alt_title/tradesperson
+	title = "Tradesperson"
+	title_blurb = "A Tradesperson is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..."
+
+/datum/alt_title/streamer
+	title = "Streamer"
+	title_blurb = "A Streamer is here to entertain. Not the crew! Their audience across exonet!"
+
+/datum/alt_title/influencer
+	title = "Influencer"
+	title_blurb = "An Influencer has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head."
+
+/datum/alt_title/paranormal_investigator
+	title = "Paranormal Investigator"
+	title_blurb = "A Paranormal Investigator looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!"
+
+/datum/alt_title/personal_secretary
+	title = "Personal Secretary"
+	title_blurb = "A Personal Secretary offers services of general assistance. Although it's doubtful anyone will ever actually need those."
+
+/datum/alt_title/stylist
+	title = "Stylist"
+	title_blurb = "A Stylist offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards."
+
+/datum/alt_title/fisher
+	title = "Fisher"
+	title_blurb = "A Fisher is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!"
+
+/datum/alt_title/fortune_teller
+	title = "Fortune Teller"
+	title_blurb = "A Fortune Teller peers into the future, and offers these visions to others. Occasionally those visions may even come true!"
+
+/datum/alt_title/spirit_healer
+	title = "Spirit Healer"
+	title_blurb = "A Spirit Healer offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?"
+
+
+
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 8dfa4fe5afb..104930f9c54 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -11,9 +11,9 @@ var/const/ENGINEER			=(1<<6)
 var/const/ATMOSTECH			=(1<<7)
 var/const/AI				=(1<<8)
 var/const/CYBORG			=(1<<9)
-var/const/CLOWN				=(1<<13) //VOREStation Add
-var/const/MIME				=(1<<14) //VOREStation Add
-var/const/INTERN			=(1<<15) //VOREStation Add
+var/const/CLOWN				=(1<<13)
+var/const/MIME				=(1<<14)
+var/const/INTERN			=(1<<15)
 
 var/const/MEDSCI			=(1<<1)
 
@@ -28,10 +28,10 @@ var/const/PSYCHIATRIST		=(1<<7)
 var/const/ROBOTICIST		=(1<<8)
 var/const/XENOBIOLOGIST		=(1<<9)
 var/const/PARAMEDIC			=(1<<10)
-var/const/PATHFINDER 		=(1<<11) //VOREStation Add
-var/const/EXPLORER 			=(1<<12) //VOREStation Add
-var/const/SAR 				=(1<<13) //VOREStation Add
-var/const/XENOBOTANIST		=(1<<14) //VOREStation Add
+var/const/PATHFINDER 		=(1<<11)
+var/const/EXPLORER 			=(1<<12)
+var/const/SAR 				=(1<<13)
+var/const/XENOBOTANIST		=(1<<14)
 
 var/const/CIVILIAN			=(1<<2)
 
@@ -48,8 +48,9 @@ var/const/LAWYER			=(1<<9)
 var/const/CHAPLAIN			=(1<<10)
 var/const/ASSISTANT			=(1<<11)
 var/const/BRIDGE			=(1<<12)
-var/const/PILOT 			=(1<<13) //VOREStation Add
-var/const/ENTERTAINER		=(1<<14) //VOREStation Add
+var/const/PILOT 			=(1<<13)
+var/const/ENTERTAINER		=(1<<14)
+var/const/ENTREPRENEUR		=(1<<15)
 
 //VOREStation Add
 var/const/TALON				=(1<<3)
diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm
index 73d0bd39d81..93abb2bc0d0 100644
--- a/code/game/objects/effects/job_start_landmarks.dm
+++ b/code/game/objects/effects/job_start_landmarks.dm
@@ -64,6 +64,8 @@
 	name = "Clown"
 /obj/effect/landmark/start/entertainer
 	name = "Entertainer"
+/obj/effect/landmark/start/entrepreneur
+	name = "Entrepreneur"
 /obj/effect/landmark/start/intern
 	name = "Intern"
 /obj/effect/landmark/start/iaa
diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm
index 159041e5717..e91d92ae44e 100644
--- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm	
+++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm	
@@ -191,6 +191,10 @@
 	name = "Entertainer's ID"
 	initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown")
 
+/obj/item/weapon/card/id/civilian/entrepreneur
+	name = "Entrepreneur's ID"
+	initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-gold")
+
 /obj/item/weapon/card/id/civilian/clown
 	name = "Clown's ID"
 	initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n")
diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi
index ca0df7de06e..8d55dfc6006 100644
Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 268688936ab..42b5094855c 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -3392,9 +3392,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "hv" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
+/obj/effect/landmark/start/entrepreneur,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
 "hw" = (
@@ -6529,6 +6527,13 @@
 /obj/effect/landmark/start/bartender,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"of" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled,
+/area/groundbase/civilian/apparel)
 "og" = (
 /obj/effect/landmark/start/miner,
 /obj/structure/cable/yellow{
@@ -33003,7 +33008,7 @@ vi
 Yx
 hr
 pi
-Pb
+hv
 vP
 ye
 CD
@@ -33287,7 +33292,7 @@ Ba
 mL
 hr
 zT
-hv
+of
 sg
 BS
 Pb
@@ -33429,7 +33434,7 @@ hr
 hr
 hr
 bL
-Pb
+hv
 rG
 BS
 zj
@@ -33713,7 +33718,7 @@ qE
 qE
 dk
 Vb
-Pb
+hv
 ll
 ye
 CD
diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm
index be8004e3e97..f0cc76843f7 100644
--- a/maps/stellar_delight/stellar_delight2.dmm
+++ b/maps/stellar_delight/stellar_delight2.dmm
@@ -3785,6 +3785,13 @@
 /obj/structure/low_wall/bay/reinforced/steel,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portfore)
+"hP" = (
+/obj/structure/bed/chair/bay/comfy/brown{
+	dir = 1
+	},
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/recreation_area)
 "hQ" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/firstaid/surgery,
@@ -3866,6 +3873,15 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/crew_quarters/kitchen)
+"ia" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+	pixel_x = -32;
+	pixel_y = -32
+	},
+/obj/structure/table/bench/steel,
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/crew_quarters/recreation_area)
 "ib" = (
 /obj/machinery/power/grounding_rod,
 /obj/structure/cable/yellow{
@@ -3880,6 +3896,11 @@
 /obj/effect/landmark/start/visitor,
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/crew_quarters/bar)
+"id" = (
+/obj/structure/table/bench/steel,
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled/eris/dark/cargo,
+/area/crew_quarters/recreation_area)
 "ie" = (
 /turf/simulated/wall/bay/r_wall/steel,
 /area/maintenance/stellardelight/deck2/portsolars)
@@ -14219,7 +14240,7 @@
 	input_tag = "cooling_in";
 	name = "Engine Cooling Control";
 	output_tag = "cooling_out";
-	sensors = list("burn_chamber"="Burn Chamber");
+	sensors = list("burn_chamber" = "Burn Chamber");
 	throwpass = 1
 	},
 /turf/simulated/floor,
@@ -14755,7 +14776,7 @@
 	frequency = 1443;
 	level = 3;
 	name = "Distribution and Waste Monitor";
-	sensors = list("dist_main_meter"="Surface - Distribution Loop","scrub_main_meter"="Surface - Scrubbers Loop","mair_main_meter"="Surface - Mixed Air Tank","dist_aux_meter"="Station - Distribution Loop","scrub_aux_meter"="Station - Scrubbers Loop","mair_aux_meter"="Station - Mixed Air Tank","mair_mining_meter"="Mining Outpost - Mixed Air Tank")
+	sensors = list("dist_main_meter" = "Surface - Distribution Loop", "scrub_main_meter" = "Surface - Scrubbers Loop", "mair_main_meter" = "Surface - Mixed Air Tank", "dist_aux_meter" = "Station - Distribution Loop", "scrub_aux_meter" = "Station - Scrubbers Loop", "mair_aux_meter" = "Station - Mixed Air Tank", "mair_mining_meter" = "Mining Outpost - Mixed Air Tank")
 	},
 /obj/machinery/power/apc/angled{
 	dir = 1
@@ -18491,7 +18512,7 @@
 	name = "box of measuring cups";
 	pixel_x = 2;
 	pixel_y = 3;
-	starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7)
+	starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7)
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/crew_quarters/kitchen)
@@ -19423,14 +19444,6 @@
 	},
 /turf/simulated/floor/airless,
 /area/stellardelight/deck2/exterior)
-"QJ" = (
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_x = -32;
-	pixel_y = -32
-	},
-/obj/structure/table/bench/steel,
-/turf/simulated/floor/tiled/eris/dark/cargo,
-/area/crew_quarters/recreation_area)
 "QK" = (
 /obj/machinery/atmospherics/omni/mixer{
 	name = "Air Mixer";
@@ -19662,10 +19675,6 @@
 	},
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/quartermaster/storage)
-"Ri" = (
-/obj/structure/table/bench/steel,
-/turf/simulated/floor/tiled/eris/dark/cargo,
-/area/crew_quarters/recreation_area)
 "Rj" = (
 /obj/effect/floor_decal/milspec/color/blue/half{
 	dir = 4
@@ -32383,7 +32392,7 @@ De
 QZ
 Ho
 aE
-QJ
+ia
 WR
 nt
 Rq
@@ -33092,7 +33101,7 @@ Dl
 UX
 UX
 UX
-vS
+hP
 mt
 mt
 mt
@@ -33660,7 +33669,7 @@ Dl
 UX
 UX
 UX
-vS
+hP
 mt
 mt
 mt
@@ -34229,7 +34238,7 @@ cC
 iO
 mt
 lO
-Ri
+id
 sH
 nt
 Rq
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index ede3e273c84..74a37e5453d 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -17307,6 +17307,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
+"aCc" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/grey/border,
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/visitor_laundry)
 "aCd" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -18213,6 +18219,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
+"aDK" = (
+/obj/structure/bed/chair/comfy/black,
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/grey/border{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/visitor_laundry)
 "aDL" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -18286,6 +18304,13 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/locker/laundry_arrival)
+"aDT" = (
+/obj/structure/table/bench/standard,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/grey/border,
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/visitor_laundry)
 "aDU" = (
 /obj/machinery/disposal/deliveryChute{
 	dir = 1
@@ -18718,6 +18743,14 @@
 "aEM" = (
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_dining)
+"aEN" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/grey/border,
+/obj/machinery/light/small,
+/obj/structure/table/bench/standard,
+/obj/effect/landmark/start/entrepreneur,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/visitor_laundry)
 "aEO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -31132,13 +31165,6 @@
 /obj/structure/table/bench/standard,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_laundry)
-"bcM" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/grey/border,
-/obj/machinery/light/small,
-/obj/structure/table/bench/standard,
-/turf/simulated/floor/tiled,
-/area/crew_quarters/visitor_laundry)
 "bcN" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 6
@@ -37957,12 +37983,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/tram)
-"sch" = (
-/obj/structure/table/bench/standard,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/grey/border,
-/turf/simulated/floor/tiled,
-/area/crew_quarters/visitor_laundry)
 "svZ" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -38670,17 +38690,6 @@
 "uiK" = (
 /turf/simulated/wall,
 /area/tether/surfacebase/security/weaponsrange)
-"uke" = (
-/obj/structure/bed/chair/comfy/black,
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/grey/border{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
-/area/crew_quarters/visitor_laundry)
 "uku" = (
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 10
@@ -55461,7 +55470,7 @@ aSX
 aTG
 aSo
 arm
-bcT
+aCc
 aVf
 aUs
 aUu
@@ -55471,7 +55480,7 @@ aWZ
 bcj
 bcF
 gzO
-bcM
+aEN
 aUm
 aUm
 aUm
@@ -56318,7 +56327,7 @@ aUP
 rnt
 aUP
 aUP
-sch
+aDT
 gQH
 baU
 baU
@@ -56456,7 +56465,7 @@ aah
 aUm
 lei
 wVm
-uke
+aDK
 jAq
 glu
 bcJ