diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm index b1b00f10d57..61f8ea231df 100644 --- a/_maps/shuttles/infiltrator_basic.dmm +++ b/_maps/shuttles/infiltrator_basic.dmm @@ -382,11 +382,11 @@ "bK" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner, /obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/medical) "bM" = ( @@ -397,8 +397,8 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/airlock/hatch, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/engineering) "bO" = ( @@ -629,12 +629,12 @@ /turf/open/floor/iron/dark, /area/shuttle/syndicate/engineering) "lm" = ( -/obj/machinery/door/airlock/hatch, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/turf_decal/stripes/red/line{ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate, /turf/open/floor/iron/dark, /area/shuttle/syndicate/bridge) "lo" = ( @@ -645,8 +645,8 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/airlock/hatch, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/syndicate/eva) "lJ" = ( @@ -1068,9 +1068,9 @@ /area/shuttle/syndicate/airlock) "Tu" = ( /obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/airlock/hatch, /obj/effect/turf_decal/stripes/red/line, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate, /turf/open/floor/iron/dark, /area/shuttle/syndicate/hallway) "TD" = ( diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index bb32515c5a1..24c52bda672 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -1857,7 +1857,7 @@ /area/shuttle/sbc_starfury) "hc" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters{ +/obj/machinery/door/poddoor/shutters/syndicate{ id = "syndie_battlecruiser_mech" }, /turf/open/floor/pod/light, @@ -2182,12 +2182,11 @@ /area/shuttle/sbc_starfury) "hX" = ( /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/highsecurity{ - id_tag = "syndie_battlecruiser_armory"; - name = "Starfury Armory" - }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/highsecurity/syndicate{ + name = "Starfury Armory" + }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) "hZ" = ( @@ -4389,11 +4388,11 @@ /area/shuttle/sbc_starfury) "Ay" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters{ - id = "syndie_battlecruiser_mech" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/poddoor/shutters/syndicate{ + id = "syndie_battlecruiser_mech" + }, /turf/open/floor/pod/light, /area/shuttle/sbc_starfury) "AF" = ( @@ -5814,12 +5813,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/door/airlock/highsecurity{ - id_tag = "syndie_battlecruiser_armory"; - name = "Starfury Armory" - }, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/highsecurity/syndicate{ + name = "Starfury Armory" + }, /turf/open/floor/iron/dark, /area/shuttle/sbc_starfury) "ZR" = ( diff --git a/_maps/templates/lazy_templates/nukie_base.dmm b/_maps/templates/lazy_templates/nukie_base.dmm index 537fe8fda84..d025553bd8d 100644 --- a/_maps/templates/lazy_templates/nukie_base.dmm +++ b/_maps/templates/lazy_templates/nukie_base.dmm @@ -1181,11 +1181,11 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, -/obj/machinery/door/poddoor/shutters{ +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/shutters/syndicate{ id = "FBBZ1"; name = "Security Shutters" }, -/obj/structure/fans/tiny, /turf/open/floor/mineral/titanium, /area/centcom/syndicate_mothership/control) "nk" = ( @@ -1627,7 +1627,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/wideplating, -/obj/machinery/door/poddoor/shutters/indestructible{ +/obj/machinery/door/poddoor/shutters/syndicate/indestructible{ name = "Subterrainian Cargo Lift" }, /turf/open/floor/iron/dark/textured_half, @@ -2390,12 +2390,9 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 }, -/obj/machinery/door/poddoor/shutters/window{ - id = "FBBZ1"; - name = "Security Shutters" - }, /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/door/poddoor/shutters/syndicate, /turf/open/floor/iron, /area/centcom/syndicate_mothership/control) "AO" = ( @@ -3672,10 +3669,10 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, -/obj/machinery/door/airlock/highsecurity{ +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate{ name = "Sky Bridge" }, -/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, /turf/open/floor/iron/textured_large, /area/centcom/syndicate_mothership/control) "Oc" = ( @@ -3813,11 +3810,11 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, -/obj/machinery/door/airlock/highsecurity{ - name = "Sky Bridge" - }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate{ + name = "Sky Bridge" + }, /turf/open/floor/iron/textured_large, /area/centcom/syndicate_mothership/control) "OX" = ( @@ -4354,11 +4351,11 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, -/obj/machinery/door/airlock/highsecurity{ - name = "Sky Bridge" - }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/machinery/door/airlock/highsecurity/syndicate{ + name = "Sky Bridge" + }, /turf/open/floor/iron/textured_large, /area/centcom/syndicate_mothership/control) "TS" = ( diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 883084e6c9a..edce48f662d 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -2400,6 +2400,10 @@ security_level = 1 damage_deflection = 30 +/obj/machinery/door/airlock/highsecurity/syndicate + icon = 'icons/obj/doors/airlocks/syndicate/highsec.dmi' + overlays_file = null + // Shuttle Airlocks /obj/machinery/door/airlock/shuttle diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 46370354003..72c5f4f5eed 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -99,3 +99,15 @@ icon_state = "open" density = FALSE opacity = FALSE + +/obj/machinery/door/poddoor/shutters/syndicate + icon = 'icons/obj/doors/syndicateshutters.dmi' + +/obj/machinery/door/poddoor/shutters/syndicate/preopen + icon_state = "open" + density = FALSE + opacity = FALSE + +/obj/machinery/door/poddoor/shutters/syndicate/indestructible + name = "hardened syndicate shutters" + resistance_flags = INDESTRUCTIBLE diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index b1432f16701..26a1861af2f 100644 Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ diff --git a/icons/obj/doors/airlocks/syndicate/highsec.dmi b/icons/obj/doors/airlocks/syndicate/highsec.dmi new file mode 100644 index 00000000000..fe54b6826cc Binary files /dev/null and b/icons/obj/doors/airlocks/syndicate/highsec.dmi differ diff --git a/icons/obj/doors/syndicateshutters.dmi b/icons/obj/doors/syndicateshutters.dmi new file mode 100644 index 00000000000..ea4453bf0cc Binary files /dev/null and b/icons/obj/doors/syndicateshutters.dmi differ