Merge branch 'master' into embed-changes

This commit is contained in:
Timothy Teakettle
2020-06-17 16:40:34 +01:00
committed by GitHub
100 changed files with 2831 additions and 264634 deletions
@@ -491,7 +491,7 @@
/obj/item/kitchen/knife = 5,
/obj/item/screwdriver = 5,
/obj/item/crowbar/red = 1, //Dont you need a crowbar to open this?
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/suture = 3,
/obj/item/reagent_containers/food/drinks/bottle/vodka = 2,
/obj/item/radio = 5,
/obj/item/flashlight = 4,