diff --git a/GainStation13/code/modules/vending/gatocola.dm b/GainStation13/code/modules/vending/gatocola.dm new file mode 100644 index 00000000..b8225587 --- /dev/null +++ b/GainStation13/code/modules/vending/gatocola.dm @@ -0,0 +1,32 @@ +/obj/machinery/vending/gato + name = "GATO Vending Machine" + desc = "A GATO branded cola machine, a cute little cat is plastered onto it." + icon = 'icons/obj/vending.dmi' + icon_state = "cola_black" + product_slogans = "Meow~, time for some cola!" + vend_reply = "Meow~ Meow~" + products = list( + /obj/item/reagent_containers/food/drinks/beer = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, + ) + contraband = list( + /obj/item/organ/ears/cat = 2, + ) + premium = list( + /obj/item/reagent_containers/food/drinks/soda_cans/air = 20, + + ) + + refill_canister = /obj/item/vending_refill/mealdor + +obj/item/vending_refill/mealdor + machine_name = "Meal Vendor Refill" + icon_state = "refill_mealdor" + +#define STANDARD_CHARGE 1 +#define CONTRABAND_CHARGE 2 +#define COIN_CHARGE 3 diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index f320b643..9dc4bc93 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1812,7 +1812,7 @@ "aIR" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "aIS" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "aIT" = (/turf/closed/wall,/area/hallway/primary/central) -"aIU" = (/obj/machinery/vending/cola/random,/turf/open/floor/plasteel/dark,/area/hallway/primary/central) +"aIU" = (/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/central) "aIV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/central) "aIW" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "aIX" = (/obj/machinery/door/airlock{dir = 4; name = "Unit B"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) @@ -2071,7 +2071,7 @@ "aNQ" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "aNR" = (/obj/structure/table/wood,/obj/item/storage/fancy/cigarettes{pixel_y = 2},/obj/item/lighter/greyscale{pixel_x = 4; pixel_y = 2},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "aNS" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/carpet,/area/hallway/secondary/entry) -"aNT" = (/obj/machinery/vending/cola/random,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) +"aNT" = (/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) "aNU" = (/obj/structure/cable{icon_state = "2-4"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aNV" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) "aNW" = (/obj/machinery/vending/sustenance,/turf/open/floor/plasteel/dark,/area/security/prison) @@ -2098,7 +2098,7 @@ "aOr" = (/obj/effect/landmark/event_spawn,/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOs" = (/obj/machinery/light,/obj/structure/sign/warning/electricshock{pixel_y = -32},/obj/machinery/door/firedoor,/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "aOt" = (/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) -"aOu" = (/obj/machinery/vending/cola/random,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/hallway/primary/central) +"aOu" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/central) "aOv" = (/obj/machinery/power/apc{areastring = "/area/crew_quarters/toilet"; dir = 4; name = "Dormitory Bathrooms APC"; pixel_x = 26},/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) "aOw" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet/black,/area/hallway/primary/central) "aOx" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/obj/machinery/door/airlock/maintenance{dir = 4; req_access_txt = "12"},/turf/open/floor/plating,/area/maintenance/starboard/fore) @@ -3173,7 +3173,7 @@ "bja" = (/obj/structure/trash_pile,/turf/open/floor/plating,/area/maintenance/port/fore) "bjb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/chair{dir = 1},/turf/open/floor/plasteel/dark,/area/security/courtroom) "bjc" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/fore/secondary) -"bjd" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/wood,/area/crew_quarters/fitness) +"bjd" = (/obj/machinery/vending/gato,/turf/open/floor/wood,/area/crew_quarters/fitness) "bje" = (/turf/open/floor/wood,/area/crew_quarters/fitness) "bjf" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/crew_quarters/fitness) "bjg" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/structure/trash_pile,/turf/open/floor/plating,/area/maintenance/port/fore) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2c5d13b0..760fbcf0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1212,8 +1212,8 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "afz" = ( -/obj/machinery/vending/cola/random, /obj/effect/turf_decal/delivery, +/obj/machinery/vending/gato, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "afA" = ( @@ -7007,7 +7007,6 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "arO" = ( -/obj/machinery/vending/cola/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Arrivals - Aft"; @@ -7015,6 +7014,7 @@ name = "arrivals camera" }, /obj/effect/turf_decal/bot, +/obj/machinery/vending/gato, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "arP" = ( @@ -67989,7 +67989,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cjy" = ( -/obj/machinery/vending/cola/random, /obj/structure/sign/poster/official/ian{ pixel_y = -32 }, @@ -68003,6 +68002,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/vending/gato, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) "cjz" = ( @@ -85786,8 +85786,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "cNF" = ( -/obj/machinery/vending/cola/random, /obj/effect/turf_decal/delivery, +/obj/machinery/vending/gato, /turf/open/floor/plasteel, /area/hallway/primary/central) "cNG" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2a5801a2..ded8aae4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -864,7 +864,7 @@ "aqZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "ara" = (/obj/machinery/disposal/bin,/obj/machinery/light_switch{pixel_y = -26},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/camera{c_tag = "Fitness Room - Aft"; dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) "arb" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -28},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/vending/mealdor,/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) -"arc" = (/obj/machinery/light,/obj/machinery/vending/cola/random,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) +"arc" = (/obj/machinery/light,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) "ard" = (/obj/machinery/vending/cigarette,/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) "are" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/closed/wall,/area/crew_quarters/fitness/recreation) "arf" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/closed/wall,/area/crew_quarters/fitness/recreation) @@ -3647,7 +3647,7 @@ "bsB" = (/obj/effect/turf_decal/tile/blue{dir = 4},/obj/machinery/power/apc{areastring = "/area/hallway/secondary/entry"; dir = 4; name = "Arrivals APC"; pixel_x = 26},/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/entry) "bsC" = (/turf/open/floor/carpet,/area/hallway/primary/port) "bsD" = (/obj/structure/chair/comfy{dir = 8},/turf/open/floor/plasteel/grimy,/area/hallway/primary/port) -"bsE" = (/obj/machinery/vending/cola/random,/obj/machinery/newscaster{pixel_x = -30},/turf/open/floor/plasteel/dark,/area/hallway/primary/port) +"bsE" = (/obj/machinery/newscaster{pixel_x = -30},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/port) "bsF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/port) "bsG" = (/obj/structure/disposalpipe/segment{dir = 5},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel,/area/hallway/primary/port) "bsH" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/port) @@ -4472,7 +4472,7 @@ "bIu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/carpet,/area/crew_quarters/bar) "bIv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/xmastree,/turf/open/floor/carpet,/area/crew_quarters/bar) "bIw" = (/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/carpet,/area/crew_quarters/bar) -"bIx" = (/obj/machinery/vending/cola/random,/turf/open/floor/wood,/area/crew_quarters/bar) +"bIx" = (/obj/machinery/vending/gato,/turf/open/floor/wood,/area/crew_quarters/bar) "bIy" = (/obj/structure/cable/yellow{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/chair/sofachair,/turf/open/floor/wood,/area/crew_quarters/bar) "bIz" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/jukebox,/turf/open/floor/wood,/area/crew_quarters/bar) "bIA" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood,/area/crew_quarters/bar) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 32259584..53cdc0ab 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1385,7 +1385,7 @@ "aAY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/corner,/turf/open/floor/plasteel,/area/hallway/primary/aft) "aAZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/disposalpipe/junction,/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/starboard/fore) "aBa" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/hallway/primary/starboard/fore) -"aBb" = (/obj/machinery/vending/cola/random,/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/primary/starboard/fore) +"aBb" = (/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/starboard/fore) "aBc" = (/obj/machinery/computer/security{dir = 4},/obj/machinery/newscaster/security_unit{pixel_x = -32},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit) "aBd" = (/obj/structure/chair/office/dark,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit) "aBe" = (/obj/machinery/computer/secure_data{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit) @@ -1838,7 +1838,7 @@ "aJU" = (/obj/structure/chair/office/dark{dir = 4},/obj/effect/landmark/start/botanist,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 8},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel,/area/hydroponics) "aJV" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters/preopen{id = "hydrodesk"; name = "Hydroponics Counter Shutters"},/obj/item/reagent_containers/food/snacks/grown/wheat,/obj/item/reagent_containers/food/snacks/grown/pumpkin,/obj/item/reagent_containers/food/snacks/grown/grapes,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hydroponics) "aJW" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) -"aJX" = (/obj/machinery/vending/cola/random,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) +"aJX" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/vending/gato,/turf/open/floor/mineral/basaltstone_floor,/area/crew_quarters/bar/atrium) "aJY" = (/obj/structure/sign/warning/nosmoking,/turf/closed/wall,/area/crew_quarters/kitchen) "aJZ" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/machinery/camera{c_tag = "Kitchen Coldroom"; dir = 4},/turf/open/floor/plasteel/freezer,/area/crew_quarters/kitchen) "aKa" = (/obj/machinery/airalarm{dir = 1; pixel_y = -22},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel/freezer,/area/crew_quarters/kitchen) @@ -2728,7 +2728,7 @@ "bgb" = (/obj/structure/bookcase,/obj/structure/sign/plaques/kiddie/badger{pixel_y = 32},/obj/machinery/light/small{dir = 4},/obj/machinery/status_display/ai{pixel_x = 32},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/chapel/main) "bge" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/item/radio/intercom{name = "Station Intercom"; pixel_x = -26},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=8.4-AftNW"; location = "8.3-AftSW"},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/aft) "bgf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable/white{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel{heat_capacity = 1e+006},/area/hallway/primary/aft) -"bgl" = (/obj/machinery/vending/cola/random,/obj/machinery/newscaster{pixel_x = 32},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) +"bgl" = (/obj/machinery/newscaster{pixel_x = 32},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/vending/gato,/turf/open/floor/plasteel/dark,/area/hallway/primary/aft) "bgm" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/xenobiology) "bgo" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable/white{icon_state = "0-2"},/turf/open/floor/plating,/area/science/xenobiology) "bgp" = (/obj/structure/table/reinforced,/obj/machinery/button/door{id = "xeno1"; name = "Containment Control"; req_access_txt = "55"},/obj/machinery/firealarm{pixel_y = 24},/obj/structure/extinguisher_cabinet{pixel_x = -24; pixel_y = 32},/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/science/xenobiology) @@ -2897,7 +2897,7 @@ "bkt" = (/obj/item/twohanded/required/kirbyplants{icon_state = "plant-22"},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bku" = (/obj/machinery/vending/snack/random,/obj/machinery/light{dir = 1},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bky" = (/obj/structure/chair{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) -"bkz" = (/obj/machinery/vending/cola/random,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) +"bkz" = (/obj/effect/turf_decal/delivery,/obj/machinery/vending/gato,/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bkB" = (/obj/structure/chair{dir = 4},/obj/effect/landmark/start/assistant,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bkC" = (/obj/item/beacon,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bkE" = (/obj/item/twohanded/required/kirbyplants{icon_state = "plant-21"; pixel_x = -3; pixel_y = 3},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/hallway/secondary/entry) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 217bad4c..16cba299 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -14743,6 +14743,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/vending/gato, /turf/open/floor/plasteel/cafeteria, /area/hallway/secondary/entry) "aDt" = ( @@ -28866,7 +28867,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bgi" = ( -/obj/machinery/vending/cola, /obj/structure/sign/map{ icon_state = "map-pubby"; pixel_y = 32 @@ -28874,6 +28874,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/vending/gato, /turf/open/floor/plasteel, /area/hallway/primary/central) "bgj" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index a358cf5b..18939f6c 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1361,7 +1361,7 @@ "Aq" = (/obj/structure/table/optable,/obj/item/surgical_drapes,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/control) "Ar" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel,/area/centcom/control) "As" = (/obj/machinery/computer/communications{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 24},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/centcom/control) -"At" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/vending/cola/black{free = 1},/turf/open/floor/plasteel/dark,/area/centcom/ferry) +"At" = (/obj/machinery/vending/gato,/turf/open/floor/wood,/area/centcom/ferry) "Au" = (/obj/machinery/abductor/experiment{team_number = 3},/turf/open/floor/plating/abductor,/area/abductor_ship) "Av" = (/obj/machinery/abductor/console{team_number = 3},/turf/open/floor/plating/abductor,/area/abductor_ship) "Aw" = (/obj/machinery/abductor/pad{team_number = 3},/turf/open/floor/plating/abductor,/area/abductor_ship) @@ -2633,7 +2633,7 @@ aaaaaanbncndnenfaaaalIlIlIlIlIlIlIlIqEqEqZqZqZqZqZqZqZqZqZqZqZqZqZqEqElIlIlIlIlI aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIqEqEqEDCqEqEqEDDqEqEqEDEqEqEqElIlIlIlIlIlIlIlIaahhktpupupupupupupupupupupupupupupupupuktQVQVQVQVOuQVQVaaaaaaaaaaaaaaaaQVMIrbMIMIMIMIMIMIMIPJQVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDOPXzmDCWVKQUoBNHQrmDZWImZWZTMsImImImImImImImImImImImImImTEFCzApgpgpgBrpgTNWGUopgpgBXioWIipDFiCDGDHnpnqnqnqnpDIDJiCnsipiuioioioiokZioioioioDKqxVOVOVOVOVOVOVOVOVOVOVOWrVOVOVOVOVOVOVOVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIqEDLDMDNqEDOuEDPqEDQDRDSqElIlIlIlIlIlIlIlIlIaahhktpupupupupuktktktktktktktpupupupupuktTzUyhhaaaaaaaaaaaaaaaaaaaaaaaaQVMIWjMkMIMIscMIMIzRYgQVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDRITSmDXiUUtQpgpgWhmDZWImQDmDzWUYUNBtUYQwLuImRNUYyRZvUYQwNfnUCRpgpgpgpgpgpgLkpgUrpguIiolNiuDTDUMfiuoQDVwHDWnWiuMgDXDYiuqvioqwiuociCiCioWrWrWrVOyNPGVONcsYQKQKsYWKVOWrWrVONzOrOrOrOrSIVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIqEDZDMEaqEEbEcEdqEEeDREfqElIlIlIlIlIlIlIlIlIaahhktktktktktktktpupupupupuktktktktktktktmzpuhhaaaaaaaaaaaaaaaaaaaaaaaaQVMIMIRbZHXqZHZHZHYgMIQVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDUzTSPpoBpgpgpgpgoBZoZWImZWmDQFWxUSBtWxUSzEImQFWxUSZvWxUSzETXzApgpgRATtInzAxZMVwYwLZkioiuioioioiminiuiuEgiuiuinimioioioiuiolLiuiCiCiCioMPWrWrpzQEQEVONcsYsYQKsYWKVOOvOvVONzZQZQZQOrSIVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIqEEhEiEjqEEkuEElqEEmEnEoqElIlIlIlIlIlIlIlIlIaahhpupupupupupupupupupumypupupupupupupupupuhhhhaaaaaaaaaaaaaaaaaaaaaaaaQVQVQVQVQVQVQVQVQVQVQVQVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDTQwnmDqdTYoBoBWyqdmDZWImZWoeZWZWZWZWZWZWZWImZWZWZWZWZWZWZWmDzAzATVPjzmYPEpEpEpEpEpEpEpErEsEpEtEuEvEwExEyEzEAEvEuEtEpErEsEpEpEpEpEBEpEpWrWrWrVOWrWrvoNcsYsYQKsYWKvoHaHavoNzOrOrOrOrSIVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIqEEhEiEjqEEkuEElqEEmEnEoqElIlIlIlIlIlIlIlIlIaahhpupupupupupupupupupumypupupupupupupupupuhhhhaaaaaaaaaaaaaaaaaaaaaaaaQVQVQVQVQVQVQVQVQVQVQVQVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDTQwnmDqdTYoBAtWyqdmDZWImZWoeZWZWZWZWZWZWZWImZWZWZWZWZWZWZWmDzAzATVPjzmYPEpEpEpEpEpEpEpErEsEpEtEuEvEwExEyEzEAEvEuEtEpErEsEpEpEpEpEBEpEpWrWrWrVOWrWrvoNcsYsYQKsYWKvoHaHavoNzOrOrOrOrSIVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIqEqEECqEqEqEAxqEqEqEqEqEqElIlIlIlIlIlIlIlIlIaahhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDmDmDmDmDmDmDmDmDmDmDDnImOdoeMsImImImImImImImImImImImImImTEmDnTvZEpEpEpEpEpEEThEEEGEHEvEIEJEKELEMENEyEOEOEOEyENEPEQEKERESEvETEUEvEFEVEpEpEpEpEptiOvvoNcsYsYQKsYWKvoIKIKvoNzOrZQZQZQSIVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIlIqEqZqEqZEWEXEWEYqElIlIlIlIlIlIlIlIlIlIlIlIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDmDXcXzmDUeQfXIUPwiQrmDZWImzYoeQFUYySZvUYZILuImRNUYQwZvUYySzEmDwkzAEpFmFnFoEpEvEvEpEvEvEpFpFqEpEvFrEvFsEOFtEOFuEvFrEvEpFvFwEpEvEvEpYtEpEpFxFyFzEpZPycVONcQKQKQKQKWKVOOhOhVONzOrOrOrOrSIVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIlIAxqZECqZqZqZqZqZAxlIlIlIlIlIlIlIlIlIlIlIlIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDYYTSTSmDoBpgpgpgpgTpmDZWImtvoeQFWxUSZvWxUSubImZqWxUSZvWxUSzEmDNKpgEpFDFEFFEpFGFHFIFHFIFHFJFwFKFqFLFLFMEOEOEOFNFLFLFvFKFpFOFHFPFHFPFHFQEpFRFEFSEptdUCVOZVVBVBVBVBUQVOMPOMVOoUMUMUMUMUVcVOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -2655,7 +2655,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDUzTSPpoBTDNXVSpgoBPyZWImzYoeStVhZBOqOqWFSXZnOqJYSXOqWFSXMzWnIvIRIvISISIvIyIzITIUIVIUIWIDJsItIFIGIHIHIHIHIHIHIHIIIFItJtMhIZJaJbJaJcMiIPIvISISIvIRIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaakokpkqkrksaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDROwnmDqdTYXZoBTYqdmDZWImtvoeStVhZlOqOqWFJYZnOqURUROqWFJYMzYlIvIwIvWJWJIvIyIzJuJvJvJvJwIDIEItIFIGIHIHIHIHIHIHIHIIIFItIJMhJxJyJyJyJzMiIPIvWJWJIvIQIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaakKkLJAJBJCkPkQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDmDmDmDmDmDmDmDmDmDmDXNImQDmDXSWqwjYOSlSlSlSlSlSlSlSlSlSlNeVdIvIRIvISISIvIvIvJDJDJDJDJDIvIsItIuItItItItItItItItItIuItIsIvJDJDJDJDJDIvIvIvISISIvIRIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaalgJFlilililjlkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIZcZclIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDOiXzmDNHSsXIUPXRUemDHyImZWmDBkWTWTWTAtYGVJzANqQzXPWTWTWTWTCkIvJdIRJGJGJGJGIvJHJHJHJHJHIvJIJIJIJIJIJIJIJIJIJIJIJIJIJIJIIvJLJLJLJLJLIvJGJGJGJGIRJmIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaalgJFlilililjlkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIZcZclIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDOiXzmDNHSsXIUPXRUemDHyImZWmDBkWTWTWTWTYGVJzANqQzXPWTWTWTWTCkIvJdIRJGJGJGJGIvJHJHJHJHJHIvJIJIJIJIJIJIJIJIJIJIJIJIJIJIJIIvJLJLJLJLJLIvJGJGJGJGIRJmIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaalBlCJMlEJNlGlHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIZcZcZcZclIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDRITSmDoBpgpgpgpgxOmDZWImZWqRmDoeoeoemDmDqRZTnUmDmDoeoeoemDmDIvJnIRJGJGJGJOIvIvIvIvIvIvIvJPJQJQJRJQJQJRJSJTJQJQJRJQJQJPIvIvIvIvIvIvIvJUJGJGJGIRJrIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaalXlYlilililjlZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZcZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDUzTSPpoBTDNXVSpgoBGtZWImTEZWGZZWZWZWZWGZZWZWZWGZZWZWZWZWGZZWIvIvIvIvIvJGJGJXJGJGJGJGJGIvJZKaKaJGKaKaJGKbJGKaKaJGKaKaKcIvJGJGJGJGJGJXJGJGIvIvIvIvIvIvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaamrmsmtmumvmwmxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalIZcZclIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIlIaaDiQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeQeDiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamDROwnmDqdTYXZoBTYqdmDZWMsImImImImImImImImImImImImImImImImImImImTEMKzAKgJGJGJXJGJGJGJGJGKhJGJGJGJGJGJGJGJGJGJGJGJGJGJGJGKhJGJGJGJGJGJXJGJGKgJGJGJGJGKjKkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/_globalvars/lists/vending.dm b/code/_globalvars/lists/vending.dm index 918aa453..65ee4b99 100644 --- a/code/_globalvars/lists/vending.dm +++ b/code/_globalvars/lists/vending.dm @@ -37,6 +37,7 @@ GLOBAL_VAR_INIT(vending_m_choices, list( "NanoMed" = image(icon = 'icons/obj/vending.dmi', icon_state = "wallmed"), "KinkMate" = image(icon = 'icons/obj/citvending.dmi', icon_state = "kink"), "Meal Vendor" = image(icon = 'icons/obj/vending.dmi', icon_state = "mealdor"), + "GATO Vending Machine" = image(icon = 'icons/obj/vending.dmi', icon_state = "cola_black"), )) // This GLOBAL list is just here to be here. GLOBAL_VAR_INIT(vending_machines, list( @@ -76,5 +77,6 @@ GLOBAL_VAR_INIT(vending_machines, list( /obj/machinery/vending/medical, /obj/machinery/vending/wallmed, /obj/machinery/vending/kink, - /obj/machinery/vending/mealdor + /obj/machinery/vending/mealdor, + /obj/machinery/vending/gato )) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 8ca1d062..65fef58b 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -40,12 +40,6 @@ /obj/machinery/vending/cola/blue icon_state = "Cola_Machine" -/obj/machinery/vending/cola/black - icon_state = "cola_black" - name = "\improper GATO Vending Machine" - desc = "A GATO constructed vending machine, hopefully it can satisfy you." - product_slogans = "Meoow!~ New sodas are now here!!" - /obj/machinery/vending/cola/red icon_state = "red_cola" name = "\improper Space Cola Vendor" diff --git a/tgstation.dme b/tgstation.dme index ab125e01..bb90d4ed 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3072,6 +3072,7 @@ #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" +#include "GainStation13\code\modules\vending\gatocola.dm" #include "GainStation13\code\modules\vending\mealdor.dm" #include "GainStation13\code\obj\structure\scale.dm" #include "hyperstation\code\__DEFINES\economy.dm"