From c8531c827f1a16fdbd1d9894e7e36c8736422ff5 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Tue, 7 Jan 2020 23:07:50 +0100 Subject: [PATCH] Fixed conflicts. Adds water bottle to the machine coz logic. --- code/game/machinery/vending_vr.dm | 3 +- code/modules/food/food/snacks_vr.dm | 2 +- maps/tether/tether-07-station3.dmm | 185 +--------------------------- 3 files changed, 4 insertions(+), 186 deletions(-) diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index ea3af1edc7d..af4124299cf 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -1325,7 +1325,8 @@ icon = 'icons/obj/vending_vr.dmi' icon_state = "foodcube" product_ads = "Afraid to starve?;Starvation is not an option!;Add water before consumption.;Let me take care of you.;Dire circumstances call for food cubes, do not let the taste deter you." - products = list(/obj/item/weapon/storage/box/wings/tray = 5) + products = list(/obj/item/weapon/storage/box/wings/tray = 5, + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10) contraband = list(/obj/item/weapon/storage/box/wings/tray = 5) /obj/machinery/vending/emergencyfood/filled diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index f0cba676b59..65db2fe5601 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -394,7 +394,7 @@ icon_state = "sharkmeat_chunk" nutriment_amt = 15 w_class = ITEMSIZE_LARGE - slice_path = /obj/item/weapon/reagent_containers/food/snacks/sharkmeat + slice_path = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat slices_num = 5 /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index acb808615cb..6b26a00517f 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -17487,17 +17487,10 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "AY" = ( -<<<<<<< refs/remotes/origin/master /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/excursion/tether) -======= -/turf/space, -/area/supply/station{ - dynamic_lighting = 0 - }) ->>>>>>> woop "AZ" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/regular, @@ -23964,18 +23957,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) "La" = ( -<<<<<<< refs/remotes/origin/master -/obj/machinery/washing_machine, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/vending/emergencyfood, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak) -======= -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) ->>>>>>> woop "Lb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -26680,7 +26666,6 @@ /turf/simulated/floor/airless, /area/medical/virology) "PA" = ( -<<<<<<< refs/remotes/origin/master /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_l" @@ -26688,13 +26673,6 @@ /turf/space, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/large_escape_pod1/station) -======= -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/vending/emergencyfood, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/medbreak) ->>>>>>> woop "PB" = ( /turf/simulated/wall/r_wall, /area/medical/virologyisolation) @@ -27100,24 +27078,15 @@ /area/medical/virology) "Qp" = ( /obj/structure/shuttle/engine/propulsion{ -<<<<<<< refs/remotes/origin/master dir = 8 -======= - dir = 8; - icon_state = "propulsion_l" ->>>>>>> woop }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/large_escape_pod1/station) "Qq" = ( /obj/structure/shuttle/engine/propulsion{ -<<<<<<< refs/remotes/origin/master dir = 8; icon_state = "propulsion_r" -======= - dir = 8 ->>>>>>> woop }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, @@ -27158,17 +27127,6 @@ "Qt" = ( /turf/simulated/wall, /area/tether/exploration) -<<<<<<< refs/remotes/origin/master -======= -"Qu" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station) ->>>>>>> woop "Qw" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -36939,11 +36897,7 @@ IE Jq Kd Jr -<<<<<<< refs/remotes/origin/master La -======= -PA ->>>>>>> woop LF Mj VA @@ -39365,19 +39319,11 @@ MK Iy ab NL -<<<<<<< refs/remotes/origin/master PA Qp Qp Qp Qq -======= -Qp -Qq -Qq -Qq -Qu ->>>>>>> woop NL vt vt @@ -40600,11 +40546,7 @@ Zy WG dj XA -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop ms Oz be @@ -40746,11 +40688,7 @@ UJ Xb dj XN -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop ms Xq be @@ -40892,11 +40830,7 @@ iW WS dj XN -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop ms Xq be @@ -41179,11 +41113,7 @@ jZ WR Xo XN -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop cK ms Xq @@ -41751,11 +41681,7 @@ ea kx dj XN -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop cK ms mq @@ -42040,11 +41966,7 @@ kQ TG dj XN -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop ms mq be @@ -42186,11 +42108,7 @@ kR Vd dj XN -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop ms QL be @@ -42332,11 +42250,7 @@ ZE ZB dj XB -<<<<<<< refs/remotes/origin/master AY -======= -La ->>>>>>> woop ms Sq be @@ -44491,28 +44405,17 @@ vt vt vt vt -<<<<<<< refs/remotes/origin/master -======= -AY -AY ->>>>>>> woop CS CS CS CS CS CS -<<<<<<< refs/remotes/origin/master CS CS CS CS CS -======= -AY -AY -AY ->>>>>>> woop ae ae aa @@ -44644,30 +44547,18 @@ aa aa aa ae -<<<<<<< refs/remotes/origin/master -======= -AY -AY ->>>>>>> woop CS CS CS CS CS CS -<<<<<<< refs/remotes/origin/master CS CS CS CS CS CS -======= -AY -AY -AY -AY ->>>>>>> woop ae aa aa @@ -44798,7 +44689,6 @@ aa aa aa ae -<<<<<<< refs/remotes/origin/master CS CS CS @@ -44811,20 +44701,6 @@ CS CS CS CS -======= -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY ->>>>>>> woop ae aa aa @@ -44955,7 +44831,6 @@ aa aa aa ae -<<<<<<< refs/remotes/origin/master CS CS CS @@ -44968,20 +44843,6 @@ CS CS CS CS -======= -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY ->>>>>>> woop ae aa aa @@ -45112,7 +44973,6 @@ aa aa aa aa -<<<<<<< refs/remotes/origin/master CS CS CS @@ -45125,20 +44985,6 @@ CS CS CS CS -======= -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY ->>>>>>> woop ae aa aa @@ -45269,7 +45115,6 @@ aa aa aa aa -<<<<<<< refs/remotes/origin/master CS CS CS @@ -45282,20 +45127,6 @@ CS CS CS CS -======= -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY ->>>>>>> woop ae aa aa @@ -45426,7 +45257,6 @@ aa aa aa aa -<<<<<<< refs/remotes/origin/master CS CS CS @@ -45438,19 +45268,6 @@ CS CS CS CS -======= -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY -AY ->>>>>>> woop ae ae aa