Adds Standard Marine Autoclosets to Valhalla (#13593)

tgstation · Jul 27, 2023 · 4e473d5 · 4e473d5
1 parent 9773975
commit 4e473d5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm
@@ -6400,6 +6400,9 @@
 	dir = 8
 	},
 /obj/machinery/vending/uniform_supply/valhalla,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/tile/dark/gray,
 /area/centcom/valhalla/security/brig/interiorcavern)
 "iFb" = (
@@ -6770,6 +6773,9 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/tile/dark/gray,
 /area/centcom/valhalla/security/brig/interiorcavern)
 "jkS" = (
@@ -7663,6 +7669,9 @@
 	dir = 4
 	},
 /obj/machinery/vending/uniform_supply/valhalla,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/tile/dark/gray,
 /area/centcom/valhalla/security/brig/interiorcavern)
 "kkv" = (
@@ -7684,6 +7693,9 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/tile/dark/gray,
 /area/centcom/valhalla/security/brig/interiorcavern)
 "kmB" = (
@@ -8146,6 +8158,10 @@
 /obj/machinery/newscaster,
 /turf/closed/wall/r_wall,
 /area/centcom/valhalla/crew_quarters/captain)
+"kQN" = (
+/obj/machinery/marine_selector/clothes/valhalla,
+/turf/open/floor/tile/dark/gray,
+/area/centcom/valhalla/security/brig/interiorcavern)
 "kQR" = (
 /obj/effect/ai_node,
 /turf/open/floor/tile/dark/gray,
@@ -23838,7 +23854,7 @@ cnE
 llp
 tSq
 tWP
-khV
+kQN
 vLH
 lTP
 mHX
@@ -24252,7 +24268,7 @@ tvG
 llp
 ndm
 bZV
-khV
+kQN
 dyS
 uGs
 mLF

diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
@@ -103,7 +103,7 @@ CHIEF_MEDICAL_OFFICER, SYNTHETIC, SILICON_AI, CORPORATE_LIAISON, SHIP_TECH, \
 MEDICAL_DOCTOR, MEDICAL_RESEARCHER, SQUAD_LEADER, SQUAD_SMARTGUNNER, SQUAD_CORPSMAN, SQUAD_ENGINEER, SQUAD_MARINE, \
 SOM_SQUAD_MARINE, SOM_SQUAD_VETERAN, SOM_SQUAD_ENGINEER, SOM_SQUAD_CORPSMAN, SOM_SQUAD_LEADER))
 GLOBAL_LIST_INIT(jobs_xenos, list(ROLE_XENOMORPH, ROLE_XENO_QUEEN))
-GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine)))
+GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine), TRUE))
 
 //Playtime tracking system, see jobs_exp.dm
 #define EXP_TYPE_LIVING "Living"

diff --git a/code/datums/jobs/job/fallen.dm b/code/datums/jobs/job/fallen.dm
@@ -34,6 +34,8 @@
 	title = SQUAD_MARINE
 	outfit = /datum/outfit/job/marine/standard
 
+/datum/job/fallen/marine/standard
+
 /datum/job/fallen/marine/engineer
 	title = SQUAD_ENGINEER
 	skills_type = /datum/skills/combat_engineer

diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm
@@ -351,6 +351,11 @@
 	resistance_flags = INDESTRUCTIBLE
 	lock_flags = JOB_LOCK
 
+/obj/machinery/marine_selector/clothes/valhalla
+	vendor_role = /datum/job/fallen/marine/standard
+	resistance_flags = INDESTRUCTIBLE
+	lock_flags = JOB_LOCK
+
 /obj/machinery/marine_selector/clothes/commander
 	name = "GHMME Automated Commander Closet"
 	req_access = list(ACCESS_MARINE_COMMANDER)