Merge remote-tracking branch 'upstream/master' into universal-damage

This commit is contained in:
Fox McCloud
2019-09-14 21:15:31 -04:00
212 changed files with 2977 additions and 1726 deletions
@@ -272,7 +272,6 @@
new /obj/item/sensor_device(src)
new /obj/item/key/ambulance(src)
new /obj/item/pinpointer/crew(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/handheld_defibrillator(src)
/obj/structure/closet/secure_closet/reagents