cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts. Adds water bottle to the machine coz logic.

Browse Source
This commit is contained in:
Ketrai
2020-01-07 23:07:50 +01:00
parent 9112a9a2b6
commit c8531c827f
3 changed files with 4 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending_vr.dm
+2 -1
View File
@@ -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
code/modules/food/food/snacks_vr.dm
+1 -1
View File
@@ -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()
maps/tether/tether-07-station3.dmm
+1 -184
View File
@@ -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