mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
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:
@@ -485,7 +485,7 @@
|
||||
/obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened!
|
||||
if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
|
||||
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()
|
||||
src.frustration = 0
|
||||
else if ((istype(M, /mob/living/)) && (!src.anchored))
|
||||
|
||||
@@ -724,7 +724,7 @@ Auto Patrol: []"},
|
||||
/obj/machinery/bot/secbot/Bump(M as mob|obj) //Leave no door unopened!
|
||||
if((istype(M, /obj/machinery/door)) && !isnull(src.botcard))
|
||||
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()
|
||||
src.frustration = 0
|
||||
else if(!src.anchored)
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!"
|
||||
return
|
||||
|
||||
for(var/obj/machinery/door/poddoor/M in world)
|
||||
for(var/obj/machinery/door/blast/M in world)
|
||||
if(M.id == id)
|
||||
M.open()
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
M.drive()
|
||||
|
||||
sleep(50)
|
||||
for(var/obj/machinery/door/poddoor/M in world)
|
||||
for(var/obj/machinery/door/blast/M in world)
|
||||
if(M.id == id)
|
||||
M.close()
|
||||
return
|
||||
@@ -181,7 +181,7 @@
|
||||
time += tp
|
||||
time = min(max(round(time), 0), 120)
|
||||
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.density)
|
||||
M.open()
|
||||
|
||||
@@ -140,7 +140,7 @@ var/specops_shuttle_timeleft = 0
|
||||
|
||||
//Begin Marauder launchpad.
|
||||
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)
|
||||
if("ASSAULT0")
|
||||
spawn(10)//1 second delay between each.
|
||||
@@ -188,7 +188,7 @@ var/specops_shuttle_timeleft = 0
|
||||
|
||||
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.
|
||||
if("ASSAULT0")
|
||||
spawn(0)
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
D.safe = 1
|
||||
|
||||
/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.density)
|
||||
spawn(0)
|
||||
@@ -171,7 +171,7 @@
|
||||
active = 1
|
||||
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)
|
||||
spawn( 0 )
|
||||
M.open()
|
||||
@@ -185,7 +185,7 @@
|
||||
|
||||
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)
|
||||
spawn( 0 )
|
||||
M.close()
|
||||
|
||||
@@ -121,7 +121,7 @@ obj/machinery/door/blast/regular
|
||||
icon_state_opening = "pdoorc1"
|
||||
icon_state_closed = "pdoor1"
|
||||
icon_state_closing = "pdoorc0"
|
||||
icon_state = icon_state_closed
|
||||
icon_state = "pdoor1"
|
||||
maxhealth = 600
|
||||
|
||||
// SUBTYPE: Shutters
|
||||
@@ -131,5 +131,5 @@ obj/machinery/door/blast/regular
|
||||
icon_state_opening = "shutterc1"
|
||||
icon_state_closed = "shutter1"
|
||||
icon_state_closing = "shutterc0"
|
||||
icon_state = icon_state_closed
|
||||
icon_state = "shutter1"
|
||||
emitter_resistance = 20
|
||||
@@ -118,7 +118,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
/obj/item/device/pda/heads
|
||||
default_cartridge = /obj/item/weapon/cartridge/head
|
||||
icon_state = "pda-h"
|
||||
news_silent = 1
|
||||
news_silent = 1
|
||||
|
||||
/obj/item/device/pda/heads/hop
|
||||
default_cartridge = /obj/item/weapon/cartridge/hop
|
||||
@@ -790,7 +790,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
|
||||
if("Toggle 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.density)
|
||||
M.open()
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
anchored = 1
|
||||
density = 1
|
||||
var/obj/machinery/compressor/compressor
|
||||
var/list/obj/machinery/door/poddoor/doors
|
||||
var/list/obj/machinery/door/blast/doors
|
||||
var/id = 0
|
||||
var/door_status = 0
|
||||
|
||||
@@ -222,7 +222,7 @@
|
||||
if(id == C.comp_id)
|
||||
compressor = C
|
||||
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)
|
||||
doors += P
|
||||
|
||||
@@ -296,7 +296,7 @@
|
||||
else if( href_list["str"] )
|
||||
src.compressor.starter = !src.compressor.starter
|
||||
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)
|
||||
spawn( 0 )
|
||||
D.open()
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
/datum/shuttle/ferry/multidock/specops
|
||||
var/specops_return_delay = 6000 //After moving, the amount of time that must pass before the shuttle may move again
|
||||
var/specops_countdown_time = 600 //Length of the countdown when moving the shuttle
|
||||
|
||||
|
||||
var/obj/item/device/radio/intercom/announcer = null
|
||||
var/reset_time = 0 //the world.time at which the shuttle will be ready to move again.
|
||||
var/launch_prep = 0
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
if (istype(user, /obj/machinery/computer))
|
||||
var/obj/machinery/computer/C = user
|
||||
|
||||
|
||||
if(world.time <= reset_time)
|
||||
C.visible_message("\blue Central Command will not allow the Special Operations shuttle to launch yet.")
|
||||
if (((world.time - reset_time)/10) > 60)
|
||||
@@ -63,7 +63,7 @@
|
||||
radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH")
|
||||
|
||||
sleep_until_launch()
|
||||
|
||||
|
||||
//launch
|
||||
radio_announce("ALERT: INITIATING LAUNCH SEQUENCE")
|
||||
..(user)
|
||||
@@ -79,21 +79,21 @@
|
||||
for(var/turf/T in get_area_turfs(destination))
|
||||
var/mob/M = locate(/mob) in T
|
||||
M << "\red You have arrived at [station_name]. Commence operation!"
|
||||
|
||||
|
||||
reset_time = world.time + specops_return_delay //set the timeout
|
||||
|
||||
/datum/shuttle/ferry/multidock/specops/cancel_launch()
|
||||
if (!can_cancel())
|
||||
return
|
||||
|
||||
|
||||
cancel_countdown = 1
|
||||
radio_announce("ALERT: LAUNCH SEQUENCE ABORTED")
|
||||
if (istype(in_use, /obj/machinery/computer))
|
||||
var/obj/machinery/computer/C = in_use
|
||||
C.visible_message("\red Launch sequence aborted.")
|
||||
|
||||
|
||||
..()
|
||||
|
||||
|
||||
|
||||
|
||||
/datum/shuttle/ferry/multidock/specops/can_launch()
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
var/launch_time = world.time + specops_countdown_time
|
||||
var/time_until_launch
|
||||
|
||||
|
||||
cancel_countdown = 0
|
||||
launch_prep = 1
|
||||
while(!cancel_countdown && (launch_time - world.time) > 0)
|
||||
@@ -133,7 +133,7 @@
|
||||
//Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.
|
||||
|
||||
sleep(5)
|
||||
|
||||
|
||||
launch_prep = 0
|
||||
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
var/area/centcom/specops/special_ops = locate()//Where is the specops area located?
|
||||
//Begin Marauder launchpad.
|
||||
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)
|
||||
if("ASSAULT0")
|
||||
spawn(10)//1 second delay between each.
|
||||
@@ -189,7 +189,7 @@
|
||||
|
||||
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.
|
||||
if("ASSAULT0")
|
||||
spawn(0)
|
||||
|
||||
Reference in New Issue
Block a user