From 9422f666a6069f1995a258f4cab82150d1da4214 Mon Sep 17 00:00:00 2001
From: Zenith <109559450+Zenith00000@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:52:27 +0100
Subject: [PATCH] van fixes + minor map fixes

---
 .../vehicles/hardpoints/wheels/van_wheels.dm  |  2 +-
 code/modules/vehicles/van/pizza_van.dm        |  7 +--
 .../LV759_Hybrisa_Prospera.dmm                | 47 ++++++++-----------
 3 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/code/modules/vehicles/hardpoints/wheels/van_wheels.dm b/code/modules/vehicles/hardpoints/wheels/van_wheels.dm
index e694136c5ade..b4b981ca1d5b 100644
--- a/code/modules/vehicles/hardpoints/wheels/van_wheels.dm
+++ b/code/modules/vehicles/hardpoints/wheels/van_wheels.dm
@@ -1,5 +1,5 @@
 /obj/item/hardpoint/locomotion/van_wheels
-	name = "\improper Van wheels"
+	name = "vehicle wheels"
 	desc = "Integral to the movement of the van"
 	icon = 'icons/obj/vehicles/hardpoints/van.dmi'
 
diff --git a/code/modules/vehicles/van/pizza_van.dm b/code/modules/vehicles/van/pizza_van.dm
index 416321fa69eb..e620c0f50b9f 100644
--- a/code/modules/vehicles/van/pizza_van.dm
+++ b/code/modules/vehicles/van/pizza_van.dm
@@ -19,11 +19,6 @@
 	icon = 'icons/obj/vehicles/pizza_van.dmi'
 	icon_state = "van_base"
 
-/obj/effect/vehicle_spawner/box_van/pizza_van/Initialize()
-	. = ..()
-	spawn_vehicle()
-	qdel(src)
-
 //PRESET: no hardpoints
 /obj/effect/vehicle_spawner/box_van/pizza_van/spawn_vehicle()
 
@@ -49,5 +44,5 @@
 	handle_direction(PIZZA)
 	PIZZA.update_icon()
 
-/obj/effect/vehicle_spawner/pizza_van/fixed/load_hardpoints(obj/vehicle/multitile/box_van/pizza_van/V)
+/obj/effect/vehicle_spawner/box_van/pizza_van/fixed/load_hardpoints(obj/vehicle/multitile/box_van/pizza_van/V)
 	V.add_hardpoint(new /obj/item/hardpoint/locomotion/van_wheels)
diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
index 6872c98f52b6..d8e9b30e6762 100644
--- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
+++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
@@ -15873,6 +15873,10 @@
 /obj/structure/noticeboard{
 	pixel_y = 30
 	},
+/obj/item/reagent_container/glass/bucket{
+	pixel_x = -11;
+	pixel_y = 1
+	},
 /turf/open/floor/prison{
 	dir = 9;
 	icon_state = "darkbrown2"
@@ -60918,14 +60922,6 @@
 /obj/structure/machinery/portable_atmospherics/canister/empty/phoron,
 /turf/open/floor/corsat,
 /area/lv759/indoors/power_plant/gas_generators)
-"iJW" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_y = 4;
-	pixel_x = 2
-	},
-/turf/closed/wall/hybrisa/spaceport,
-/area/lv759/indoors/spaceport/cuppajoes)
 "iJY" = (
 /obj/structure/platform/strata/metal{
 	dir = 4
@@ -74297,14 +74293,6 @@
 	},
 /turf/open/auto_turf/hybrisashale/layer1,
 /area/lv759/indoors/caves/north_east_caves)
-"kFo" = (
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_y = 4;
-	pixel_x = 2
-	},
-/turf/closed/wall/hybrisa/spaceport_reinforced,
-/area/lv759/indoors/spaceport/cuppajoes)
 "kFs" = (
 /obj/structure/platform/hybrisa/metalplatform6,
 /obj/structure/platform/hybrisa/metalplatform6{
@@ -77324,10 +77312,6 @@
 /obj/item/reagent_container/food/drinks/coffee/cuppa_joes{
 	pixel_x = 4
 	},
-/obj/structure/window/reinforced{
-	dir = 4;
-	pixel_y = 4
-	},
 /turf/open/floor/strata{
 	icon_state = "floor3"
 	},
@@ -79523,10 +79507,11 @@
 	},
 /area/lv759/indoors/hospital/reception)
 "lrl" = (
-/obj/structure/surface/rack,
-/obj/effect/spawner/random/tool,
-/obj/effect/spawner/random/tech_supply,
-/obj/item/weapon/twohanded/breacher/synth,
+/obj/structure/closet,
+/obj/item/clothing/suit/hybrisa/engineering_utility_oversuit,
+/obj/item/clothing/suit/hybrisa/engineering_utility_oversuit/alt,
+/obj/item/clothing/under/hybrisa/engineering_utility,
+/obj/item/clothing/under/hybrisa/engineering_utility/alt,
 /turf/open/floor/prison{
 	dir = 10;
 	icon_state = "darkbrown2"
@@ -107166,6 +107151,10 @@
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out"
 	},
+/obj/item/reagent_container/glass/bucket{
+	pixel_x = -9;
+	pixel_y = 9
+	},
 /turf/open/floor/prison{
 	dir = 1;
 	icon_state = "darkbrown2"
@@ -161507,8 +161496,12 @@
 /turf/open/floor/hybrisa/tile/tilegreen,
 /area/lv759/indoors/garage_reception)
 "xas" = (
-/obj/structure/machinery/cm_vending/clothing/synth/snowflake,
 /obj/structure/machinery/light,
+/obj/structure/surface/rack,
+/obj/item/storage/pouch/construction,
+/obj/item/tool/surgery/synthgraft,
+/obj/effect/spawner/random/tool,
+/obj/effect/spawner/random/tech_supply,
 /turf/open/floor/prison{
 	icon_state = "darkbrown2"
 	},
@@ -180215,9 +180208,9 @@ tGD
 ygN
 pNQ
 hhE
-kFo
+hhE
+hXw
 hXw
-iJW
 tdH
 cBg
 kUz