Merge branch 'ParadiseSS13:master' into cyberiad-add-apc

.github/CONTRIBUTING.md

@@ -385,7 +385,7 @@ Look for code examples on how to properly use it.
 
 //Good
 /datum/datum1/proc/proc1(target)
-    addtimer(CALLBACK(target, .proc/dothing, arg1, arg2, arg3), 5 SECONDS)
+    addtimer(CALLBACK(target, PROC_REF(dothing), arg1, arg2, arg3), 5 SECONDS)
 ```
 
 ### Operators
@@ -747,6 +747,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 
 * [AffectedArc07](https://github.com/AffectedArc07)
 * [Charliminator](https://github.com/hal9000PR)
+* [lewcc](https://github.com/lewcc)
 * [S34N](https://github.com/S34NW)
 
 ---

_maps/map_files/Delta/delta.dmm

@@ -13356,7 +13356,7 @@
 /area/station/public/storage/art)
 "aPT" = (
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "aPU" = (
 /obj/structure/table/wood,
@@ -14041,7 +14041,7 @@
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance/eight,
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/plasteel{
+/turf/simulated/floor/plasteel/airless{
 	dir = 10;
 	icon_state = "darkblue"
 	},
@@ -15433,7 +15433,7 @@
 /area/station/hallway/primary/fore)
 "aUA" = (
 /obj/effect/landmark/damageturf,
-/turf/simulated/floor/plasteel{
+/turf/simulated/floor/plasteel/airless{
 	dir = 5;
 	icon_state = "darkblue"
 	},
@@ -26640,15 +26640,9 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/central)
-"btI" = (
-/obj/structure/closet/emcloset,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
-/area/space/nearstation)
 "btJ" = (
-/obj/structure/closet/firecloset,
-/obj/effect/decal/warning_stripes/yellow,
-/turf/simulated/floor/plasteel,
+/obj/structure/grille,
+/turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "btK" = (
 /obj/machinery/hologram/holopad,
@@ -89955,10 +89949,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
-"oEG" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/space/nearstation)
 "oFL" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -142043,9 +142033,9 @@ cpO
 aXY
 bsr
 bsv
-btI
-btI
-btJ
+bxi
+bxi
+bvV
 bwf
 bDU
 bEc
@@ -149985,7 +149975,7 @@ abj
 aaa
 abj
 abj
-oEG
+btJ
 aaa
 ygH
 tFK
@@ -150242,7 +150232,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 abj
 ygH
 aJx
@@ -150499,7 +150489,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 ygH
 uUu
@@ -153377,7 +153367,7 @@ nlB
 aaa
 abj
 abj
-oEG
+btJ
 abj
 abj
 csj
@@ -153891,7 +153881,7 @@ aaa
 aaa
 aaa
 abj
-oEG
+btJ
 abj
 abj
 csj
@@ -154406,7 +154396,7 @@ aaa
 aaa
 abj
 abj
-dij
+btJ
 abj
 csj
 rEQ
@@ -156439,10 +156429,10 @@ aaa
 aaa
 abj
 abj
-oEG
-oEG
-oEG
-oEG
+btJ
+btJ
+btJ
+btJ
 abj
 abj
 fhF
@@ -156701,7 +156691,7 @@ aaa
 abj
 abj
 aaa
-oEG
+btJ
 fhF
 fhF
 fhF
@@ -156711,7 +156701,7 @@ fhF
 fhF
 abj
 abj
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -156955,10 +156945,10 @@ aaa
 abj
 abj
 abj
-oEG
-oEG
-oEG
-oEG
+btJ
+btJ
+btJ
+btJ
 fhF
 fhF
 fhF
@@ -156968,7 +156958,7 @@ fhF
 fhF
 abj
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -157225,7 +157215,7 @@ fhF
 fhF
 abj
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -157472,17 +157462,17 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 fhF
 fhF
 fhF
 fhF
 fhF
 fhF
 fhF
-oEG
+btJ
 abj
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -157723,21 +157713,21 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 fhF
 fhF
 fhF
 fhF
 fhF
 fhF
 fhF
-oEG
+btJ
 abj
 abj
 aaa
@@ -157980,20 +157970,20 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
 aaa
 aaa
 bPS
-oEG
-oEG
+btJ
+btJ
 abj
 bPS
 abj
-oEG
-oEG
+btJ
+btJ
 bPS
 aaa
 aaa
@@ -158237,7 +158227,7 @@ aaa
 aaa
 aaa
 aaa
-oEG
+btJ
 aaa
 aaa
 aaa
@@ -158502,11 +158492,11 @@ aaa
 aaa
 aaa
 aaa
-oEG
-oEG
-oEG
-oEG
-oEG
+btJ
+btJ
+btJ
+btJ
+btJ
 aaa
 aaa
 aaa