Updates references

- Changed referenced to old blastdoor type to new type, removing compile errors
- Fixes small issue in blast door file which caused compile error
This commit is contained in:
Atlantiscze
2014-12-27 00:03:20 +01:00
parent 30f4ad1077
commit 07b5b7af8b
9 changed files with 28 additions and 28 deletions

View File

@@ -485,7 +485,7 @@
/obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened! /obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened!
if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard))) if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
var/obj/machinery/door/D = M var/obj/machinery/door/D = M
if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard) && !istype(D,/obj/machinery/door/poddoor)) if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard) && !istype(D,/obj/machinery/door/blast))
D.open() D.open()
src.frustration = 0 src.frustration = 0
else if ((istype(M, /mob/living/)) && (!src.anchored)) else if ((istype(M, /mob/living/)) && (!src.anchored))

View File

@@ -724,7 +724,7 @@ Auto Patrol: []"},
/obj/machinery/bot/secbot/Bump(M as mob|obj) //Leave no door unopened! /obj/machinery/bot/secbot/Bump(M as mob|obj) //Leave no door unopened!
if((istype(M, /obj/machinery/door)) && !isnull(src.botcard)) if((istype(M, /obj/machinery/door)) && !isnull(src.botcard))
var/obj/machinery/door/D = M var/obj/machinery/door/D = M
if(!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard) && !istype(D,/obj/machinery/door/poddoor)) if(!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard) && !istype(D,/obj/machinery/door/blast))
D.open() D.open()
src.frustration = 0 src.frustration = 0
else if(!src.anchored) else if(!src.anchored)

View File

@@ -31,7 +31,7 @@
viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!" viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!"
return return
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if(M.id == id) if(M.id == id)
M.open() M.open()
@@ -43,7 +43,7 @@
M.drive() M.drive()
sleep(50) sleep(50)
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if(M.id == id) if(M.id == id)
M.close() M.close()
return return
@@ -181,7 +181,7 @@
time += tp time += tp
time = min(max(round(time), 0), 120) time = min(max(round(time), 0), 120)
if(href_list["door"]) if(href_list["door"])
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if(M.id == id) if(M.id == id)
if(M.density) if(M.density)
M.open() M.open()

View File

@@ -140,7 +140,7 @@ var/specops_shuttle_timeleft = 0
//Begin Marauder launchpad. //Begin Marauder launchpad.
spawn(0)//So it parallel processes it. spawn(0)//So it parallel processes it.
for(var/obj/machinery/door/poddoor/M in special_ops) for(var/obj/machinery/door/blast/M in special_ops)
switch(M.id) switch(M.id)
if("ASSAULT0") if("ASSAULT0")
spawn(10)//1 second delay between each. spawn(10)//1 second delay between each.
@@ -188,7 +188,7 @@ var/specops_shuttle_timeleft = 0
sleep(50)//Doors remain open for 5 seconds. sleep(50)//Doors remain open for 5 seconds.
for(var/obj/machinery/door/poddoor/M in special_ops) for(var/obj/machinery/door/blast/M in special_ops)
switch(M.id)//Doors close at the same time. switch(M.id)//Doors close at the same time.
if("ASSAULT0") if("ASSAULT0")
spawn(0) spawn(0)

View File

@@ -96,7 +96,7 @@
D.safe = 1 D.safe = 1
/obj/machinery/door_control/proc/handle_pod() /obj/machinery/door_control/proc/handle_pod()
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if(M.id == src.id) if(M.id == src.id)
if(M.density) if(M.density)
spawn(0) spawn(0)
@@ -171,7 +171,7 @@
active = 1 active = 1
icon_state = "launcheract" icon_state = "launcheract"
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if (M.id == src.id) if (M.id == src.id)
spawn( 0 ) spawn( 0 )
M.open() M.open()
@@ -185,7 +185,7 @@
sleep(50) sleep(50)
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if (M.id == src.id) if (M.id == src.id)
spawn( 0 ) spawn( 0 )
M.close() M.close()

View File

@@ -121,7 +121,7 @@ obj/machinery/door/blast/regular
icon_state_opening = "pdoorc1" icon_state_opening = "pdoorc1"
icon_state_closed = "pdoor1" icon_state_closed = "pdoor1"
icon_state_closing = "pdoorc0" icon_state_closing = "pdoorc0"
icon_state = icon_state_closed icon_state = "pdoor1"
maxhealth = 600 maxhealth = 600
// SUBTYPE: Shutters // SUBTYPE: Shutters
@@ -131,5 +131,5 @@ obj/machinery/door/blast/regular
icon_state_opening = "shutterc1" icon_state_opening = "shutterc1"
icon_state_closed = "shutter1" icon_state_closed = "shutter1"
icon_state_closing = "shutterc0" icon_state_closing = "shutterc0"
icon_state = icon_state_closed icon_state = "shutter1"
emitter_resistance = 20 emitter_resistance = 20

View File

@@ -790,7 +790,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if("Toggle Door") if("Toggle Door")
if(cartridge && cartridge.access_remote_door) if(cartridge && cartridge.access_remote_door)
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/blast/M in world)
if(M.id == cartridge.remote_door_id) if(M.id == cartridge.remote_door_id)
if(M.density) if(M.density)
M.open() M.open()

View File

@@ -34,7 +34,7 @@
anchored = 1 anchored = 1
density = 1 density = 1
var/obj/machinery/compressor/compressor var/obj/machinery/compressor/compressor
var/list/obj/machinery/door/poddoor/doors var/list/obj/machinery/door/blast/doors
var/id = 0 var/id = 0
var/door_status = 0 var/door_status = 0
@@ -222,7 +222,7 @@
if(id == C.comp_id) if(id == C.comp_id)
compressor = C compressor = C
doors = new /list() doors = new /list()
for(var/obj/machinery/door/poddoor/P in machines) for(var/obj/machinery/door/blast/P in machines)
if(P.id == id) if(P.id == id)
doors += P doors += P
@@ -296,7 +296,7 @@
else if( href_list["str"] ) else if( href_list["str"] )
src.compressor.starter = !src.compressor.starter src.compressor.starter = !src.compressor.starter
else if (href_list["doors"]) else if (href_list["doors"])
for(var/obj/machinery/door/poddoor/D in src.doors) for(var/obj/machinery/door/blast/D in src.doors)
if (door_status == 0) if (door_status == 0)
spawn( 0 ) spawn( 0 )
D.open() D.open()

View File

@@ -141,7 +141,7 @@
var/area/centcom/specops/special_ops = locate()//Where is the specops area located? var/area/centcom/specops/special_ops = locate()//Where is the specops area located?
//Begin Marauder launchpad. //Begin Marauder launchpad.
spawn(0)//So it parallel processes it. spawn(0)//So it parallel processes it.
for(var/obj/machinery/door/poddoor/M in special_ops) for(var/obj/machinery/door/blast/M in special_ops)
switch(M.id) switch(M.id)
if("ASSAULT0") if("ASSAULT0")
spawn(10)//1 second delay between each. spawn(10)//1 second delay between each.
@@ -189,7 +189,7 @@
sleep(50)//Doors remain open for 5 seconds. sleep(50)//Doors remain open for 5 seconds.
for(var/obj/machinery/door/poddoor/M in special_ops) for(var/obj/machinery/door/blast/M in special_ops)
switch(M.id)//Doors close at the same time. switch(M.id)//Doors close at the same time.
if("ASSAULT0") if("ASSAULT0")
spawn(0) spawn(0)