diff --git a/GainStation13/code/game/lore_papers.dm b/GainStation13/code/game/lore_papers.dm index cb2f852de0..a879935823 100644 --- a/GainStation13/code/game/lore_papers.dm +++ b/GainStation13/code/game/lore_papers.dm @@ -154,6 +154,7 @@ /obj/item/paper/fluff/ruins/fastfood/general_info name = "Welcome to GATO!" icon = 'GainStation13/icons/obj/library.dmi' + icon_state = "book1" info = "We are glad to have you be a part of our galaxy-wide GATO franchise locations! As a restaurant worker / manager, you are a part of the GATO Corp and for security purposes, you may be treated as a part of the General Station 13's crew. Make sure to keep your restaurant clean and well-stocked. Good luck!" diff --git a/GainStation13/code/modules/cargo/packs.dm b/GainStation13/code/modules/cargo/packs.dm new file mode 100644 index 0000000000..b9e3bcd9fc --- /dev/null +++ b/GainStation13/code/modules/cargo/packs.dm @@ -0,0 +1,6 @@ +/datum/supply_pack/vending/mealdor + name = "Meal Vendor Supply Crate" + desc = "Suprising one to order. If you need a refill for the meal vendor, someone's immobile somewhere. And since you managed to make it to cargo... Well it's not our job to say no!" + cost = 10000 + contains = list(/obj/item/vending_refill/mealdor) + crate_name = "meal vendor supply crate" diff --git a/GainStation13/code/modules/mapping/areas.dm b/GainStation13/code/modules/mapping/areas.dm index 97efdc7714..d88f3ab659 100644 --- a/GainStation13/code/modules/mapping/areas.dm +++ b/GainStation13/code/modules/mapping/areas.dm @@ -153,3 +153,6 @@ /area/ruin/powered/gluttony icon_state = "dk_yellow" + +/area/ruin/powered/beach + icon_state = "dk_yellow" diff --git a/GainStation13/code/modules/vending/gatocola.dm b/GainStation13/code/modules/vending/gatocola.dm index 3967633492..85749926df 100644 --- a/GainStation13/code/modules/vending/gatocola.dm +++ b/GainStation13/code/modules/vending/gatocola.dm @@ -26,4 +26,9 @@ /obj/item/vending_refill/mealdor machine_name = "Meal Vendor Refill" + icon = 'GainStation13/icons/obj/vending_restock.dmi' icon_state = "refill_mealdor" + +/obj/machinery/vending + /// Are the products inside free? + var/free = FALSE diff --git a/GainStation13/icons/obj/vending_restock.dmi b/GainStation13/icons/obj/vending_restock.dmi new file mode 100644 index 0000000000..120a8f2342 Binary files /dev/null and b/GainStation13/icons/obj/vending_restock.dmi differ diff --git a/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm b/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm index 54bcfda6a3..dff03785a4 100644 --- a/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm +++ b/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm @@ -1,6 +1,6 @@ "aa" = (/turf/template_noop,/area/template_noop) -"ab" = (/obj/structure/table,/obj/item/storage/box/drinkingglasses,/obj/item/storage/box/drinkingglasses,/obj/item/storage/box/beakers,/obj/item/storage/box/donkpockets,/obj/item/kitchen/knife,/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/turf/open/floor/plating,/area/ruin/powered/beach) -"ac" = (/obj/structure/closet/cabinet,/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/turf/open/floor/carpet/orange,/area/ruin/powered/beach) +"ab" = (/obj/structure/table,/obj/item/storage/box/drinkingglasses,/obj/item/storage/box/drinkingglasses,/obj/item/storage/box/beakers,/obj/item/storage/box/donkpockets,/obj/item/kitchen/knife,/turf/open/floor/plating,/area/ruin/powered/beach) +"ac" = (/obj/structure/closet/cabinet,/turf/open/floor/carpet/orange,/area/ruin/powered/beach) "ad" = (/obj/structure/flora/ausbushes/leafybush,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "ae" = (/obj/structure/table,/obj/item/storage/toolbox/mechanical,/obj/item/stack/cable_coil,/obj/item/storage/box/lights/mixed,/obj/item/multitool,/obj/item/storage/box/lights/mixed,/turf/open/floor/plating,/area/ruin/powered/beach) "af" = (/obj/structure/table,/obj/item/clothing/mask/gas,/obj/machinery/light/small{dir = 1},/obj/item/clothing/glasses/sunglasses/big,/obj/item/clothing/glasses/sunglasses/big,/obj/item/clothing/glasses/sunglasses/big,/turf/open/floor/plating,/area/ruin/powered/beach) @@ -30,7 +30,7 @@ "aD" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/machinery/chem_dispenser/drinks,/turf/open/floor/wood,/area/ruin/powered/beach) "aE" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/open/floor/wood,/area/ruin/powered/beach) "aF" = (/obj/machinery/vending/boozeomat{req_access_txt = "0"; set_obj_flags = "EMAGGED"},/turf/open/floor/wood,/area/ruin/powered/beach) -"aG" = (/obj/machinery/light{dir = 4},/obj/structure/closet/crate/bin,/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/turf/open/floor/wood,/area/ruin/powered/beach) +"aG" = (/obj/machinery/light{dir = 4},/obj/structure/closet/crate/bin,/turf/open/floor/wood,/area/ruin/powered/beach) "aH" = (/obj/structure/table,/obj/machinery/light{dir = 1},/obj/item/book/manual/wiki/barman_recipes,/obj/item/book/granter/action/drink_fling,/obj/item/reagent_containers/food/drinks/shaker,/obj/item/reagent_containers/rag,/turf/open/floor/wood,/area/ruin/powered/beach) "aI" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/wood,/area/ruin/powered/beach) "aJ" = (/obj/structure/closet/crate/bin,/obj/item/tank/internals/emergency_oxygen,/obj/item/trash/candy,/obj/item/toy/talking/owl,/obj/effect/turf_decal/stripes/asteroid/line{dir = 1},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel,/area/ruin/powered/beach) @@ -123,7 +123,6 @@ "wY" = (/turf/open/floor/pod/light,/area/ruin/powered/beach) "xB" = (/obj/effect/overlay/water,/obj/effect/overlay/water/top,/obj/structure/flora/rock,/turf/open/floor/plating/beach/water,/area/ruin/powered/beach) "xU" = (/obj/effect/overlay/palmtree_l,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) -"yp" = (/obj/structure/chair/comfy/plywood,/obj/item/toy/plush/metha,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "zw" = (/obj/structure/mineral_door/woodrustic,/turf/open/floor/wood,/area/ruin/powered/beach) "AI" = (/obj/machinery/vending/cigarette/beach,/turf/open/floor/wood,/area/ruin/powered/beach) "Bl" = (/obj/effect/turf_decal/sand,/obj/machinery/light{dir = 8},/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) @@ -145,7 +144,7 @@ "QS" = (/turf/closed/wall/mineral/wood,/area/ruin/powered/beach) "RO" = (/obj/machinery/light,/turf/open/floor/wood,/area/ruin/powered/beach) "SX" = (/obj/effect/turf_decal/sand,/obj/machinery/vending/gato,/turf/open/floor/plasteel,/area/ruin/powered/beach) -"Tt" = (/obj/structure/closet/cabinet,/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/obj/item/camera,/turf/open/floor/carpet/orange,/area/ruin/powered/beach) +"Tt" = (/obj/structure/closet/cabinet,/obj/item/camera,/turf/open/floor/carpet/orange,/area/ruin/powered/beach) "TP" = (/obj/structure/closet/crate/bin,/turf/open/floor/wood,/area/ruin/powered/beach) "UM" = (/obj/effect/overlay/palmtree_l,/obj/machinery/light{dir = 4},/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "VN" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/pod/dark,/area/ruin/powered/beach) @@ -176,7 +175,7 @@ bWpgGcdwaAarararararararbxaparararaZararapararDcDcDcDcaAaAaAaAxUaAaparaAmoGccfbW pIGcwYmhBlararararaparmMararararaUarararararararararaparogararararararoTmhGcGcpI bWiwVOmhaAbzararapbxchbWcgarapararararbAbBarararaUararchbWcgarararaZaraAmhcuVNbW bWlMZlmhaAararararararPbararbEararbFchbGbHcgmbaparararapPbararaUarararaAmhlMcRbW -bWbWbWbWcgypareDarbJarbJbKbJarbJapararbLbMarararXparbJarbJarbJarbJarbJUMbWbWbWbW +bWbWbWbWcgbJareDarbJarbJbKbJarbJapararbLbMarararXparbJarbJarbJarbJarbJUMbWbWbWbW aabWadapbNararbEbOararararararararbzarararbPararararararararaparararararapbNbWaa lFbWbQbRbRbSbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbSbRbRbRbWXr aabWbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbWaa diff --git a/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm b/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm index 0b59baee37..29e466e5bc 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm @@ -101,7 +101,6 @@ dir = 2; dwidth = 11; height = 17; - id = "whiteship"; launch_status = 0; movement_force = list("KNOCKDOWN"=0,"THROW"=0); name = "Salvage Ship"; @@ -346,7 +345,6 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "az" = ( -/obj/machinery/computer/arcade/minesweeper, /obj/machinery/light{ dir = 8 }, @@ -374,7 +372,7 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "aC" = ( -/obj/structure/table/plaswood, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -953,7 +951,6 @@ /obj/item/trash/candy, /obj/item/trash/syndi_cakes, /obj/item/trash/boritos, -/obj/item/trash/soy_food, /turf/open/floor/mineral/basaltstone_floor, /area/shuttle/abandoned/crew{ name = "Arrival Hallway"; @@ -983,12 +980,12 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/table/plaswood, /obj/item/trash/tray, /obj/item/reagent_containers/food/snacks/burger/rib{ pixel_y = 3; pixel_x = 1 }, +/obj/structure/table/wood, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -1087,7 +1084,6 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/obj/item/trash/carbonnanotube_noodles, /obj/item/trash/pistachios, /obj/item/trash/plate, /obj/item/trash/cheesie, @@ -1978,10 +1974,6 @@ pixel_x = -10; pixel_y = -24 }, -/obj/item/modular_computer/laptop/preset/civillian{ - name = "CFC branded civillian laptop"; - desc = "A low-end laptop. There's a CFC logo on it's back." - }, /obj/item/radio/off{ pixel_x = 6; pixel_y = 7; @@ -2308,7 +2300,6 @@ /obj/item/stack/sheet/mineral/calorite{ amount = 10 }, -/obj/item/trash/soy_food, /obj/item/trash/popcorn, /obj/item/trash/pistachios, /obj/item/trash/raisins, @@ -2873,21 +2864,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/maid, -/obj/item/clothing/under/maid, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/suit/apron/chef, /obj/item/clothing/suit/apron/chef, -/obj/item/clothing/under/rank/nursesuit, -/obj/item/clothing/under/rank/nursesuit, -/obj/item/clothing/under/rank/nursesuit, -/obj/item/clothing/under/rank/nursesuit, -/obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/head/nursehat, /obj/item/clothing/head/nursehat, /obj/item/clothing/head/nursehat, @@ -3379,13 +3360,13 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "hK" = ( -/obj/structure/table/plaswood, /obj/item/radio/intercom{ frequency = 1453; name = "Order - 2"; pixel_y = 0; listening = 0 }, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -3527,13 +3508,13 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/table/plaswood, /obj/item/radio/intercom{ frequency = 1453; name = "Order - 1"; pixel_y = 0; listening = 0 }, +/obj/structure/table/wood, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -3678,13 +3659,13 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "xt" = ( -/obj/structure/table/plaswood, /obj/item/radio/intercom{ frequency = 1453; name = "Order - 4"; pixel_y = 0; listening = 0 }, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -3740,10 +3721,10 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "yS" = ( -/obj/structure/table/plaswood, /obj/item/reagent_containers/food/snacks/pizza/meat{ pixel_y = 9 }, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -3841,13 +3822,6 @@ dir = 8 }, /turf/open/floor/plasteel/freezer, -/area/shuttle/abandoned/bar{ - name = "Kitchen"; - ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') - }) -"Cv" = ( -/obj/structure/sign/poster/contraband/sun_kist, -/turf/closed/wall/mineral/titanium, /area/shuttle/abandoned/bar{ name = "Kitchen"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -3943,7 +3917,6 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "MZ" = ( -/obj/structure/table/plaswood, /obj/item/radio/intercom{ frequency = 1453; name = "Order - 5"; @@ -4037,13 +4010,13 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "Pl" = ( -/obj/structure/table/plaswood, /obj/item/radio/intercom{ frequency = 1453; name = "Order - 3"; pixel_y = 0; listening = 0 }, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -4109,16 +4082,6 @@ name = "Engineering"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) -"Sc" = ( -/obj/machinery/atm{ - pixel_y = 0; - pixel_x = -32 - }, -/turf/open/floor/carpet/red, -/area/shuttle/abandoned/crew{ - name = "Arrival Hallway"; - ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') - }) "Su" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -4138,10 +4101,10 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "TM" = ( -/obj/structure/table/plaswood, /obj/item/reagent_containers/food/snacks/cakeslice/carrot{ pixel_y = 10 }, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -4152,7 +4115,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/table/plaswood, +/obj/structure/table/wood, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -4583,7 +4546,7 @@ em bC aY bX -Cv +an bm cK cS @@ -4767,7 +4730,7 @@ an (23,1,1) = {" aj aw -Sc +bu bu de dj diff --git a/_maps/map_files/gs13/Fast_Food.dmm b/_maps/map_files/gs13/Fast_Food.dmm index d3fab5bcec..bed504e4e2 100644 --- a/_maps/map_files/gs13/Fast_Food.dmm +++ b/_maps/map_files/gs13/Fast_Food.dmm @@ -28,7 +28,7 @@ "aB" = (/obj/structure/chair/stool/bar,/obj/structure/sign/poster/official/foam_force_ad{pixel_x = -32},/obj/item/trash/popcorn,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/fastfood_main) "aC" = (/obj/effect/turf_decal/bot,/obj/structure/closet/crate/trashcart,/obj/item/paper/fluff/ruins/fastfood/general_info,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "aD" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) -"aE" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/vending/gato{credits = 30},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) +"aE" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/vending/gato{free = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "aF" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "aG" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/cheesewedge,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/sea_weed,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/soymilk,/obj/item/reagent_containers/food/condiment/milk,/obj/item/reagent_containers/food/condiment/milk,/obj/structure/sign/warning/nosmoking/circle{pixel_y = 32},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "aH" = (/obj/structure/table/reinforced,/obj/structure/table/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_kitchen"},/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) @@ -51,7 +51,7 @@ "aY" = (/obj/structure/sink/kitchen{dir = 4; pixel_x = -11},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "aZ" = (/obj/structure/reagent_dispensers/cooking_oil,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "ba" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 1},/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/closet/crate/freezer,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) -"bb" = (/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"bb" = (/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "bc" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "bd" = (/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) "be" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/structure/sign/poster/official/cleanliness{pixel_y = 32},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) @@ -115,7 +115,7 @@ "et" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) "eE" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "eG" = (/obj/structure/rack,/obj/item/circuitboard/computer/slot_machine,/obj/item/circuitboard/machine/biogenerator,/obj/item/circuitboard/machine/chem_dispenser,/obj/item/circuitboard/machine/dish_drive,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/microwave,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/seed_extractor,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"eK" = (/obj/machinery/vending/cigarette{credits = 30; baseprice = 0},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) +"eK" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/machinery/vending/cigarette{free = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "eM" = (/obj/structure/rack/shelf,/obj/machinery/light{dir = 1},/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/flour,/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/condiment/rice,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "eP" = (/obj/item/reagent_containers/glass/beaker/bluespace{pixel_x = 8; pixel_y = 12},/obj/item/reagent_containers/food/snacks/store/cake/bscc{pixel_x = -9},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "eS" = (/obj/machinery/door/airlock/external,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) @@ -180,7 +180,7 @@ "lF" = (/obj/structure/sign/warning,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) "lH" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/sign/poster/contraband/space_cola{pixel_x = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "mb" = (/obj/machinery/vending/wardrobe/chef_wardrobe,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"mi" = (/obj/machinery/vending/dinnerware{credits = 10},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) +"mi" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/machinery/vending/dinnerware{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "mn" = (/obj/machinery/disposal/bin,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "mq" = (/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) "mr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) @@ -318,7 +318,7 @@ "AR" = (/obj/machinery/disposal/bin{pixel_x = -8},/obj/structure/disposalpipe/trunk{dir = 4},/turf/open/floor/plasteel/checker,/area/ruin/space/has_grav/fastfood_employee) "AV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) "Ba" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/soysauce{pixel_x = -20},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) -"Bc" = (/obj/item/reagent_containers/food/snacks/cakeslice/carrot{pixel_y = 10},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"Bc" = (/obj/item/reagent_containers/food/snacks/cakeslice/carrot{pixel_y = 10},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Be" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "Bi" = (/obj/machinery/light/small{dir = 4},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Bp" = (/obj/item/shard,/turf/open/floor/plating/airless,/area/space/nearstation) @@ -381,7 +381,7 @@ "IL" = (/obj/structure/sign/warning/vacuum,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_main) "Ji" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "Jl" = (/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plating/airless,/area/space/nearstation) -"JA" = (/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -6; pixel_y = 6},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"JA" = (/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -6; pixel_y = 6},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "JD" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/checker,/area/ruin/space/has_grav/fastfood_employee) "JG" = (/obj/machinery/food_cart,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "JH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) @@ -427,9 +427,10 @@ "NS" = (/obj/structure/kitchenspike,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/structure/sign/warning/nosmoking/circle{pixel_y = 32},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "NV" = (/obj/structure/closet/crate,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/stripes/line{dir = 1},/obj/item/trash/can,/obj/item/trash/boritos,/turf/open/floor/plating/airless,/area/space/nearstation) "NW" = (/obj/effect/turf_decal/stripes/line{dir = 5},/obj/effect/turf_decal/stripes/white/line{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 1},/turf/open/floor/circuit/telecomms,/area/ruin/space/has_grav/fastfood_employee) +"NY" = (/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Oa" = (/obj/item/trash/blueberry_gum,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/airless,/area/space/nearstation) "Oh" = (/obj/structure/sign/nanotrasen,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee) -"OE" = (/obj/item/reagent_containers/food/snacks/burger/rib{pixel_y = 3; pixel_x = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"OE" = (/obj/item/reagent_containers/food/snacks/burger/rib{pixel_y = 3; pixel_x = 1},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "OF" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/obj/machinery/modular_computer/console/preset/civilian{pixel_y = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "OV" = (/obj/structure/chair/comfy/black{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "OY" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_main) @@ -470,7 +471,7 @@ "Sq" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) "Sz" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "SE" = (/obj/structure/cursedfatfountain,/turf/open/floor/mineral/calorite/dance,/area/space/nearstation) -"SK" = (/obj/item/trash/tray,/obj/item/reagent_containers/food/snacks/burger/bigbite,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"SK" = (/obj/item/trash/tray,/obj/item/reagent_containers/food/snacks/burger/bigbite,/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "SM" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "Te" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/sink/kitchen{dir = 4; pixel_x = -11; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) "Tm" = (/obj/structure/bed/double,/obj/item/restraints/handcuffs/cable/zipties{pixel_y = 6},/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/cowmask/gag,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) @@ -504,7 +505,7 @@ "VP" = (/obj/structure/chair/stool/bar,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "VR" = (/obj/structure/closet/crate/trashcart,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/turf_decal/stripes/line,/obj/item/trash/sosjerky,/turf/open/floor/plating/airless,/area/space/nearstation) "Wa" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals4"},/turf/open/floor/plasteel/dark/side{dir = 1},/area/ruin/space/has_grav/fastfood_employee) -"Wd" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"Wd" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_y = -10; pixel_x = -3},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Wg" = (/obj/machinery/conveyor_switch{id = "fastfood_trash"},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Wp" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "Wr" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sign/warning/vacuum{pixel_y = -32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) @@ -580,13 +581,13 @@ DhDhDhDhDhfYDhDhDhDhDhaWQmaWaWaWaWfYDhDhDhDhDhDhDhDhDhDhiqARaPbCJDJDJDGgaybdbdbd DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPQPQPQPQPebVziqpkbHWSDVbIJMiqauXQbJaupUlbDEiqyzXtagaUiqXniqiqiqiqiqiqiqDhDhDhfYfYfYfYDhDhfYfYDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPhIuVPlNGdUnmnxnxnxyunHENbcOFENjJnxnxxgmzlHiqbWlsKdfRiqXnLDVbiqtbMyNWiqDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPaBNaNaaEopfvHrapapRLDFDFuMDFDFKpapapRqWplmiqVdCGTFBiiqDwsYKddlxDgAgIiqDhDhDhDhDhDhDhfYfYDhDhDhDhDhDhDhDhDhDh -DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPbFbpbptjeqwRcEzKHHfieEDXPNfibbDXHHzKtJRtwJiqrsysbKKdiqXnvqVbiqIafcEuiqDhDhDhDhDhDhfYfYfYfYDhDhDhDhDhDhDhDhDh -DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPQPQPQPabNdkqcEVtnNbNeEvIbLbNOEvIHLJAtJRtOVLkQPQPiqYsiqXniqiqiqiqiqiqiqDhDhDhDhDhDhyKfYfYfYDhDhfYDhDhDhDhDhDh -DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhOYuSUqwkcEaLbMMDBcxAHHMDeExAPNaLtJqdiBPUVmRZMaacWrGlaVaVpGtLjhFiiqDhDhDhDhDhDhQmaWaWQmDhDhDhDhDhDhDhDhDh +DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPbFbpbptjeqwRcEzKHHfiNYDXPNfibbDXHHzKtJRtwJiqrsysbKKdiqXnvqVbiqIafcEuiqDhDhDhDhDhDhfYfYfYfYDhDhDhDhDhDhDhDhDh +DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhQPQPQPQPabNdkqcEVtnNbNNYvIbLbNOEvIHLJAtJRtOVLkQPQPiqYsiqXniqiqiqiqiqiqiqDhDhDhDhDhDhyKfYfYfYDhDhfYDhDhDhDhDhDh +DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhOYuSUqwkcEaLbMMDBcxAHHMDNYxAPNaLtJqdiBPUVmRZMaacWrGlaVaVpGtLjhFiiqDhDhDhDhDhDhQmaWaWQmDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhOYbRVPwkxwaFaFaFaFaFkBaFaFaFaFaFajwRYXQPQPQPQPQPQPeSiqiqzhWgEeTAiqDhDhDhDhDhfYZfaXfYfYDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhOYxaVPEbJJbxbxbxbxbxujbxbxbxbxugcqtdSzaTfxqLqLUgQPKdfNiqBQnoGxTKiqDhDhDhDhDhfYfYfYfYDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhQPrJKhiKcENGqEfiSKDXwGfiWdDXsyrxSMJiEEFaQMTCjvPeQPkrOhiqiqiqiqiqiqDhDhDhDhDhfYfYfYfYDhDhDhDhDhDhDhDhDhDh -DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhQPaOcDwRiZabwXbNeEvILlbNeEvIAfPFfFwNeiQPQPQPRxVxQPkmfAarDhDhDhDhaiDhDhDhDhDhfYfYfYDhDhDhDhDhDhDhDhDhDhDh +DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhaiDhDhQPaOcDwRiZabwXbNNYvILlbNNYvIAfPFfFwNeiQPQPQPRxVxQPkmfAarDhDhDhDhaiDhDhDhDhDhfYfYfYDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhbuaiaiarvGLkQPQPlgPWQPQPQPOYOYOYQPOYOYOYQPOYOYOYQPQPrTBTUxmBQParararDhDhDhDhaiDhDhDhDhDhDhfYDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDharkmakaIYLvbPVPqQPaiDhDhDhaiDhDhDhaiDhDhDhaiQPQPQPUxjVQPDhDhaiDhDhDhDhaiDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh DhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDharkmakiHEduZLjtHQPaiDhDhDhaiDhDhDhaiDhDhDhaiQPFtBTUxmBQPDhDhaiDhDhDhDhaiDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDhDh diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 8630b9ba0d..dc312a8e50 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -37,6 +37,7 @@ require only minor tweaks. #define ZTRAIT_ICE_RUINS_UNDERGROUND "Ice Ruins Underground" #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement. #define ZTRAIT_VIRTUAL_REALITY "Virtual Reality" +#define ZTRAIT_FASTFOOD "Fast Food Restaurant" //GS12 //boolean - weather types that occur on the level #define ZTRAIT_SNOWSTORM "Weather_Snowstorm" diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index a81d810ac9..d6bad2bfea 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -313,6 +313,7 @@ SUBSYSTEM_DEF(mapping) LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) LoadGroup(FailedZs, "Lavaland_Lower", "map_files/Mining", "Lavaland_Lower.dmm", default_traits = ZTRAITS_LAVALAND_UNDERRGOUND) LoadGroup(FailedZs, "Lavaland_Demone", "map_files/Mining", "Lavaland_Demone.dmm", default_traits = ZTRAITS_LAVALAND_UNDERRGOUND) + LoadGroup(FailedZs, "Fast_Food", "map_files/gs13", "Fast_Food.dmm", default_traits = ZTRAITS_FASTFOOD) //GS13 else if (!isnull(config.minetype) && config.minetype != "none") INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!") #endif diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index c901e82b8d..3e02257b62 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -644,6 +644,7 @@ /obj/machinery/vending/engineering = "Robco Tool Maker", /obj/machinery/vending/sovietsoda = "BODA", /obj/machinery/vending/security = "SecTech", + /obj/machinery/vending/mealdor = "Meal Vendor", //GS13 EDIT // /obj/machinery/vending/modularpc = "Deluxe Silicate Selections", /obj/machinery/vending/custom = "Custom Vendor") diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 7af2aca81b..66f1b0486d 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -182,6 +182,13 @@ * * TRUE - all other cases */ /obj/machinery/vending/Initialize(mapload) + //GS13 EDIT START + if(free) + default_price = 0 + extra_price = 0 + scan_id = 0 // Why would we do this? Shit's free. + + //GS13 EDIT END var/build_inv = FALSE if(!refill_canister) circuit = null @@ -322,6 +329,11 @@ GLOBAL_LIST_EMPTY(vending_products) ///Prices of vending machines are all increased uniformly. R.custom_price = initial(temp.custom_price) R.custom_premium_price = initial(temp.custom_premium_price) + //GS13 EDIT + if(free) + R.custom_price = 0 + R.custom_premium_price = 0 + //GS13 EDIT END // R.age_restricted = initial(temp.age_restricted) // R.colorable = !!(initial(temp.greyscale_config) && initial(temp.greyscale_colors) && (initial(temp.flags_1) & IS_PLAYER_COLORABLE_1)) recordlist += R diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index aea6a40e86..82d46c8de7 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 6e16e59465..c843babaaf 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3963,6 +3963,7 @@ #include "GainStation13\code\mobs\cakegolem.dm" #include "GainStation13\code\mobs\chocoslime.dm" #include "GainStation13\code\mobs\races\caloritegolem.dm" +#include "GainStation13\code\modules\cargo\packs.dm" #include "GainStation13\code\modules\client\preferences\preferences.dm" #include "GainStation13\code\modules\clothing\under\jobs\clothing.dm" #include "GainStation13\code\modules\clothing\under\jobs\modcivilian.dm"