Adds SOM tank and it's weapons to Valhalla, adds a mech computer to t…

…he vehicle area (#16254)
tgstation · Jul 6, 2024 · ab4a504 · ab4a504
1 parent 5e6a32b
commit ab4a504
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm
@@ -6515,6 +6515,10 @@
 /obj/item/storage/box/lights/mixed,
 /turf/open/floor/tile/dark/gray,
 /area/centcom/valhalla)
+"jfw" = (
+/obj/machinery/computer/mech_builder,
+/turf/open/floor/plating,
+/area/centcom/valhalla)
 "jhC" = (
 /obj/machinery/status_display{
 	pixel_y = -32
@@ -21029,7 +21033,7 @@ ivs
 ivs
 mvZ
 boq
-boq
+jfw
 boq
 nUd
 aMq

diff --git a/code/game/objects/machinery/buttons.dm b/code/game/objects/machinery/buttons.dm
@@ -330,6 +330,7 @@
 /obj/machinery/button/valhalla/vehicle_button/proc/spawn_vehicles(mob/living/user)
 	var/list/spawnable_vehicles = list(
 		/obj/vehicle/sealed/armored/multitile,
+		/obj/vehicle/sealed/armored/multitile/som_tank,
 		/obj/vehicle/sealed/armored/multitile/apc
 	)
 

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -1568,6 +1568,16 @@
 			/obj/item/tank_module/ability/smoke_launcher = -1,
 			/obj/item/tank_module/interior/medical = -1,
 		),
+		"SOM Assault Vehicle" = list(
+			/obj/item/armored_weapon/volkite_carronade = -1,
+			/obj/item/armored_weapon/particle_lance = -1,
+			/obj/item/armored_weapon/coilgun = -1,
+			/obj/item/armored_weapon/secondary_mlrs = -1,
+			/obj/item/ammo_magazine/tank/volkite_carronade = -1,
+			/obj/item/ammo_magazine/tank/particle_lance = -1,
+			/obj/item/ammo_magazine/tank/coilgun = -1,
+			/obj/item/ammo_magazine/tank/secondary_mlrs = -1,
+		),
 	)
 
 /obj/machinery/vending/valhalla_seasonal_req