Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac

code/game/jobs/job/silicon_vr.dm

@@ -1,4 +1,5 @@
 /datum/job/ai
+	disallow_jobhop = TRUE
 	pto_type = PTO_CIVILIAN
 
 /datum/job/cyborg

code/game/machinery/machinery.dm

@@ -312,6 +312,7 @@ Class Procs:
 		qdel(C)
 		C = new /obj/item/weapon/cell/high(src)
 		component_parts += C
+		RefreshParts()
 
 /obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R)
 	if(!istype(R))

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"

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

vorestation.dme

@@ -1398,6 +1398,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"