cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further door fixes

Browse Source
This commit is contained in:
Markolie
2015-03-03 19:26:12 +01:00
parent 3f7e07101f
commit d727b93cc0
3 changed files with 66 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+40 -52
View File
@@ -537,12 +537,12 @@ About the new airlock wires panel:
var/commands[0]
commands[++commands.len] = list("name" = "IdScan", "command"= "idscan", "active" = !aiDisabledIdScanner, "enabled" = "Enabled", "disabled" = "Disable", "danger" = 0, "act" = 1)
commands[++commands.len] = list("name" = "Bolts", "command"= "bolts", "active" = !locked, "enabled" = "Raised ", "disabled" = "Dropped", "danger" = 0, "act" = 0)
commands[++commands.len] = list("name" = "Bolts", "command"= "bolts", "active" = !locked, "enabled" = "Raised", "disabled" = "Dropped", "danger" = 0, "act" = 0)
commands[++commands.len] = list("name" = "Bolt Lights", "command"= "lights", "active" = lights, "enabled" = "Enabled", "disabled" = "Disable", "danger" = 0, "act" = 1)
commands[++commands.len] = list("name" = "Safeties", "command"= "safeties", "active" = safe, "enabled" = "Nominal", "disabled" = "Overridden", "danger" = 1, "act" = 0)
commands[++commands.len] = list("name" = "Timing", "command"= "timing", "active" = normalspeed, "enabled" = "Nominal", "disabled" = "Overridden", "danger" = 1, "act" = 0)
commands[++commands.len] = list("name" = "Door State", "command"= "open", "active" = density, "enabled" = "Closed", "disabled" = "Opened", "danger" = 0, "act" = 0)
commands[++commands.len] = list("name" = "Emergency Access", "command"= "emergency", "active" = emergency, "enabled" = "Enabled", "disabled" = "Disabled", "danger" = 0, "act" = 0)
commands[++commands.len] = list("name" = "Emergency Access", "command"= "emergency", "active" = !emergency, "enabled" = "Disabled", "disabled" = "Enabled", "danger" = 0, "act" = 0)
data["commands"] = commands
@@ -872,77 +872,65 @@ About the new airlock wires panel:
if(!forced)
if( !arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_OPEN_DOOR) )
return 0
use_power(50)
if(forced)
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/glass))
use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/mime))
else
playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
src.closeOther.close()
// This worries me - N3X
if(autoclose && normalspeed)
spawn(150)
autoclose()
else if(autoclose && !normalspeed)
spawn(5)
autoclose()
// </worry>
return ..()
/obj/machinery/door/airlock/close(var/forced=0)
if(operating || welded || locked)
return
if(!forced)
if( !arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS) )
//despite the name, this wire is for general door control.
//Bolts are already covered by the check for locked, above
if( !arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_OPEN_DOOR) )
return
if(safe)
for(var/turf/turf in locs)
if(locate(/mob/living) in turf)
// playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0) //THE BUZZING IT NEVER STOPS -Pete
spawn (60)
autoclose()
close()
return
use_power(50)
if(forced)
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/glass))
for(var/turf/turf in locs)
for(var/mob/living/M in turf)
if(isrobot(M))
M.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
else
M.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
M.SetStunned(5)
M.SetWeakened(5)
var/obj/effect/stop/S
S = new /obj/effect/stop
S.victim = M
S.loc = M.loc
spawn(20)
del(S)
if (ishuman(M))
var/mob/living/carbon/human/H = M
if (!(H.species && (H.species.flags & NO_PAIN)))
M.emote("scream")
var/turf/location = src.loc
if(istype(location, /turf/simulated))
location.add_blood(M)
use_power(360) //360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/mime))
else
playsound(get_turf(src), 'sound/machines/airlock.ogg', 30, 1)
for(var/turf/T in loc)
var/obj/structure/window/W = locate(/obj/structure/window) in T
if (W)
W.destroy()
if(density)
return 1
operating = 1
do_animate("closing")
src.layer = 3.1
sleep(5)
src.density = 1
if(!safe)
crush()
sleep(5)
update_icon()
if(visible && !glass)
SetOpacity(1)
operating = 0
update_nearby_tiles()
if(locate(/mob/living) in get_turf(src))
open()
playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
for(var/turf/turf in locs)
var/obj/structure/window/killthis = (locate(/obj/structure/window) in turf)
if(killthis)
killthis.ex_act(2)//Smashin windows
..()
return
//I shall not add a check every x ticks if a door has closed over some fire.
var/obj/fire/fire = locate() in loc
if(fire)
code/game/machinery/doors/door.dm
+21 -24
View File
@@ -1,4 +1,6 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
#define DOOR_OPEN_LAYER 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6
#define DOOR_CLOSED_LAYER 3.1 //Above most items if closed
/obj/machinery/door
name = "Door"
@@ -8,7 +10,9 @@
anchored = 1
opacity = 1
density = 1
layer = 2.7
layer = DOOR_OPEN_LAYER
var/open_layer = DOOR_OPEN_LAYER
var/closed_layer = DOOR_CLOSED_LAYER
var/visible = 1
var/p_open = 0
@@ -28,11 +32,11 @@
/obj/machinery/door/New()
. = ..()
if(density)
layer = 3.1 //Above most items if closed
layer = closed_layer
explosion_resistance = initial(explosion_resistance)
update_heat_protection(get_turf(src))
else
layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6
layer = open_layer
explosion_resistance = 0
@@ -221,28 +225,24 @@
return
/obj/machinery/door/proc/open()
if(!density)
return 1
if(operating > 0)
return
if(!ticker)
return 0
if(!density) return 1
if(operating > 0) return
if(!ticker) return 0
if(!operating) operating = 1
do_animate("opening")
icon_state = "door0"
src.SetOpacity(0)
sleep(5)
sleep(10)
src.layer = open_layer
src.density = 0
sleep(5)
src.layer = 2.7
explosion_resistance = 0
update_icon()
SetOpacity(0)
operating = 0
update_nearby_tiles()
if(autoclose && normalspeed)
if(operating) operating = 0
if(autoclose && normalspeed)
spawn(150)
autoclose()
if(autoclose && !normalspeed)
@@ -253,18 +253,15 @@
/obj/machinery/door/proc/close()
if(density)
return 1
if(operating > 0)
return
if(density) return 1
if(operating > 0) return
operating = 1
do_animate("closing")
explosion_resistance = initial(explosion_resistance)
src.layer = 3.1
sleep(5)
src.density = 1
sleep(5)
explosion_resistance = initial(explosion_resistance)
src.layer = closed_layer
do_animate("closing")
sleep(10)
update_icon()
if(visible && !glass)
SetOpacity(1) //caaaaarn!
nano/templates/door_control.tmpl
+5 -1
View File
@@ -2,6 +2,10 @@
.fixedCell {
width: 78px;
}
.fixedCellWide {
width: 120px;
}
.link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton {
min-width: 70px;
@@ -57,7 +61,7 @@
<table>
{{for data.commands}}
<tr>
<td class='itemLabel fixedCell'>{{:value.name}}:</td>
<td class='itemLabel fixedCellWide'>{{:value.name}}:</td>
<td class='fixedCell'>{{:helper.link(value.enabled, null, {'command' : value.command, 'activate' : value.act ? 1 : 0}, null, value.active ? 'selected' : null)}}</td>
<td class='fixedCell'>{{:helper.link(value.disabled,null, {'command' : value.command, 'activate' : value.act ? 0 : 1}, null,!value.active ? (value.danger ? 'redButton' : 'selected') : null)}}</td>
</tr>