Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel

This commit is contained in:
DeltaFire
2020-11-16 04:29:43 +01:00
12 changed files with 6479 additions and 7756 deletions
@@ -40,7 +40,7 @@
/datum/crafting_recipe/floorbot
name = "Floorbot"
result = /mob/living/simple_animal/bot/floorbot
reqs = list(/obj/item/storage/toolbox/mechanical = 1,
reqs = list(/obj/item/storage/toolbox = 1,
/obj/item/stack/tile/plasteel = 1,
/obj/item/assembly/prox_sensor = 1,
/obj/item/bodypart/r_arm/robot = 1)