From d56e8aac8a6c7ddba9728453228c7550f85cedbb Mon Sep 17 00:00:00 2001 From: sergeirocks100 <31294280+sergeirocks100@users.noreply.github.com> Date: Tue, 4 Jul 2023 12:44:21 +0000 Subject: [PATCH] Lizard import vendor improvements. (#22043) * initial commit * map * more spellchecking and better commenting * oops * oops * Update imported_vendors.dmi * more repathing --------- Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- .../SpaceRuins/skyrat/interdynefob.dmm | 10 +- .../SpaceRuins/spacehotel_skyrat.dmm | 50 +-- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 304 +++++++++--------- .../machines/machine_circuitboards.dm | 2 +- .../code/vendor_containers.dm | 20 +- .../imported_vendors/code/vendor_food.dm | 74 +++-- .../imported_vendors/code/vendor_snacks.dm | 24 +- .../modules/imported_vendors/code/vendors.dm | 26 +- .../icons/imported_quick_foods.dmi | Bin 10348 -> 10720 bytes .../icons/imported_vendors.dmi | Bin 9003 -> 9002 bytes 10 files changed, 274 insertions(+), 236 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 481e2cdf855..d995872cf0b 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -156,7 +156,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/skyrat/interdynefob/halls) "aB" = ( -/obj/machinery/vending/imported/tizirian, +/obj/machinery/vending/imported/tiziran, /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 8 }, @@ -11243,8 +11243,8 @@ "Xx" = ( /obj/structure/table, /obj/machinery/reagentgrinder{ - pixel_y = 4; - pixel_x = 7 + pixel_x = 7; + pixel_y = 4 }, /obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east, /obj/effect/turf_decal/siding/dark{ @@ -11368,8 +11368,8 @@ /obj/structure/cable, /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ - pixel_y = 4; - pixel_x = -8 + pixel_x = -8; + pixel_y = 4 }, /obj/item/storage/box/beakers{ pixel_x = 8; diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm index 041a425c6d0..98b9cdd0d9e 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm @@ -1390,8 +1390,8 @@ pixel_y = -9 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = -7; - pixel_x = 10 + pixel_x = 10; + pixel_y = -7 }, /obj/machinery/button/door{ id = "HotelRoom5"; @@ -1550,12 +1550,12 @@ pixel_x = -7 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = 9; - pixel_x = -7 + pixel_x = -7; + pixel_y = 9 }, /obj/item/reagent_containers/cup/glass/mug/nanotrasen{ - pixel_y = 10; - pixel_x = 6 + pixel_x = 6; + pixel_y = 10 }, /obj/machinery/button/door{ id = "HotelRoom3"; @@ -1589,8 +1589,8 @@ "ii" = ( /obj/structure/sink/directional/east, /obj/structure/mirror{ - pixel_y = -3; - pixel_x = -31 + pixel_x = -31; + pixel_y = -3 }, /turf/open/indestructible/hoteltile, /area/ruin/space/has_grav/hotel/guestroom/room_3) @@ -2846,8 +2846,8 @@ /obj/item/bedsheet/random/double, /obj/machinery/button/curtain{ id = "HotelRoom2Curtains"; - pixel_y = 1; - pixel_x = 22 + pixel_x = 22; + pixel_y = 1 }, /turf/open/floor/carpet/neon/simple/pink/nodots, /area/ruin/space/has_grav/hotel/guestroom/room_2) @@ -3096,8 +3096,8 @@ /area/ruin/space/has_grav/hotel/guestroom/room_1) "pc" = ( /mob/living/basic/bat{ - name = "Fronk"; - desc = "Fronk's the beloved space bat of the space hotel, if found make sure to return him!" + desc = "Fronk's the beloved space bat of the space hotel, if found make sure to return him!"; + name = "Fronk" }, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/workroom) @@ -4023,8 +4023,8 @@ pixel_y = 12 }, /obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled{ - pixel_y = 9; - pixel_x = 6 + pixel_x = 6; + pixel_y = 9 }, /obj/machinery/light{ dir = 8 @@ -4707,15 +4707,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/wood, /obj/item/coffee_cartridge/fancy{ - pixel_y = 9; - pixel_x = -7 + pixel_x = -7; + pixel_y = 9 }, /obj/item/coffee_cartridge/decaf{ pixel_x = -7 }, /obj/item/reagent_containers/cup/glass/mug/nanotrasen{ - pixel_y = 10; - pixel_x = 6 + pixel_x = 6; + pixel_y = 10 }, /turf/open/floor/carpet/neon/simple/pink/nodots, /area/ruin/space/has_grav/hotel/guestroom/room_2) @@ -5423,7 +5423,7 @@ /turf/open/floor/carpet, /area/ruin/space/has_grav/hotel) "ET" = ( -/obj/machinery/vending/imported/tizirian, +/obj/machinery/vending/imported/tiziran, /obj/effect/turf_decal/siding/dark{ dir = 1 }, @@ -6528,8 +6528,8 @@ pixel_x = -7 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = 9; - pixel_x = -7 + pixel_x = -7; + pixel_y = 9 }, /turf/open/floor/wood/large, /area/ruin/space/has_grav/hotel/guestroom/room_4) @@ -6575,8 +6575,8 @@ pixel_y = -9 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = -7; - pixel_x = 10 + pixel_x = 10; + pixel_y = -7 }, /obj/machinery/button/door{ id = "HotelRoom6"; @@ -8015,8 +8015,8 @@ pixel_y = -9 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = -7; - pixel_x = 10 + pixel_x = 10; + pixel_y = -7 }, /turf/open/floor/carpet/neon/simple/white/nodots, /area/ruin/space/has_grav/hotel/guestroom) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index b4552b0b626..555e13087e0 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -70,8 +70,8 @@ "aeG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/indestructible{ - name = "Nanotrasen Consultant's Shutters"; - id = "ntrep_shutters" + id = "ntrep_shutters"; + name = "Nanotrasen Consultant's Shutters" }, /turf/open/floor/plating, /area/centcom/interlink) @@ -3376,9 +3376,9 @@ dir = 10 }, /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Bar Shutter Control"; id = "il_bar"; + name = "Bar Shutter Control"; + pixel_y = -8; req_access = list("bar") }, /turf/open/floor/iron/dark, @@ -4309,8 +4309,8 @@ "bae" = ( /obj/structure/table, /obj/machinery/computer/libraryconsole{ - pixel_y = 6; - dir = 1 + dir = 1; + pixel_y = 6 }, /turf/open/floor/iron, /area/centcom/interlink) @@ -4730,8 +4730,8 @@ /area/centcom/holding/cafedorms) "bVH" = ( /obj/machinery/door/poddoor/shutters/window/indestructible{ - name = "Windowed Interlink Access Shutters"; - id = "interlink_hall" + id = "interlink_hall"; + name = "Windowed Interlink Access Shutters" }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron, @@ -4746,9 +4746,9 @@ /area/centcom/interlink) "bWy" = ( /obj/machinery/button/door/directional/east{ - pixel_y = -8; id = "arr_hall_lookout"; name = "Lookout Shutters Control"; + pixel_y = -8; req_access = list("command") }, /turf/open/floor/iron/dark, @@ -4780,11 +4780,11 @@ }, /obj/item/kirbyplants/random, /obj/machinery/button/door/directional/south{ - pixel_x = -8; + id = "room4"; name = "Door Lock"; normaldoorcontrol = 1; - specialfunctions = 4; - id = "room4" + pixel_x = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -5062,8 +5062,8 @@ "cMs" = ( /obj/structure/table/wood, /obj/item/stamp/centcom{ - pixel_y = 10; - pixel_x = -8 + pixel_x = -8; + pixel_y = 10 }, /obj/item/stamp{ pixel_y = 10 @@ -5407,8 +5407,8 @@ /area/centcom/interlink) "dFF" = ( /obj/structure/sign/directions/security{ - pixel_y = -8; - dir = 8 + dir = 8; + pixel_y = -8 }, /obj/structure/sign/directions/medical, /obj/structure/sign/directions/arrival{ @@ -5473,8 +5473,8 @@ /area/cruiser_dock) "dPd" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Locker Room"; - dir = 4 + dir = 4; + name = "Interlink Locker Room" }, /turf/open/floor/iron, /area/centcom/interlink) @@ -5661,9 +5661,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/vending/imported{ default_price = 0; + extended_inventory = 1; extra_price = 0; - fair_market_price = 0; - extended_inventory = 1 + fair_market_price = 0 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -5778,10 +5778,10 @@ dir = 1 }, /obj/machinery/button/door/directional/south{ - normaldoorcontrol = 1; - specialfunctions = 4; + id = "stall1"; name = "Door Lock"; - id = "stall1" + normaldoorcontrol = 1; + specialfunctions = 4 }, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, @@ -5803,8 +5803,8 @@ pixel_y = 5 }, /obj/item/folder/yellow{ - pixel_y = 3; - pixel_x = -5 + pixel_x = -5; + pixel_y = 3 }, /obj/item/stamp{ pixel_x = 8; @@ -5992,8 +5992,8 @@ pixel_y = 6 }, /obj/item/paper/crumpled{ - pixel_y = -4; - pixel_x = -2 + pixel_x = -2; + pixel_y = -4 }, /obj/item/paper/crumpled, /obj/effect/turf_decal/tile/green/opposingcorners, @@ -6032,8 +6032,8 @@ /area/centcom/interlink) "fua" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Longue"; - dir = 8 + dir = 8; + name = "Interlink Longue" }, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -6280,8 +6280,8 @@ /area/centcom/holding/cafepark) "gfW" = ( /obj/structure/sign/directions/security{ - pixel_y = -8; - dir = 8 + dir = 8; + pixel_y = -8 }, /obj/structure/sign/directions/medical, /obj/structure/sign/directions/arrival{ @@ -6321,8 +6321,8 @@ "gjK" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/indestructible{ - name = "Interlink Bar Shutters"; - id = "il_bar" + id = "il_bar"; + name = "Interlink Bar Shutters" }, /turf/open/floor/iron/dark, /area/centcom/interlink) @@ -6427,11 +6427,11 @@ dir = 8 }, /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Door Lock"; id = "room5"; - specialfunctions = 4; - normaldoorcontrol = 1 + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_y = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -6511,8 +6511,8 @@ name = "Jim Norton's Quebecois Coffee table" }, /obj/item/reagent_containers/condiment/sugar{ - pixel_y = 4; - pixel_x = -4 + pixel_x = -4; + pixel_y = 4 }, /obj/item/reagent_containers/condiment/sugar{ pixel_y = 4 @@ -6887,8 +6887,8 @@ pixel_y = 7 }, /obj/item/folder/blue{ - pixel_y = -2; - pixel_x = -9 + pixel_x = -9; + pixel_y = -2 }, /obj/item/pen/blue{ pixel_x = 3; @@ -7172,8 +7172,8 @@ /area/centcom/holding/cafepark) "iwK" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Cafe"; - dir = 4 + dir = 4; + name = "Interlink Cafe" }, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -7415,8 +7415,8 @@ "iZr" = ( /obj/structure/table/wood, /obj/machinery/reagentgrinder{ - pixel_y = 8; - pixel_x = -2 + pixel_x = -2; + pixel_y = 8 }, /obj/structure/sign/poster/contraband/pwr_game/directional/north, /obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz{ @@ -7499,9 +7499,9 @@ /area/centcom/interlink) "jnu" = ( /obj/machinery/button/door/directional/east{ - pixel_y = -8; id = "interlink_hall2"; name = "Arrivals Hall Shutter Control"; + pixel_y = -8; req_access = list("security") }, /obj/structure/closet/crate/bin, @@ -7521,9 +7521,9 @@ }, /obj/machinery/light/cold/directional/east, /obj/machinery/button/door/directional/east{ - pixel_y = 8; id = "arriv_hall"; name = "Arrivals Access Shutter Control"; + pixel_y = 8; req_access = list("security") }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -7673,8 +7673,8 @@ pixel_y = -8 }, /obj/structure/sign/directions/dorms{ - pixel_y = 8; - dir = 4 + dir = 4; + pixel_y = 8 }, /turf/closed/indestructible/riveted, /area/centcom/interlink) @@ -7683,8 +7683,8 @@ dir = 4 }, /obj/structure/chair/sofa/bench/right{ - greyscale_colors = "#AA8A61"; - dir = 1 + dir = 1; + greyscale_colors = "#AA8A61" }, /obj/machinery/light/warm/directional/south, /turf/open/floor/wood, @@ -7763,8 +7763,8 @@ "jUm" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box{ - pixel_y = 10; - pixel_x = 2 + pixel_x = 2; + pixel_y = 10 }, /obj/item/storage/fancy/donut_box{ pixel_x = -4; @@ -7806,9 +7806,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/vending/imported/mothic{ default_price = 0; + extended_inventory = 1; extra_price = 0; - fair_market_price = 0; - extended_inventory = 1 + fair_market_price = 0 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -7850,9 +7850,9 @@ /area/centcom/interlink) "khC" = ( /obj/machinery/button/door/directional/north{ - pixel_x = -8; - name = "Kitchen Shutter Control"; id = "il_kitchen"; + name = "Kitchen Shutter Control"; + pixel_x = -8; req_access = list("kitchen") }, /turf/open/floor/iron/cafeteria, @@ -7876,8 +7876,8 @@ height = 50; json_key = "emergency"; name = "CentCom Emergency Shuttle Dock"; - width = 50; - shuttle_id = "emergency_away" + shuttle_id = "emergency_away"; + width = 50 }, /turf/open/space/basic, /area/space) @@ -7941,8 +7941,8 @@ "kqK" = ( /obj/structure/table/wood, /obj/machinery/fax{ - pixel_y = 5; - fax_name = "Interlink Meeting Room" + fax_name = "Interlink Meeting Room"; + pixel_y = 5 }, /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -8506,9 +8506,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/vending/imported/yangyu{ default_price = 0; + extended_inventory = 1; extra_price = 0; - fair_market_price = 0; - extended_inventory = 1 + fair_market_price = 0 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -8599,8 +8599,8 @@ name = "Coffee Counter" }, /obj/item/reagent_containers/cup/glass/coffee_cup{ - pixel_y = 12; - pixel_x = -5 + pixel_x = -5; + pixel_y = 12 }, /obj/item/reagent_containers/cup/glass/coffee_cup{ pixel_y = 4 @@ -8694,11 +8694,11 @@ dir = 8 }, /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Door Lock"; id = "room8"; - specialfunctions = 4; - normaldoorcontrol = 1 + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_y = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -8909,11 +8909,11 @@ }, /obj/item/kirbyplants/random, /obj/machinery/button/door/directional/south{ - pixel_x = -8; + id = "room3"; name = "Door Lock"; normaldoorcontrol = 1; - specialfunctions = 4; - id = "room3" + pixel_x = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -9156,9 +9156,9 @@ "nHC" = ( /obj/machinery/photocopier, /obj/machinery/button/door/directional/south{ - pixel_x = 8; id = "bs_shutters"; name = "Privacy Shutter Comtrol"; + pixel_x = 8; req_access = list("command") }, /obj/effect/turf_decal/bot, @@ -9224,8 +9224,8 @@ pixel_y = 8 }, /obj/item/folder/blue{ - pixel_y = 5; - pixel_x = 4 + pixel_x = 4; + pixel_y = 5 }, /obj/item/folder/yellow, /obj/item/stamp{ @@ -9439,11 +9439,11 @@ }, /obj/item/kirbyplants/random, /obj/machinery/button/door/directional/south{ - pixel_x = -8; + id = "room1"; name = "Door Lock"; normaldoorcontrol = 1; - specialfunctions = 4; - id = "room1" + pixel_x = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -9676,15 +9676,15 @@ "oYa" = ( /obj/structure/chair/office, /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Evac Hall Shutter Control"; id = "interlink_hall"; + name = "Evac Hall Shutter Control"; + pixel_y = -8; req_access = list("security") }, /obj/machinery/button/door/directional/west{ - pixel_y = 8; - name = "Evac Access Shutter Control"; id = "evac_hall"; + name = "Evac Access Shutter Control"; + pixel_y = 8; req_access = list("security") }, /obj/machinery/light/cold/directional/west, @@ -9921,9 +9921,9 @@ name = "Administrative Offices" }, /obj/machinery/button/door/directional/west{ - pixel_y = -8; id = "evac_hall_lookout"; name = "Lookout Shutters Control"; + pixel_y = -8; req_access = list("command") }, /obj/effect/turf_decal/trimline/dark_green/corner{ @@ -10064,8 +10064,8 @@ height = 13; name = "tram dock"; roundstart_template = /datum/map_template/shuttle/arrivals_skyrat; - width = 5; - shuttle_id = "arrivals_shuttle" + shuttle_id = "arrivals_shuttle"; + width = 5 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -10152,10 +10152,10 @@ dir = 1 }, /obj/machinery/button/door/directional/south{ - normaldoorcontrol = 1; - specialfunctions = 4; + id = "stall2"; name = "Door Lock"; - id = "stall2" + normaldoorcontrol = 1; + specialfunctions = 4 }, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, @@ -10181,9 +10181,9 @@ "pVh" = ( /obj/machinery/photocopier, /obj/machinery/button/door/directional/north{ - pixel_x = 8; - name = "Privacy Shutter Comtrol"; id = "ntrep_shutters"; + name = "Privacy Shutter Comtrol"; + pixel_x = 8; req_access = list("command") }, /obj/effect/turf_decal/bot, @@ -10198,9 +10198,9 @@ /area/centcom/interlink) "pXn" = ( /obj/machinery/button/door/directional/east{ - pixel_y = -8; id = "evac_hall_lookout"; name = "Lookout Shutters Control"; + pixel_y = -8; req_access = list("command") }, /turf/open/floor/iron/dark, @@ -10572,8 +10572,8 @@ dir = 8 }, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Cafe"; - dir = 4 + dir = 4; + name = "Interlink Cafe" }, /turf/open/floor/wood/parquet, /area/centcom/interlink) @@ -10652,8 +10652,8 @@ "rbo" = ( /obj/structure/table, /obj/machinery/microwave{ - pixel_y = 7; - pixel_x = -2 + pixel_x = -2; + pixel_y = 7 }, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) @@ -10680,9 +10680,9 @@ dir = 8; dwidth = 17; height = 13; - shuttle_id = "goldeneye_cruiser_dock"; name = "Goldeneye Satellite Dock"; roundstart_template = /datum/map_template/shuttle/goldeneye_cruiser; + shuttle_id = "goldeneye_cruiser_dock"; width = 27 }, /turf/open/floor/plating, @@ -10693,8 +10693,8 @@ pixel_y = 7 }, /obj/item/folder/yellow{ - pixel_y = 3; - pixel_x = -5 + pixel_x = -5; + pixel_y = 3 }, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, @@ -10719,11 +10719,11 @@ dir = 8 }, /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Door Lock"; id = "room7"; - specialfunctions = 4; - normaldoorcontrol = 1 + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_y = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -10771,8 +10771,8 @@ /area/centcom/holding/cafe) "rAe" = ( /obj/structure/chair/sofa/bench/left{ - greyscale_colors = "#AA8A61"; - dir = 1 + dir = 1; + greyscale_colors = "#AA8A61" }, /turf/open/floor/wood, /area/centcom/interlink) @@ -10797,8 +10797,8 @@ /area/centcom/interlink) "rGI" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Aux Garden"; - dir = 4 + dir = 4; + name = "Interlink Aux Garden" }, /obj/effect/turf_decal/siding/white{ dir = 4 @@ -11019,8 +11019,8 @@ dir = 1 }, /obj/structure/sign/directions/dorms{ - pixel_y = 8; - dir = 4 + dir = 4; + pixel_y = 8 }, /turf/closed/indestructible/riveted, /area/centcom/interlink) @@ -11461,8 +11461,8 @@ "tdP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/indestructible{ - name = "BlueShields Shutters"; - id = "bs_shutters" + id = "bs_shutters"; + name = "BlueShields Shutters" }, /turf/open/floor/plating, /area/centcom/interlink) @@ -11725,11 +11725,11 @@ }, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light, -/obj/machinery/vending/imported/tizirian{ +/obj/machinery/vending/imported/tiziran{ default_price = 0; + extended_inventory = 1; extra_price = 0; - fair_market_price = 0; - extended_inventory = 1 + fair_market_price = 0 }, /turf/open/indestructible/hoteltile{ icon_state = "floor" @@ -11828,15 +11828,15 @@ "ucr" = ( /obj/structure/chair/office, /obj/machinery/button/door/directional/east{ - pixel_y = -8; id = "interlink_hall"; name = "Evac Hall Shutter Control"; + pixel_y = -8; req_access = list("security") }, /obj/machinery/button/door/directional/east{ - pixel_y = 8; id = "evac_hall"; name = "Evac Access Shutter Control"; + pixel_y = 8; req_access = list("security") }, /obj/machinery/light/cold/directional/east, @@ -11922,8 +11922,8 @@ /area/centcom/holding/cafe) "uji" = ( /obj/machinery/door/poddoor/shutters/window/indestructible{ - name = "Windowed Interlink Access Shutters"; - id = "interlink_hall2" + id = "interlink_hall2"; + name = "Windowed Interlink Access Shutters" }, /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron, @@ -12042,11 +12042,11 @@ }, /obj/item/kirbyplants/random, /obj/machinery/button/door/directional/south{ - pixel_x = -8; + id = "room2"; name = "Door Lock"; normaldoorcontrol = 1; - specialfunctions = 4; - id = "room2" + pixel_x = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -12067,8 +12067,8 @@ "uFG" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/indestructible{ - name = "Interlink Kitchen Shutters"; - id = "il_kitchen" + id = "il_kitchen"; + name = "Interlink Kitchen Shutters" }, /turf/open/floor/iron/cafeteria, /area/centcom/interlink) @@ -12082,8 +12082,8 @@ "uGU" = ( /obj/structure/table, /obj/machinery/microwave{ - pixel_y = 6; - pixel_x = -2 + pixel_x = -2; + pixel_y = 6 }, /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, @@ -12204,16 +12204,16 @@ pixel_y = -1 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = 8; - pixel_x = -5 + pixel_x = -5; + pixel_y = 8 }, /obj/item/coffee_cartridge/fancy{ - pixel_y = 3; - pixel_x = 2 + pixel_x = 2; + pixel_y = 3 }, /obj/item/reagent_containers/cup/coffeepot{ - pixel_y = 20; - pixel_x = 5 + pixel_x = 5; + pixel_y = 20 }, /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/dark/textured_large, @@ -12352,11 +12352,11 @@ dir = 8 }, /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Door Lock"; id = "room6"; - specialfunctions = 4; - normaldoorcontrol = 1 + name = "Door Lock"; + normaldoorcontrol = 1; + pixel_y = -8; + specialfunctions = 4 }, /turf/open/floor/wood, /area/centcom/interlink) @@ -12453,9 +12453,9 @@ /area/centcom/interlink) "vLt" = ( /obj/structure/closet/crate/cardboard/tiziran, -/obj/item/storage/box/foodpack/tiziria/roll, -/obj/item/storage/box/foodpack/tiziria/roll, -/obj/item/storage/box/foodpack/tiziria/stir_fry, +/obj/item/storage/box/foodpack/tizira/roll, +/obj/item/storage/box/foodpack/tizira/roll, +/obj/item/storage/box/foodpack/tizira/stir_fry, /obj/item/storage/box/tiziran_meats, /turf/open/floor/iron/dark/textured_large, /area/cruiser_dock) @@ -12464,8 +12464,8 @@ /area/centcom/interlink) "vLY" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Bar"; - dir = 4 + dir = 4; + name = "Interlink Bar" }, /obj/effect/turf_decal/trimline/green/corner{ dir = 8 @@ -12483,8 +12483,8 @@ /area/centcom/holding/cafepark) "vRf" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Interlink Garden"; - dir = 4 + dir = 4; + name = "Interlink Garden" }, /obj/effect/turf_decal/trimline/green/arrow_ccw, /obj/effect/turf_decal/siding/white{ @@ -12711,8 +12711,8 @@ pixel_y = 2 }, /obj/item/pen{ - pixel_y = 10; - pixel_x = 6 + pixel_x = 6; + pixel_y = 10 }, /turf/open/floor/carpet/executive, /area/centcom/interlink) @@ -12739,8 +12739,8 @@ /area/centcom/interlink) "wyF" = ( /obj/structure/sign/directions/security{ - pixel_y = -8; - dir = 8 + dir = 8; + pixel_y = -8 }, /obj/structure/sign/directions/medical{ dir = 8 @@ -13270,16 +13270,16 @@ /area/centcom/interlink) "xVv" = ( /obj/machinery/button/door/directional/west{ - pixel_y = -8; - name = "Arrivals Hall Shutter Control"; id = "interlink_hall2"; + name = "Arrivals Hall Shutter Control"; + pixel_y = -8; req_access = list("security") }, /obj/machinery/light/cold/directional/west, /obj/machinery/button/door/directional/west{ - pixel_y = 8; - name = "Arrivals Access Shutter Control"; id = "arriv_hall"; + name = "Arrivals Access Shutter Control"; + pixel_y = 8; req_access = list("security") }, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -13288,10 +13288,10 @@ "xVV" = ( /obj/machinery/recharge_station, /obj/machinery/button/door/directional/south{ - normaldoorcontrol = 1; - specialfunctions = 4; + id = "stall3"; name = "Door Lock"; - id = "stall3" + normaldoorcontrol = 1; + specialfunctions = 4 }, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 9f329d2b791..fbbf5d37021 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -658,7 +658,7 @@ /obj/machinery/vending/imported = "NT Sustenance Supplier", //SKYRAT EDIT ADDITION /obj/machinery/vending/imported/yangyu = "Fudobenda", //SKYRAT EDIT ADDITION /obj/machinery/vending/imported/mothic = "Nomad Fleet Ration Chit Exchange", //SKYRAT EDIT ADDITION - /obj/machinery/vending/imported/tizirian = "Tizirian Imported Delicacies",) //SKYRAT EDIT ADDITION + /obj/machinery/vending/imported/tiziran = "Tiziran Imported Delicacies",) //SKYRAT EDIT ADDITION /obj/item/circuitboard/machine/vendor/screwdriver_act(mob/living/user, obj/item/tool) var/static/list/display_vending_names_paths diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm b/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm index b4ed2db1098..9a9a34a34c8 100644 --- a/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm +++ b/modular_skyrat/modules/imported_vendors/code/vendor_containers.dm @@ -66,24 +66,24 @@ name = "\improper Ration Type M - Fueljack's Feast" main_course = /obj/item/food/vendor_tray_meal/fueljack -/obj/item/storage/box/foodpack/tiziria - name = "\improper Tiziria Imports Pack - Moonfish Nizaya" - desc = "A dull, metal foil package with the colors of the tizirian flag striped across it, as well as a stamp of legitimate origin from the Tizirian exports office." +/obj/item/storage/box/foodpack/tizira + name = "\improper Tizira Imports Pack - Moonfish Nizaya" + desc = "A dull, metal foil package with the colors of the Tiziran flag striped across it, as well as a stamp of legitimate origin from the Tiziran exports office." icon_state = "foodpack_tizira_big" main_course = /obj/item/food/vendor_tray_meal/moonfish_nizaya - side_item = /obj/effect/spawner/random/vendor_meal_sides/tiziria + side_item = /obj/effect/spawner/random/vendor_meal_sides/tizira condiment_pack = /obj/item/reagent_containers/condiment/pack/bbqsauce - custom_price = PAYCHECK_CREW * 2 //Tizirian imports are a bit more expensive + custom_price = PAYCHECK_CREW * 2 //Tiziran imports are a bit more expensive -/obj/item/storage/box/foodpack/tiziria/examine_more(mob/user) +/obj/item/storage/box/foodpack/tizira/examine_more(mob/user) . = ..() . += span_notice("Now that you look at it, the origin stamp appears to be a poor imitation of the real thing!") return . -/obj/item/storage/box/foodpack/tiziria/roll - name = "\improper Tiziria Imports Pack - Emperor Roll" +/obj/item/storage/box/foodpack/tizira/roll + name = "\improper Tizira Imports Pack - Emperor Roll" main_course = /obj/item/food/vendor_tray_meal/emperor_roll -/obj/item/storage/box/foodpack/tiziria/stir_fry - name = "\improper Tiziria Imports Pack - Mushroom Stirfry" +/obj/item/storage/box/foodpack/tizira/stir_fry + name = "\improper Tizira Imports Pack - Mushroom Stirfry" main_course = /obj/item/food/vendor_tray_meal/mushroom_fry diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm index ed966102f15..011b494936e 100644 --- a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm +++ b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm @@ -1,5 +1,7 @@ // Packaged whole meals and sides for the 'meals' tab of vendors +/* TRASH */ + /obj/item/trash/empty_food_tray name = "empty plastic food tray" desc = "The condensation and what you can only hope are the leftovers of food make this a bit hard to reuse." @@ -23,8 +25,14 @@ /obj/item/trash/empty_side_pack/moth icon_state = "foodpack_moth_trash" -/obj/item/trash/empty_side_pack/tiziria - icon_state = "foodpack_tiziria_trash" +/obj/item/trash/empty_side_pack/tizira + icon_state = "foodpack_tizira_trash" + +/* MEALS */ + +/* +* NT Meals +*/ /obj/item/food/vendor_tray_meal name = "\improper NT-Meal: Steak and Macaroni" @@ -67,6 +75,10 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 10) tastes = list("bread" = 2, "chicken?" = 2, "overwhelming spice" = 2, "laziness" = 1) foodtypes = MEAT | GRAIN | DAIRY + +/* +* Yangyu Meals +*/ /obj/item/food/vendor_tray_meal/ramen name = "\improper Meinkosu: Homestyle Noodles" @@ -89,6 +101,10 @@ tastes = list("cheap beef" = 1, "rice" = 3, "laziness" = 1) foodtypes = GRAIN | MEAT +/* +* Mothic Meals +*/ + /obj/item/food/vendor_tray_meal/pesto_pizza name = "\improper Main Course - Type M: Pesto Pizza" desc = "A rectangular pizza with a suspiciously bright green pesto in place of the standard tomato sauce." @@ -109,32 +125,42 @@ icon_state = "foodtray_fuel_jacks_meal" tastes = list("potato" = 2, "cabbage" = 2, "cheese?" = 2, "laziness" = 1) foodtypes = DAIRY | VEGETABLES + +/* +* Tiziran Meals +*/ /obj/item/food/vendor_tray_meal/moonfish_nizaya - name = "\improper Tiziria Imports: Moonfish and Nizaya" + name = "\improper Tizira Imports: Moonfish and Nizaya" desc = "An almost synthetic looking cut of moonfish, paired with an equal helping of nizaya pasta." icon_state = "foodtray_moonfish_nizaya" tastes = list("fish?" = 2, "cheap noodles" = 2, "laziness" = 1) foodtypes = VEGETABLES | NUTS | SEAFOOD /obj/item/food/vendor_tray_meal/emperor_roll - name = "\improper Tiziria Imports: Emperor Roll" + name = "\improper Tizira Imports: Emperor Roll" desc = "A pretty sad looking emperor roll, if you can even call it that; it seems caviar wasn't in the budget." icon_state = "foodtray_emperor_roll" tastes = list("bread" = 2, "cheese?" = 2, "liver?" = 2, "laziness" = 1) - foodtypes = VEGETABLES | NUTS | DAIRY | MEAT | GORE + foodtypes = VEGETABLES | NUTS | MEAT | GORE /obj/item/food/vendor_tray_meal/mushroom_fry - name = "\improper Tiziria Imports: Mushroom Stirfry" + name = "\improper Tizira Imports: Mushroom Stirfry" desc = "A mix of what was likely mushrooms too low quality to be used in making actual food, lightly fried and tossed in a plastic container together." icon_state = "foodtray_shroom_fry" tastes = list("mushroom" = 4, "becoming rich" = 1, "laziness" = 1) foodtypes = VEGETABLES +/* SIDES */ + /obj/effect/spawner/random/vendor_meal_sides name = "random side spawner" desc = "I hope I get one that actually matches my meal." icon_state = "loot" + +/* +* NT Sides +*/ /obj/effect/spawner/random/vendor_meal_sides/nt name = "random nt side spawner" @@ -169,6 +195,10 @@ desc = "A small stack of tough flatbread, and a small spread of cheese for each." tastes = list("tough bread" = 2, "cheese" = 2) foodtypes = GRAIN | DAIRY + +/* +* Yangyu Sides +*/ /obj/effect/spawner/random/vendor_meal_sides/yangyu name = "random yangyu side spawner" @@ -204,6 +234,10 @@ trash_type = /obj/item/trash/empty_side_pack/yangyu tastes = list("vinegar" = 4) foodtypes = VEGETABLES + +/* +* Mothic Sides +*/ /obj/effect/spawner/random/vendor_meal_sides/moth name = "random mothic side spawner" @@ -239,11 +273,15 @@ trash_type = /obj/item/trash/empty_side_pack/moth tastes = list("seeds" = 2, "char" = 2) foodtypes = NUTS + +/* +* Tiziran Sides +*/ -/obj/effect/spawner/random/vendor_meal_sides/tiziria - name = "random tizirian side spawner" +/obj/effect/spawner/random/vendor_meal_sides/tizira + name = "random tiziran side spawner" -/obj/effect/spawner/random/vendor_meal_sides/tiziria/Initialize(mapload) +/obj/effect/spawner/random/vendor_meal_sides/tizira/Initialize(mapload) loot = list( /obj/item/food/vendor_tray_meal/side/root_crackers, /obj/item/food/vendor_tray_meal/side/korta_brittle, @@ -252,25 +290,25 @@ . = ..() /obj/item/food/vendor_tray_meal/side/root_crackers - name = "\improper Tiziria Imports: Rootbread Crackers and Pate" + name = "\improper Tizira Imports: Rootbread Crackers and Pate" desc = "A small stack of rootbread crackers, with a small spread of meat pate for each." - icon_state = "foodpack_tiziria" - trash_type = /obj/item/trash/empty_side_pack/tiziria + icon_state = "foodpack_tizira" + trash_type = /obj/item/trash/empty_side_pack/tizira tastes = list("tough rootbread" = 2, "pate" = 2) foodtypes = VEGETABLES | NUTS | MEAT /obj/item/food/vendor_tray_meal/side/korta_brittle - name = "\improper Tiziria Imports: Korta Brittle" + name = "\improper Tizira Imports: Korta Brittle" desc = "A perfectly rectangular portion of unsweetened korta brittle." - icon_state = "foodpack_tiziria" - trash_type = /obj/item/trash/empty_side_pack/tiziria + icon_state = "foodpack_tizira" + trash_type = /obj/item/trash/empty_side_pack/tizira tastes = list("peppery heat" = 2) foodtypes = NUTS /obj/item/food/vendor_tray_meal/side/crispy_headcheese - name = "\improper Tiziria Imports: Crisped Headcheese" + name = "\improper Tizira Imports: Crisped Headcheese" desc = "A processed looking block of breaded headcheese." - icon_state = "foodpack_tiziria" - trash_type = /obj/item/trash/empty_side_pack/tiziria + icon_state = "foodpack_tizira" + trash_type = /obj/item/trash/empty_side_pack/tizira tastes = list("cheese" = 1, "oil" = 1) foodtypes = MEAT | VEGETABLES | NUTS | GORE diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm b/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm index 0ca9cecb174..38de344ec4d 100644 --- a/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm +++ b/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm @@ -22,7 +22,7 @@ custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT) /* -* "Yangyu" Snacks +* Yangyu Snacks */ /obj/item/reagent_containers/cup/glass/dry_ramen/prepared @@ -231,7 +231,7 @@ return . /* -* Lizard Snacks +* Tiziran Snacks */ /obj/item/food/vendor_snacks/lizard_bag @@ -242,7 +242,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/caramel = 2) tastes = list("savouriness" = 1, "sweetness" = 1) foodtypes = SUGAR | VEGETABLES - custom_price = PAYCHECK_LOWER * 1.4 //Tizirian imports are a bit more expensive overall + custom_price = PAYCHECK_LOWER * 1.4 //Tiziran imports are a bit more expensive overall /obj/item/food/vendor_snacks/lizard_bag/make_leave_trash() AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_POPABLE) @@ -257,13 +257,13 @@ custom_price = PAYCHECK_LOWER * 1.6 /obj/item/trash/vendor_trash/lizard_bag - name = "empty tizirian snack bag" - desc = "All that money importing tizirian snacks just to end at this?" - icon_state = "tiziria_bag_trash" + name = "empty tiziran snack bag" + desc = "All that money importing tiziran snacks just to end at this?" + icon_state = "tizira_bag_trash" /obj/item/food/vendor_snacks/lizard_box - name = "tizirian dumplings" - desc = "A three pack of tizirian style dumplings, not actually stuffed with anything." + name = "tiziran dumplings" + desc = "A three pack of tiziran style dumplings, not actually stuffed with anything." icon_state = "dumpling" trash_type = /obj/item/trash/vendor_trash/lizard_box food_reagents = list(/datum/reagent/consumable/nutriment = 3) @@ -281,13 +281,13 @@ custom_price = PAYCHECK_LOWER *1.8 /obj/item/trash/vendor_trash/lizard_box - name = "empty tizirian snack box" - desc = "Tiziria, contributing to the space plastic crisis since 2530." - icon_state = "tiziria_box_trash" + name = "empty tiziran snack box" + desc = "Tizira, contributing to the space plastic crisis since 2530." + icon_state = "tizira_box_trash" /obj/item/reagent_containers/cup/glass/waterbottle/tea/mushroom name = "bottle of mushroom tea" - desc = "A bottle of somewhat bitter mushroom tea, a favorite of the Tizirian empire." + desc = "A bottle of somewhat bitter mushroom tea, a favorite of the Tiziran empire." icon_state = "tea_bottle_grey" list_reagents = list(/datum/reagent/consumable/mushroom_tea = 40) custom_price = PAYCHECK_LOWER * 2 diff --git a/modular_skyrat/modules/imported_vendors/code/vendors.dm b/modular_skyrat/modules/imported_vendors/code/vendors.dm index 007afeabb62..f4504dd041c 100644 --- a/modular_skyrat/modules/imported_vendors/code/vendors.dm +++ b/modular_skyrat/modules/imported_vendors/code/vendors.dm @@ -3,7 +3,7 @@ /obj/machinery/vending/imported, /obj/machinery/vending/imported/yangyu, /obj/machinery/vending/imported/mothic, - /obj/machinery/vending/imported/tizirian, + /obj/machinery/vending/imported/tiziran, ) /obj/effect/spawner/random/vending/colavend //These can serve both snacks AND drinks so its kinda both of them? @@ -11,7 +11,7 @@ /obj/machinery/vending/imported, /obj/machinery/vending/imported/yangyu, /obj/machinery/vending/imported/mothic, - /obj/machinery/vending/imported/tizirian, + /obj/machinery/vending/imported/tiziran, ) /datum/supply_pack/vending/imported/fill(obj/structure/closet/crate/target_crate) @@ -173,11 +173,11 @@ /obj/item/vending_refill/snack/imported/mothic machine_name = "Nomad Fleet Ration Chit Exchange" -/obj/machinery/vending/imported/tizirian - name = "Tizirian Imported Delicacies" - desc = "A vendor serving a fine collection of what is very likely knock-offs of popular Tizirian brands." - icon_state = "tiziria_food" - light_mask = "tiziria_food-light-mask" +/obj/machinery/vending/imported/tiziran + name = "Tiziran Imported Delicacies" + desc = "A vendor serving a fine collection of what is very likely knock-offs of popular Tiziran brands." + icon_state = "tizira_food" + light_mask = "tizira_food-light-mask" light_color = LIGHT_COLOR_FIRE product_slogans = "Real imports from the capital itself, we promise!;Rare selections of salt water catch!;Moonfish glaze included with all meat options!" product_categories = list( @@ -199,9 +199,9 @@ "name" = "Meals", "icon" = "pizza-slice", "products" = list( - /obj/item/storage/box/foodpack/tiziria = 6, - /obj/item/storage/box/foodpack/tiziria/roll = 6, - /obj/item/storage/box/foodpack/tiziria/stir_fry = 6, + /obj/item/storage/box/foodpack/tizira = 6, + /obj/item/storage/box/foodpack/tizira/roll = 6, + /obj/item/storage/box/foodpack/tizira/stir_fry = 6, /obj/item/food/vendor_tray_meal/side/root_crackers = 6, /obj/item/food/vendor_tray_meal/side/korta_brittle = 6, /obj/item/food/vendor_tray_meal/side/crispy_headcheese = 6, @@ -209,7 +209,7 @@ ), ) - refill_canister = /obj/item/vending_refill/snack/imported/tizirian + refill_canister = /obj/item/vending_refill/snack/imported/tiziran initial_language_holder = /datum/language_holder/draconic_vendor /datum/language_holder/draconic_vendor @@ -220,5 +220,5 @@ /datum/language/draconic = list(LANGUAGE_ATOM), ) -/obj/item/vending_refill/snack/imported/tizirian - machine_name = "Tizirian Imported Delicacies" +/obj/item/vending_refill/snack/imported/tiziran + machine_name = "Tiziran Imported Delicacies" diff --git a/modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi b/modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi index 1ee0339b50e531bb6dc248bafd2af3eee2606d2a..4249a5f4f0a482878be19e1225dd95a3314b6a3e 100644 GIT binary patch literal 10720 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 xS)%M7x z=BhpR0O8E$J7=WjNZ+pD`4r#wz6-DR2mX8mnmvI`WUtEB&OGqvuMe) zO&HTh{I<+l@e*3=BT=g3<_OrhAIoc%iEd+|wPCIlGR=t4wKLYz-RF%Kv0ni+1O8HO zlg>KUZ(FChbzUOt&746SdD>-)wqJ>Xobgnb8#^`tT&$Z$)LzE)n#c%%DZ?KvxSH*a zo*uL`SM7&;pQx)p)eqRyTwO_y0XhpIy0UqSkgF||@tk)`XYsTJ#d3ZoBtEE=6Fi8;d z=-NbH!f2t%{B}Ac??7uN9W=`f!llPtK>SYzwFzu8+#Y1oC4c+ zY{qjFL8(Vh9e*C6r&Y@xmzs?kq|NB)lpq8Eu;As~{Y~5g0L0fl49=#Rv3XL`I!HBu zEqg(Zjsq-@+bUfB+wK(6>+S9JFtnFTMqhjJ9(8E;nLjw7`ysB?hWsXZ6oF(BE@pH?_DoY}j z-+K=lBzN4q?v9${>7)Z&c0$U_%6ex^p^_WhIRzTG1^n5_95UGA&46rfZ&V`u6a6b}7_~260{2-dc^CYRKGmAE#VK-Y9+hgy`&xTgko( zU9Ru~4Kje0zO|k<9QoJ#d2$AL>4Gnn@Y#p8T}9NOH}qH+k(uq_{R4@FBHoZAWSBZ^ zM&q60k+KRx!L5spj=Gsh=m6m2L|o%&3Nw~|6fl9N!abQI!`KH@M3^F zb#mD9@O4hTsPL@K?cI$oO}5qif`<*y3-f8Z?WmX6tJ25FxSQiY6@y1EN~T5#GAO~x zrK+-kE#V37Ww5d(%(<5Q&<_)N9+I#>&VFhm$5CxQ8NH@)SvX#^npw}Eq3&K%oIl?#IF^9O5U(IlmIKyJ^)wD@98GY5 zz`ZZ!IDTt!wwhSsEKeU{^=|)NWg98Q}Mt~!v%{}Tqfk3-bx^lMG@2}m?a5MC6X5N#V6jTJCPQPf8<$df+Ivq@datq z=A=F>IlV+=DY-a?@6va)#}GQw#}#8*OIl~jl&qUReD$v5+Pp96834X_6tv-}=nwwN zDo|T*`O1R@zm5BqW2P_o)o;@K{+Z!%wGB(MqNOUPCY)r}o&!wRy=a8bS*$()poQ$> z)9*EKapQCCV{z)7U1fNL8-V%6pyh+RDMVveXJSEimmx-&r2T!(BI~WnlVnLGL;B_= z+Lr1zKIpbaQtECC157ZDx1{IW6`k&nRw%4RkiuE7fjmG770_sC4eNZbez!Qi9Q4YB z`^v=HlIkra1OU{+$z+7`Vf=i`frQ+mg{;>7&8ZZJB>DAp@0O3yi;$}jU9CAwGWf|! zWLk>I-)Lfw|C*A-th-v=BI zBiM4H^A5A?i5JjEO+oq1%g47dp9&V#;50$IV&6s(RN_pUb~f5oAgJ_X)WXKTJ6KqQ z#e4e>(ss8wXm9>$SC*&b2Eb_wl!tWd@Rz;>bz{?|XAm0W0i#n(v)ZS9-U0sSx(b`d@j? z+}<>R*=TMFFqDfdUo@FbY9`2R&^7B_D;B%x4Gg&7VG#2z6}9*jav+W1SM#&X9-X!# z`OW@&28yuVNvox1PSlDoi-)g~B1GX(JfqBSqt>tICBk=(5&kc0jU2N_nWrDm|5-*` zW_0XwRgj(kPOSt9E8cGNElO2;`t|_7qnGVQ^2x)FBtIv_TIX8eRicVCD{IgK60rp} z2rzXOOgG-1DM>mxj&J0}5D)Sv@ZCH=PkU7L=wcCp95Lep$Jx8gJ`0m~*3i0Qgf0(C0=Nok1Mu8p^-sNq= zOBZ%i!g|JE9$;ubkM!0qI1YexhQLNfG}Ldq*`!+(Q^-Kx5~1IY+c5x-ouQDfWs{c^ z%t5!ojIg(@k(x^IpSJULU2Sm9OhnWB4YN zNaTD{SAlpOHH-|nr-F>4DE#pc?3`!c8ua`M$|MX$?NsaxsuDLR&kle+Ubn`#MYSO& z%x@3gv)n5}O{ozp0uZlfq{#gC8tc)|y#HU3QIAdE5sHP2i)&3=ueYyn0{V!o2RF1D zlcI+xW~sQ7&*XF9GGbNboeiZ97Iu{;tep^J448e(S6=dkhs&*AO3*JiS{~s4_)$pK zdc%_aXkLqbiAQQ=nr4u?@U!xa-R?X+Xp9#Icul?GwgY0|^)ILZC)7>|x$)rXg2?y1 z4kf36ktukd?la>rD$$gioSdA!)6De&(b@wAmj~>B1WEtOyfb3?hmMSl#QcENEcwI1 z!=pC(`*)gz(YaxWx~dA7`Ji6;+sLRW{3CppL;gZE99>ll8~&t;etdKgZ>u3b1~87ocF@i!wQ zwP|Qbci+9kiT&x*M`#h5+!h>wkD~hJ6)6ZV16aPE874HV*CMkXKoiwaJLCCz7Zl{= zSiA9JIG@sgcCEcXXj{?ig1_^%S0n^@loo{c{FrBsrcf|+ofpf3_XFLL!5g<0*h}9vviTa1BIq%H4ZrQ|S;_*C?1F->1gP$0WAUhQm_>{@ zq43u3ca5d5W>wFpC_78~Ununo1KU98w?e~E#?sTX%ul2vOg=K7;g2_0K%8k+>6n~2 znLnHzS1bsZ)5yp`l!xzz0a#OK2FT0puOFqgwb(^!2553_gzjeXIBsn!6EF2{NsAA| zEHgw`4J1I2Oa>5`W_!wp2-@#5$VL5jdf&~@&%Zs5=2U8@Uh`EbCICZczcob}9{^}- zF6ud@r9;&gF(;HpY((x@F4P@hGT1p?sO;o~uIJaU#RmrA1Wi@PBfc4dR88Y$dU8hz zpGu#oCb*saOVw`v#?a2*(;0R25pmffX|8m?4~zQJ?j(`d=N0}0Pvp z2^D^iL1oFPsHmKx1CYj|qRL7E6U-H74d|~r*P{*sLew(c&zK|a?EBr9U2d8v$3Ar< z7bEvJja^wtq2-jZQKjF7U34{_(1-J86HOKgjg<%&;DBYN(2Y0kJozINxrOf|^^J7Y zby^mvdpuO=5sXtnny4}PYw@0%3fF4;`!7jJ!e1c-pO&y;I7uoWA$Y&$XAcFDatW)c zVy+f&eyO{m4-h0Ql~Vp8eoZlojxitlcSBkC%^SRO{#Q_WF&M>77s}^nYT(X3?M1C^ zWBoespD#4os)x?Sk{)8O_z-c~8hu%w;#F&inM(UPXMxS$ZI}DahRT2A?MS$#Z6C!a zBNY7*-==$+UQlVN6nw#N|C4ZFptG~{C<#DEM;CRmKSK~0nwpTnx+~6-ZwT#a`H8_4;*k*~8Lz4s>RiqP753x9xrHKUe z!qm;|6pj+vazQVR|9i=7+N^um@Z>6MWzwFLS7QZa(8XM<@}yb|l^D_M!45$5xrpcN z+qR2#3L9Dc;7_oYF^+Gzgci8~ln(2x_OL!VdY`LskjUpgQDc>cJT}|!+ehmZKZe2N zTkSatdBQ%qct&%nr4%LN2wJKD7+)yJ%({=!hSN*MK;|dNJ-$M_b}D7#Pw7TFQ+D9eZRGzK-?74m|McYQC^K+gFVGM8=MIctwyeK_KMW`@I5-zG{ILB5*Ltk> zx{W-iAFriFtM1WvQTERI0+;LWi_s5O(RD$-Eb^G!?^+?*LCV5Xt{ z`0}xW8=Q`)Ow-S!v#!}hx8K_P9SknCp z?OKEk`YQ-vp1Fu%@?=i!YC;rI$UoNcKV~VPaJzB&XMja%Nt|O2ZK#&AIB-@b#>pv` zAQQu zFnBc&>}^f+Aue-I6Cqz1t`JU1W2rq*2oE%2SbsL1xv-@O0Gf^-3MtXe9Cs7}1Og+8 zk*==Z;b_?tABq!=eu{Xw9^XN8r`|2}m^_O$fp&X9$?Lc*CM&FnZgRz8oqxVH&3rNu zlsp%i{o|g`^O^f=s`4Anx)MYR@r<=olnms%XdnGX^97v}ytnrOA0OY?*ZEwbI`OyJ z&iD8)EP;xe9z0#q=o>vS&XA)G-#(q69m`r*M)zH zSH94gdW3?DGnS*|0@*Ma%4I4ha~C<%1KMx>GKop}G=kN?_wzr5{93&&!xw&hue<`q2YBq8RyfY7N_jfj1JuU~snh`-Ci;Q6%Rl)+(`mU0w zT*&vT>x36J9NfWGZR8{p&v0<)Bf&?QN0}wxw z3(sSw%D~bW)lW5AaA{o^AE>)QA7k==4P%|1l$g3$B|d#!{ln_BLi1p6>*M3}4B8GV zfi&T#K3=)Q!vp~7FWQbquUzu1ym_hvV17Z|ytE>?ylQ5UFYvv(hM}s4@)I;tfeA(` z^@6rIP26}%R9cc>SQr?}guJ|{fi(R1Hq^qh3pN`+`lEKT;ZwvAhaqqU=GkP1#2ofF ztQ7k0ruyh%@_g3zb%F3-fq{-tBt)d=m_!rQBC0Ny{-pc z^ZRk@-B^HpgMtorlKsR*#7qK}gzwTjON=?MRyLOQc9n@DJL=&AX;cv|c*ci`w~sh9 zoV$}4%kQIn$IMvN-X1p09c$ubw@tp+q(*2s3tIovq4NIx_SUsA8EQ|+ViNVC9>;E? zPDUrg`gAGf!FVcJdfWj$HZEO!og`dzciutx$mllVTNa8E4V?Zjc*m*UQ=U>rks9y4Nt50a<4Wh z8~Af1BL4zLZHYtrg1@fmZzC7uN?s6}%jb8?Y4}SIlBRB6C5_kQ@Jfb{Uj8ikCr=J( z2xFG@h<+RATu>#ZX3Fn6n+aoNC9jNNMBGCHz{bXb`$d8&DJCFHG(q&6sNk4Jgl_2@ z@mW(i1KN{ogy)|_`sIU8@nBsFL2)Bad`Zpu=Si$uF3dE+m-`phyEU^DBzRxVt00fs z!6Fc;EZ68pn+|{6hW=n2P;~hcLEZkBsdfj6{AaX;N(=Ah9lJdX9G}HYK+e@;f6QG? zPaTtRA4<_0+o+Dpn3~2VT2D~cyNz30S-t)s?eO(W9|^$zx1^C^kX{<~@v}u3HBqeN zli@a*>K2IDr?%WO2Bw%B>-S7SY!~7$n}2T7()c0~76K3*oy^i(9tOC0`KN`-JImYL z3d<=w;kfpU^6GaO9d%63#Q@lUr?SXibBxZ|1BDW-azE~z8@(hpnlYve(sQIz&r)Vc zLdE=t-_L4zdl*+w>zul$O^=z%Pp!C<;uUHXzuf+#$VfX z{>lIE;?;j?pP3EIQO4XD(oiQ2JtKY2S%fYWZ<_rJq3r86V7L~fSPTQvxvN8^X#Z<( zx||bLnWkEczZJ>a@4S%VcfaY8G}p}LmRyj*_{KFpL);t%+Al(E?SGUg~l?}(w%Oq5_2TE1gb zyBhAiFP8cdch7uByQi6oVMdMah>>a~ixBw03z18%{36^r(yoCj#Xs0MIPuTc6 zhEX1lG4(w443u14w{>{?;Y@q-@v6BYIhv0jgG04SWJkeH4yyP#W3iIT2}QD^T<^t$ zJ6)4c#rJ4`5BgJd%l`+N27nDmiwr#H9ZpL9ocLYf!;=#M>q09g*|K`W+x(E5-beQ9 zIIts{nL@AjMn0+?2;nY|h{Np46lumEcHF9nI3Udv8-RUpW@x#W_(vi(@QAkJJbZkV zNkAzuhBh(zo2(JNH-qMEA|_Z)`~Z8i2g0= z0G&{~B#u7(U{VqqZuQip(0xbN3`u|LG&A>Qf5@gR06YDB6J&|5w`boL78Y8hF<;*D^78tu1mW=f zF6|CL)-!6b;`)+0;QmVJN;e`>&=g3;CZd$-v?=2WQPsq4V%T#XU(vGQ zj%{dl(Bk@PFS(zotPGjoYNz@Yc$K3)5Wu%;44a#q8;YS5!mgN=laT?T+liF3X)ke+ z3D0D^=_VoWn#c=IwHD{{-oIPn+pB-s`(4kv&pzD^xGD=JmTPl;r3Wr)pSL$OeBa(? zo5I~_x_0(}$UekEXu55&GjqPTwk8M+2lHXJBwXP6lAg=Gkd%J$Uo`x`G|OTBMS(iq W!qU2Pv`79ma4IXP%a_ZV1^*98e`VnS literal 10348 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 T>u~;`VnPL3mDgo5CISBk=HBf2 diff --git a/modular_skyrat/modules/imported_vendors/icons/imported_vendors.dmi b/modular_skyrat/modules/imported_vendors/icons/imported_vendors.dmi index 4cda06be3f26854feff75649726c4621d5504abc..d26e14e5a38ed97f46a9c43c8ef3b9b28497bb85 100644 GIT binary patch delta 231 zcmVco delta 232 zcmV7{2LJzq zAG`>5`$JwrR^<35j8(b=2I+Ez(Op$e0)usekrb+t?)9;bI{^$9ojcZAR|||PWh^kD z7}bWi!UBU0MwPhm9vIMsQ1TvM{rF_`S#;BDCgQrTgR>XaNEf%l<{O{j#~u2c iLXo3Rh;mf;&x~MSW{?#*egXvN5T2ixLJ_kX0T3d)$7`Yh