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

This commit is contained in:
Fox McCloud
2019-09-10 07:09:30 -04:00
32 changed files with 738 additions and 420 deletions
@@ -160,7 +160,7 @@
RefreshParts()
//NanoMed
/obj/machinery/vending/wallmed1/survival_pod
/obj/machinery/vending/wallmed/survival_pod
name = "survival pod medical supply"
desc = "Wall-mounted Medical Equipment dispenser. This one seems just a tiny bit smaller."
req_access = list()