diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 7dc7b80bba4..9b413c7f713 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -87511,19 +87511,7 @@ /turf/simulated/floor/plating, /area/maintenance/port) "map" = ( -/obj/machinery/door/airlock/hatch/gamma{ - locked = 1; - req_access_txt = "1"; - power_state = 0 - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "Secure Gate"; - name = "Security Blast Door"; - opacity = 0 - }, -/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/impassable/gamma, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6dea8883013..6cd35393cc2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -72068,12 +72068,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "nwC" = ( -/obj/machinery/door/airlock/hatch/gamma{ - locked = 1; - req_access_txt = "1"; - power_state = 0 - }, -/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/impassable/gamma, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 2dce5e26432..36a45a94c2e 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -3605,12 +3605,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal/northeast) "auh" = ( -/obj/machinery/door/airlock/hatch/gamma{ - locked = 1; - req_access_txt = "1"; - power_state = 0 - }, -/obj/machinery/door/firedoor, /obj/structure/cable/orange{ d1 = 1; d2 = 4; @@ -3621,6 +3615,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/door/poddoor/impassable/gamma, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 10c3f790faf..ba409aa54e1 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1270,12 +1270,7 @@ }, /area/security/brig) "agt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hatch/gamma{ - locked = 1; - req_access_txt = "1"; - power_state = 0 - }, +/obj/machinery/door/poddoor/impassable/gamma, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm index d1649bf8c66..221ac50196e 100644 --- a/code/datums/spells/knock.dm +++ b/code/datums/spells/knock.dm @@ -26,8 +26,6 @@ INVOKE_ASYNC(src, PROC_REF(try_open_closet), C) /obj/effect/proc_holder/spell/aoe/knock/proc/try_open_airlock(obj/machinery/door/door) - if(istype(door, /obj/machinery/door/airlock/hatch/gamma)) - return if(istype(door, /obj/machinery/door/airlock)) var/obj/machinery/door/airlock/A = door A.unlock(TRUE) //forced because it's magic! diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index d1965569f89..0da10949fa3 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -383,45 +383,6 @@ hackProof = TRUE aiControlDisabled = AICONTROLDISABLED_ON -/obj/machinery/door/airlock/hatch/gamma - name = "gamma level hatch" - hackProof = TRUE - aiControlDisabled = AICONTROLDISABLED_ON - resistance_flags = FIRE_PROOF | ACID_PROOF - is_special = TRUE - -/obj/machinery/door/airlock/hatch/gamma/attackby(obj/C, mob/user, params) - if(!issilicon(user)) - if(isElectrified()) - if(shock(user, 75)) - return - if(istype(C, /obj/item/detective_scanner)) - return - - if(istype(C, /obj/item/grenade/plastic/c4)) - to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") - return - - if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/rcd)) - to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") - return - - add_fingerprint(user) - -/obj/machinery/door/airlock/hatch/gamma/welder_act(mob/user, obj/item/I) - if(shock_user(user, 75)) - return - if(operating || !density) - return - . = TRUE - if(!I.use_tool(src, user, 0, amount = 0, volume = I.tool_volume)) - return - welded = !welded - visible_message("[user] [welded ? null : "un"]welds [src]!",\ - "You [welded ? null : "un"]weld [src]!",\ - "You hear welding.") - update_icon() - /obj/machinery/door/airlock/maintenance_hatch name = "maintenance hatch" icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi' diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 4bb6e45470b..9ee25f55f1e 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -26,6 +26,15 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF move_resist = INFINITY +/obj/machinery/door/poddoor/impassable/gamma + name = "gamma armory hatch" + +/obj/machinery/door/poddoor/impassable/hostile_lockdown() + return + +/obj/machinery/door/poddoor/impassable/disable_lockdown() + return + /obj/machinery/door/poddoor/impassable/emag_act(mob/user) to_chat(user, "The electronic systems in this door are far too advanced for your primitive hacking peripherals.") return @@ -63,7 +72,7 @@ /obj/machinery/door/poddoor/try_to_crowbar(mob/user, obj/item/I) if(!density) return - if(!hasPower()) + if(!hasPower() && !(resistance_flags & INDESTRUCTIBLE)) to_chat(user, "You start forcing [src] open...") if(do_after(user, 50 * I.toolspeed, target = src)) if(!hasPower()) @@ -140,6 +149,12 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF move_resist = INFINITY +/obj/machinery/door/poddoor/multi_tile/impassable/hostile_lockdown() + return + +/obj/machinery/door/poddoor/multi_tile/impassable/disable_lockdown() + return + /obj/machinery/door/poddoor/multi_tile/impassable/emag_act(mob/user) to_chat(user, "The electronic systems in this door are far too advanced for your primitive hacking peripherals.") return diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm index 7aebd90e4db..59943b843f6 100644 --- a/code/modules/admin/misc_admin_procs.dm +++ b/code/modules/admin/misc_admin_procs.dm @@ -823,14 +823,14 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space if(GLOB.gamma_ship_location == 1) fromArea = locate(/area/shuttle/gamma/space) toArea = locate(/area/shuttle/gamma/station) - for(var/obj/machinery/door/airlock/hatch/gamma/H in GLOB.airlocks) - H.unlock(TRUE) + for(var/obj/machinery/door/poddoor/impassable/gamma/H in GLOB.airlocks) + H.open() GLOB.major_announcement.Announce("Central Command has deployed the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') else fromArea = locate(/area/shuttle/gamma/station) toArea = locate(/area/shuttle/gamma/space) - for(var/obj/machinery/door/airlock/hatch/gamma/H in GLOB.airlocks) - H.lock(TRUE) + for(var/obj/machinery/door/poddoor/impassable/gamma/H in GLOB.airlocks) + H.close() //DOOR STUCK GLOB.major_announcement.Announce("Central Command has recalled the Gamma Armory shuttle.", new_sound = 'sound/AI/commandreport.ogg') fromArea.move_contents_to(toArea)