cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update airlock.dm

Browse Source
This commit is contained in:
Raeschen
2023-07-07 09:44:18 +02:00
committed by GitHub
parent e62d81af4b
commit 2f18b1dc41
1 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/game/machinery/doors/airlock.dm
View File

@@ -256,11 +256,8 @@
explosion_resistance = 5
opacity = 0
glass = 1
<<<<<<< HEAD
open_sound_powered = 'sound/machines/hall1o.ogg' //CHOMPEdit
close_sound_powered = 'sound/machines/hall1c.ogg' //CHOMPEdit
=======
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
/obj/machinery/door/airlock/centcom
name = "Centcom Airlock"
@@ -384,11 +381,7 @@
close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
department_open_powered = 'sound/machines/door/sec1o.ogg'
department_close_powered = 'sound/machines/door/sec1c.ogg'
<<<<<<< HEAD
security_level = 2 //VOREStation Additio
=======
security_level = 2 //VOREStation Addition
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
/obj/machinery/door/airlock/glass_medical
name = "Medical Airlock"
@@ -1009,14 +1002,9 @@ About the new airlock wires panel:
..(user)
return
<<<<<<< HEAD
/* // CHOMPEDIT: disabling becaue alt-clicking to view a turf is pretty important.
/obj/machinery/door/airlock/AltClick(mob/user as mob)
=======
/obj/machinery/door/airlock/AltClick(mob/user as mob)
. = ..()
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!Adjacent(user))
return
@@ -1026,29 +1014,18 @@ About the new airlock wires panel:
if(icon_state == "door_closed" && arePowerSystemsOn())
flick("door_deny", src)
playsound(src, knock_hammer_sound, 50, 0, 3)
<<<<<<< HEAD
else if(arePowerSystemsOn())
=======
else if(arePowerSystemsOn() && user.a_intent == I_HELP)
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
else if(arePowerSystemsOn()) //ChompEDIT - removed intent check
src.visible_message("[user] presses the door bell on \the [src].", "\The [src]'s bell rings.")
src.add_fingerprint(user)
if(icon_state == "door_closed")
flick("door_deny", src)
playsound(src, knock_sound, 50, 0, 3)
<<<<<<< HEAD
else
=======
else if(user.a_intent == I_HELP)
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
else //ChompEDIT - removed intent check
src.visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].")
src.add_fingerprint(user)
playsound(src, knock_unpowered_sound, 50, 0, 3)
return
<<<<<<< HEAD
*/
=======
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
*/ //ChompEDIT - disable end
/obj/machinery/door/airlock/tgui_act(action, params)
if(..())
@@ -1184,14 +1161,6 @@ About the new airlock wires panel:
if (stat & BROKEN)
to_chat(usr, "<span class='warning'>The panel is broken and cannot be closed.</span>")
else
<<<<<<< HEAD
src.p_open = 0
playsound(src, C.usesound, 50, 1)
else
src.p_open = 1
playsound(src, C.usesound, 50, 1)
src.update_icon()
=======
src.p_open = FALSE
playsound(src, C.usesound, 50, 1)
src.update_icon()
@@ -1201,7 +1170,6 @@ About the new airlock wires panel:
playsound(src, C.usesound, 50, 1)
src.update_icon()
return src.attack_hand(user)
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
else if(C.is_wirecutter())
return src.attack_hand(user)
else if(istype(C, /obj/item/device/multitool))
@@ -1284,11 +1252,7 @@ About the new airlock wires panel:
..()
/obj/machinery/door/airlock/set_broken()
<<<<<<< HEAD
src.p_open = 1
=======
src.p_open = TRUE
>>>>>>> e047e89ba7... Merge pull request #14638 from VOREStation/upstream-merge-9002
stat |= BROKEN
if (secured_wires)
lock()