Fixes gamma armoury hatch cheese (#20479)

* Fixes gamma armoury hatch cheese

* mira fix
This commit is contained in:
S34N
2023-03-26 21:08:54 +01:00
committed by GitHub
parent e48f197865
commit fa040cdb65
8 changed files with 24 additions and 77 deletions
+1 -13
View File
@@ -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"
},
+1 -6
View File
@@ -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"
},
+1 -6
View File
@@ -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"
},
+1 -6
View File
@@ -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"
},
-2
View File
@@ -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!
@@ -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("<span class='notice'>[user] [welded ? null : "un"]welds [src]!</span>",\
"<span class='notice'>You [welded ? null : "un"]weld [src]!</span>",\
"<span class='warning'>You hear welding.</span>")
update_icon()
/obj/machinery/door/airlock/maintenance_hatch
name = "maintenance hatch"
icon = 'icons/obj/doors/airlocks/hatch/maintenance.dmi'
+16 -1
View File
@@ -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, "<span class='notice'>The electronic systems in this door are far too advanced for your primitive hacking peripherals.</span>")
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, "<span class='notice'>You start forcing [src] open...</span>")
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, "<span class='notice'>The electronic systems in this door are far too advanced for your primitive hacking peripherals.</span>")
return
+4 -4
View File
@@ -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)