Merge remote-tracking branch 'origin/master' into hardsync-1.5

2021-03-07 13:04:36 +08:00
parent 2de08b7bae 6606a15367
commit 22b33d1a6e
16 changed files with 103 additions and 23 deletions
@@ -584,6 +584,9 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 /obj/structure/window/plasma/reinforced/unanchored
 	anchored = FALSE

+/obj/structure/window/plasma/reinforced/BlockSuperconductivity()
+	return TRUE
+
 /obj/structure/window/reinforced/tinted
 	name = "tinted window"
 	icon_state = "twindow"