From 275cc9cc2d8bd3fdd6fa873ef61177c859a0fed6 Mon Sep 17 00:00:00 2001 From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:14:12 -0500 Subject: [PATCH] vending stuff --- .../apartment_beach.dmm | 3 ++- .../apartment_forest.dmm | 3 ++- .../apartment_jungle.dmm | 16 +++++++++++----- .../apartment_prison.dmm | 11 ++++++++--- .../apartment_sauna.dmm | 13 +++++++++---- .../apartment_winter.dmm | 19 +++++++++++++------ 6 files changed, 45 insertions(+), 20 deletions(-) diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_beach.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_beach.dmm index d66c29017126..470e16cee89a 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_beach.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_beach.dmm @@ -350,7 +350,8 @@ "UM" = ( /obj/machinery/vending/dinnerware{ contraband = list(/obj/item/kitchen/rollingpin=2,/obj/item/kitchen/knife/butcher=2,/obj/item/reagent_containers/food/condiment/flour=4); - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_forest.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_forest.dmm index 52288efa4216..d5b4f98555e0 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_forest.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_forest.dmm @@ -188,7 +188,8 @@ "yV" = ( /obj/machinery/vending/kink{ custom_premium_price = 0; - custom_price = 0 + custom_price = 0; + onstation = 0 }, /turf/open/floor/spooktime/beach, /area/hilbertshotel) diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_jungle.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_jungle.dmm index 21f332dcf078..ed74efb7134f 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_jungle.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_jungle.dmm @@ -1,7 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ah" = ( /obj/machinery/vending/coffee{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/closed/indestructible/wood, /area/hilbertshotel) @@ -68,7 +69,8 @@ "cI" = ( /obj/machinery/vending/kink{ custom_premium_price = 0; - custom_price = 0 + custom_price = 0; + onstation = 0 }, /turf/open/floor/spooktime/cobble/roadmid, /area/hilbertshotel) @@ -190,7 +192,8 @@ }, /obj/machinery/vending/dinnerware{ contraband = list(/obj/item/kitchen/rollingpin=2,/obj/item/kitchen/knife/butcher=2,/obj/item/reagent_containers/food/condiment/flour=4); - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/open/floor/plasteel/cafeteria, /area/hilbertshotel) @@ -306,7 +309,8 @@ /area/hilbertshotel) "uv" = ( /obj/machinery/vending/games{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/closed/indestructible/wood, /area/hilbertshotel) @@ -320,7 +324,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/vending/boozeomat, +/obj/machinery/vending/boozeomat{ + onstation = 0 + }, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_prison.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_prison.dmm index 216ce35ca2f8..1e075aed082c 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_prison.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_prison.dmm @@ -1108,7 +1108,9 @@ "Lg" = ( /obj/machinery/vending/kink{ extended_inventory = 1; - shut_up = 1 + shut_up = 1; + onstation = 0; + }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -1156,7 +1158,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/vending/games, +/obj/machinery/vending/games{ + onstation = 0 + }, /turf/open/floor/wood, /area/hilbertshotel) "MP" = ( @@ -1251,7 +1255,8 @@ "NR" = ( /obj/machinery/vending/kink{ extended_inventory = 1; - shut_up = 1 + shut_up = 1; + onstation = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 9 diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm index 5a1a30f17d12..c11502d2b683 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_sauna.dmm @@ -68,7 +68,8 @@ /area/hilbertshotel) "gS" = ( /obj/machinery/vending/games{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -388,7 +389,9 @@ /area/hilbertshotel) "CY" = ( /obj/machinery/light_switch/directional/east, -/obj/machinery/vending/kink, +/obj/machinery/vending/kink{ + onstation = 0 + }, /turf/open/floor/wood, /area/hilbertshotel) "CZ" = ( @@ -493,7 +496,8 @@ /area/hilbertshotel) "LP" = ( /obj/machinery/vending/cigarette{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -573,7 +577,8 @@ "Ph" = ( /obj/machinery/vending/dinnerware{ contraband = list(/obj/item/kitchen/rollingpin=2,/obj/item/kitchen/knife/butcher=2,/obj/item/reagent_containers/food/condiment/flour=4); - shut_up = 1 + shut_up = 1; + onstation = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 5 diff --git a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_winter.dmm b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_winter.dmm index a1d938e30c4f..e33e2971e3fb 100644 --- a/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_winter.dmm +++ b/_maps/splurt_maps/templates/hilbertshotel_templates/apartment_winter.dmm @@ -145,7 +145,8 @@ /area/hilbertshotel) "jc" = ( /obj/machinery/vending/games{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/closed/indestructible/wood, /area/hilbertshotel) @@ -434,7 +435,8 @@ "zU" = ( /obj/machinery/vending/dinnerware{ contraband = list(/obj/item/kitchen/rollingpin=2,/obj/item/kitchen/knife/butcher=2,/obj/item/reagent_containers/food/condiment/flour=4); - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/closed/indestructible/wood, /area/hilbertshotel) @@ -479,7 +481,8 @@ dir = 6 }, /obj/machinery/vending/cigarette{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/open/floor/carpet, /area/hilbertshotel) @@ -517,7 +520,8 @@ /area/hilbertshotel) "DX" = ( /obj/machinery/vending/coffee{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/closed/indestructible/wood, /area/hilbertshotel) @@ -620,7 +624,8 @@ dir = 10 }, /obj/machinery/vending/kink{ - shut_up = 1 + shut_up = 1; + onstation = 0 }, /turf/open/floor/carpet, /area/hilbertshotel) @@ -781,7 +786,9 @@ /turf/open/floor/carpet/royalblue, /area/hilbertshotel) "Ty" = ( -/obj/machinery/vending/boozeomat, +/obj/machinery/vending/boozeomat{ + onstation = 0 + }, /turf/closed/indestructible/wood, /area/hilbertshotel) "TO" = (