Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

This commit is contained in:
izac112
2020-05-11 18:20:43 +02:00
295 changed files with 6398 additions and 3317 deletions

View File

@@ -38,13 +38,7 @@
operating = FORWARDS
setmove()
component_parts = list()
component_parts += new /obj/item/weapon/stock_parts/gear(src)
component_parts += new /obj/item/weapon/stock_parts/motor(src)
component_parts += new /obj/item/weapon/stock_parts/gear(src)
component_parts += new /obj/item/weapon/stock_parts/motor(src)
component_parts += new /obj/item/stack/cable_coil(src,5)
RefreshParts()
default_apply_parts()
/obj/machinery/conveyor/proc/setmove()
if(operating == FORWARDS)