New sound for forcing airlocks to open/close

sound/machines/airlockforced.ogg

Conflicts:
	code/game/machinery/doors/airlock.dm
This commit is contained in:
ikarrus
2014-06-20 14:33:09 -04:00
committed by ZomgPonies
parent 7805a61dab
commit 7f4aaa6e44
2 changed files with 10 additions and 5 deletions
+10 -5
View File
@@ -1177,9 +1177,11 @@ About the new airlock wires panel:
if( !arePowerSystemsOn() || (stat & NOPOWER) || isWireCut(AIRLOCK_WIRE_OPEN_DOOR) )
return 0
use_power(50)
if(istype(src, /obj/machinery/door/airlock/glass))
if(forced)
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
if(istype(src, /obj/machinery/door/airlock/clown))
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
else
playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
@@ -1193,6 +1195,7 @@ About the new airlock wires panel:
spawn(5)
autoclose()
// </worry>
return ..()
/obj/machinery/door/airlock/close(var/forced=0)
@@ -1229,9 +1232,11 @@ About the new airlock wires panel:
location.add_blood(M)
use_power(50)
if(istype(src, /obj/machinery/door/airlock/glass))
if(forced)
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1)
if(istype(src, /obj/machinery/door/airlock/clown))
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
else
playsound(get_turf(src), 'sound/machines/airlock.ogg', 30, 1)
@@ -1337,4 +1342,4 @@ About the new airlock wires panel:
src.update_icon()
return
else
return
return