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

Merge pull request #1162 from tigercat2000/AAAHHHHHH

Browse Source 
Fix some minor issues with pod doors and buttons
This commit is contained in:
Fox-McCloud
2015-05-25 01:04:09 -04:00
parent 48086c9736 2218d8c0ab
commit 9ef1f0816c
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/cyberiad/cyberiad.dmm
+4 -4
View File
@@ -1956,7 +1956,7 @@
"aLF" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1; level = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"aLG" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"aLH" = (/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"aLI" = (/obj/machinery/door/poddoor{id_tag = "chapelgun"; name = "Chapel Launcher Door"},/turf/simulated/floor/plating,/area/chapel/main)
"aLI" = (/obj/machinery/door/poddoor{id_tag = "chapelgun"; name = "Chapel Launcher Door"; protected = 0},/turf/simulated/floor/plating,/area/chapel/main)
"aLJ" = (/turf/simulated/wall/r_wall,/area/chapel/main)
"aLK" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/shuttle/arrival/station)
"aLL" = (/obj/effect/landmark{name = "HONKsquad"},/obj/structure/closet/walllocker/emerglocker/north,/turf/simulated/shuttle/floor,/area/shuttle/arrival/station)
@@ -5462,7 +5462,7 @@
"cbb" = (/obj/structure/dispenser,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing)
"cbc" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/mixing)
"cbd" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/machinery/camera{c_tag = "Research Toxins Launch Room"; dir = 4; network = list("Research","SS13"); pixel_y = -22},/obj/machinery/light{dir = 8},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor,/area/toxins/mixing)
"cbe" = (/obj/machinery/driver_button{dir = 2; id_tag = "toxinsdriver"; pixel_y = 24},/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/toxins/mixing)
"cbe" = (/obj/machinery/driver_button{dir = 2; id_tag = "toxinsdriver"; pixel_y = 24; range = 18},/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/toxins/mixing)
"cbf" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/computer/security/telescreen{desc = "Used for watching the test chamber."; layer = 4; name = "Test Chamber Telescreen"; network = list("Toxins"); pixel_x = 32; pixel_y = 0},/obj/machinery/alarm{pixel_y = 25},/turf/simulated/floor,/area/toxins/mixing)
"cbg" = (/obj/structure/grille,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/toxins/mixing)
"cbh" = (/turf/simulated/floor/airless{dir = 9; icon_state = "warning"},/area/toxins/test_area)
@@ -5785,8 +5785,8 @@
"chm" = (/obj/machinery/mass_driver{dir = 4; id_tag = "toxinsdriver"},/turf/simulated/floor/plating/airless,/area/toxins/mixing)
"chn" = (/obj/machinery/light,/turf/simulated/floor/plating/airless,/area/toxins/mixing)
"cho" = (/turf/simulated/floor/plating/airless,/area/toxins/mixing)
"chp" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/simulated/floor/plating/airless,/area/toxins/mixing)
"chq" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
"chp" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"; protected = 0},/turf/simulated/floor/plating/airless,/area/toxins/mixing)
"chq" = (/obj/machinery/door/poddoor{id_tag = "toxinsdriver"; name = "Toxins Launcher Bay Door"; protected = 0},/turf/simulated/floor/plating/airless,/area/toxins/test_area)
"chr" = (/obj/item/device/radio/beacon,/obj/effect/decal/warning_stripes/red/hollow,/turf/simulated/floor/airless,/area/toxins/test_area)
"chs" = (/turf/simulated/shuttle/wall{dir = 4; icon_state = "wall3"},/area/toxins/test_area)
"cht" = (/obj/machinery/camera{c_tag = "Research Toxins Test Chamber East"; dir = 8; network = list("Toxins","Research","SS13")},/obj/machinery/light{dir = 4},/turf/simulated/floor/airless,/area/toxins/test_area)
code/game/machinery/door_control.dm
+7 -5
View File
@@ -135,6 +135,8 @@
else
icon_state = "doorctrl0"
/obj/machinery/driver_button/var/range = 7
/obj/machinery/driver_button/attack_ai(mob/user as mob)
return src.attack_hand(user)
@@ -185,21 +187,21 @@
active = 1
icon_state = "launcheract"
for(var/obj/machinery/door/poddoor/M in range(src,7))
if (M.id_tag == src.id_tag)
for(var/obj/machinery/door/poddoor/M in range(src,range))
if (M.id_tag == src.id_tag && !M.protected)
spawn()
M.open()
sleep(20)
for(var/obj/machinery/mass_driver/M in world)
for(var/obj/machinery/mass_driver/M in range(src,range))
if(M.id_tag == src.id_tag)
M.drive()
sleep(50)
for(var/obj/machinery/door/poddoor/M in world)
if (M.id_tag == src.id_tag)
for(var/obj/machinery/door/poddoor/M in range(src,range))
if (M.id_tag == src.id_tag && !M.protected)
spawn()
M.close()
return
code/game/machinery/doors/poddoor.dm
+1
View File
@@ -5,6 +5,7 @@
icon_state = "pdoor1"
var/id_tag = 1.0
explosion_block = 3
var/protected = 1
/obj/machinery/door/poddoor/preopen
icon_state = "pdoor0"