From 0491cae0cf6007ece9faa379e32f77992323b548 Mon Sep 17 00:00:00 2001 From: Fira Date: Fri, 20 Oct 2023 22:54:05 +0100 Subject: [PATCH 1/3] fix reqs vendors sprites --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 3740158c7e0f..ec3fdf298a2a 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -22749,9 +22749,7 @@ /turf/closed/wall/almayer, /area/almayer/squads/req) "bQS" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo{ - icon_state = "req_ammo_wall" - }, +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/blend, /turf/open/floor/almayer{ icon_state = "green" }, @@ -24366,9 +24364,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "bYa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo{ - icon_state = "req_guns_wall" - }, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/blend, /turf/open/floor/almayer{ dir = 10; icon_state = "green" From c87943602c90cdda31b127ed1840107146208c12 Mon Sep 17 00:00:00 2001 From: Fira Date: Sat, 21 Oct 2023 10:30:09 +0100 Subject: [PATCH 2/3] fix inheritance for vend-to-counter to keep working --- code/game/machinery/vending/vendor_types/requisitions.dm | 4 ++-- maps/map_files/USS_Almayer/USS_Almayer.dmm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 07284e7f8e71..8558019839f7 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -192,7 +192,7 @@ turf_to_vent_to = H.loc return turf_to_vent_to -/obj/structure/machinery/cm_vending/sorted/cargo_guns/blend +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend icon_state = "req_guns_wall" tiles_with = list( /obj/structure/window/framed/almayer, @@ -296,7 +296,7 @@ updateUsrDialog() return //We found our item, no reason to go on. -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/blend +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend icon_state = "req_ammo_wall" tiles_with = list( /obj/structure/window/framed/almayer, diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index ec3fdf298a2a..b2b300133d12 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -22749,7 +22749,7 @@ /turf/closed/wall/almayer, /area/almayer/squads/req) "bQS" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_ammo/blend, +/obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, /turf/open/floor/almayer{ icon_state = "green" }, @@ -24364,7 +24364,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/vehiclehangar) "bYa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/blend, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, /turf/open/floor/almayer{ dir = 10; icon_state = "green" From 7c559f745e0abba082cd0c2f26779487c517727c Mon Sep 17 00:00:00 2001 From: Fira Date: Sat, 21 Oct 2023 10:33:31 +0100 Subject: [PATCH 3/3] missed commit --- code/game/turfs/walls/wall_types.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 22979858ce62..1b4091eb2aab 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -24,8 +24,8 @@ /obj/structure/girder, /obj/structure/machinery/door, /obj/structure/machinery/cm_vending/sorted/attachments/blend, - /obj/structure/machinery/cm_vending/sorted/cargo_ammo/blend, - /obj/structure/machinery/cm_vending/sorted/cargo_guns/blend, + /obj/structure/machinery/cm_vending/sorted/cargo_ammo/cargo/blend, + /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, ) /turf/closed/wall/almayer/update_icon()