From 34dafd1d58393630c7d917176dcb2dbef8871f24 Mon Sep 17 00:00:00 2001 From: H0lySquirr3l <34927367+H0lySquirr3l@users.noreply.github.com> Date: Tue, 9 Jun 2020 09:05:56 -0500 Subject: [PATCH] Adds in Food cart to the kitchen. (#8238) * Add files via upload * Add files via upload * Add files via upload * Add files via upload --- .../objects/structures/kitchen_foodcart_vr.dm | 42 ++++++++++++++++++ icons/obj/kitchen_vr.dmi | Bin 0 -> 1159 bytes maps/tether/tether-03-surface3.dmm | 7 ++- vorestation.dme | 1 + 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 code/game/objects/structures/kitchen_foodcart_vr.dm create mode 100644 icons/obj/kitchen_vr.dmi diff --git a/code/game/objects/structures/kitchen_foodcart_vr.dm b/code/game/objects/structures/kitchen_foodcart_vr.dm new file mode 100644 index 00000000000..2e9d65d9705 --- /dev/null +++ b/code/game/objects/structures/kitchen_foodcart_vr.dm @@ -0,0 +1,42 @@ +/obj/structure/foodcart + name = "Foodcart" + icon = 'icons/obj/kitchen_vr.dmi' + icon_state = "foodcart-0" + desc = "The ultimate in food transport! When opened you notice two compartments with odd blue glows to them. One feels very warm, while the other is very cold." + anchored = 0 + opacity = 0 + density = 1 + +/obj/structure/foodcart/Initialize() + . = ..() + for(var/obj/item/I in loc) + if(istype(I, /obj/item/weapon/reagent_containers/food)) + I.loc = src + update_icon() + +/obj/structure/foodcart/attackby(obj/item/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/reagent_containers/food)) + user.drop_item() + O.loc = src + update_icon() + else + return + +/obj/structure/foodcart/attack_hand(var/mob/user as mob) + if(contents.len) + var/obj/item/weapon/reagent_containers/food/choice = input("What would you like to grab from the cart?") as null|obj in contents + if(choice) + if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) + return + if(ishuman(user)) + if(!user.get_active_hand()) + user.put_in_hands(choice) + else + choice.loc = get_turf(src) + update_icon() + +/obj/structure/foodcart/update_icon() + if(contents.len < 5) + icon_state = "foodcart-[contents.len]" + else + icon_state = "foodcart-5" \ No newline at end of file diff --git a/icons/obj/kitchen_vr.dmi b/icons/obj/kitchen_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..29b0b536bdd236c3fc2b8a7becf7eb96a0dcc5ff GIT binary patch literal 1159 zcmV;21bF+2P)E0w^L5S65g6|Nj&a24-0ruAX8iCnq5xA@A?+ zivkuaCn7K_Ch*KH?AUp?5(+6I9ML2eo(K^i8Wqsc&=?sXB_}Y4cRzv+03;+Nm4rnC zm;9R$0Nxb<0GafFDZ*Bkpc$`yKaB_9`^iy#0_2eo` zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+Ek8dcIkBij*FcGj zGbOXA7$|7S#hF%=n41b=V=6TyUa1lBN{xwEYC^nHQ(Q`w6?nKUiu9e^etL3=22O@FLwC*;uUB>c(6Xw=3n%eHqoH3<^NgKiSW94h2E`o+_S z@ZpdUMoj!L@pO|g$Ki@S{tWAX{s2ygL&{9T7_N^Xuaio!$9a7(4(C7#pBAU*fv20K zBhL4n|0*_UC*gd&&l!8kCtf*=e_MPyr69LG`Q`cz2b{4PV`+j4EWnPlw^=-yqQDtzsPZ5M zIzs{0kc57OlwZRsF3~9js=N?*vuiBDOhbPj#ke{P7aDC1pu$mraqV66uh94Bb33x4 z$g<{s`B$RKn+iOS@m=DQB7DExB2^CW_%-zKWtu41dR$mHytoS}{qY5N1c@b_|WrpR?eE8MYWh$YIr zuk{Ll-_!ac#UZ?pyf5Kk=)FNv!JwxbM{+!LL&Cv;0ch1B9N+-1SBG$dGKd^?!cRW| z-Pn4u|39AJ@9$N4>F+<({yxjl7wr1~#R2@Il$ZYg(^BsLZ$95__+&Dj3OM_+#ix7y z!7W>TT}l0a{w+U@qkUhmm&@h8zrQ8<_gw1#^B?&^oVD}^bd|5D(BD(@CtiX!PFs29 zT}`~R#Qq*Rvg3Jej(@Fxi~T+F#h*nx|GQwT^{V1``iFCWaPAMz{lU3EIQIu#a5!my Z@DFG~S002ovPDHLkV1mMm2Lb>9 literal 0 HcmV?d00001 diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 05d3f4927a6..e3f7c292928 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -31880,6 +31880,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"uNM" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/foodcart, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "uOc" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -48250,7 +48255,7 @@ asN atb atn asO -asO +uNM aup auR avr diff --git a/vorestation.dme b/vorestation.dme index ab2095fcfb8..d8f2911a7d1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1363,6 +1363,7 @@ #include "code\game\objects\structures\holoplant.dm" #include "code\game\objects\structures\inflatable.dm" #include "code\game\objects\structures\janicart.dm" +#include "code\game\objects\structures\kitchen_foodcart_vr.dm" #include "code\game\objects\structures\kitchen_spike.dm" #include "code\game\objects\structures\lattice.dm" #include "code\game\objects\structures\ledges.dm"