Merge branch 'master' into SpaceRuins

2020-02-25 16:51:39 +13:00
parent 6624155e3d acf78d4b2d
commit fc85f62546
94 changed files with 2078 additions and 1705 deletions
@@ -31389,6 +31389,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/effect/landmark/start/paramedic,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bzg" = (
@@ -55013,6 +55014,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"jUN" = (
+/obj/effect/landmark/start/paramedic,
+/turf/open/floor/plasteel/white,
+/area/medical/sleeper)
 "jVl" = (
 /obj/structure/cable{
 	icon_state = "4-8"