cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6517 from Probe1/Deff_Doors

Browse Source 
Deff: Adds research access to asteroid shuttle doors and corrects the spelling on a warning.
This commit is contained in:
Rob Nelson
2015-11-10 12:03:01 -08:00
parent 62d6ef4491 03ac982d74
commit 9a1d7eade5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/computer/shuttle_computers.dm
View File

@@ -72,7 +72,7 @@
else if(!shuttle.linked_area) else if(!shuttle.linked_area)
dat = "<h2><font color='red'>UNABLE TO FIND [uppertext(shuttle.name)]</font></h2>" dat = "<h2><font color='red'>UNABLE TO FIND [uppertext(shuttle.name)]</font></h2>"
else if(!shuttle.linked_port) else if(!shuttle.linked_port)
dat += {"<h2><font color='red'>This shuttle has no docking port speciied.</font></h2><br> dat += {"<h2><font color='red'>This shuttle has no docking port specified.</font></h2><br>
<a href='?src=\ref[src];link_to_port=1'>Scan for docking ports</a>"} <a href='?src=\ref[src];link_to_port=1'>Scan for docking ports</a>"}
else if(shuttle.moving) else if(shuttle.moving)
dat += "<center><h3>Currently moving [shuttle.destination_port.areaname ? "to [shuttle.destination_port.areaname]" : ""]</h3></center>" dat += "<center><h3>Currently moving [shuttle.destination_port.areaname ? "to [shuttle.destination_port.areaname]" : ""]</h3></center>"

6
maps/defficiency.dmm
View File

@@ -3839,9 +3839,9 @@
"bvQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/hallway/primary/central) "bvQ" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/hallway/primary/central)
"bvR" = (/obj/machinery/computer/shuttle_control/mining,/turf/simulated/shuttle/floor,/area/shuttle/mining/station) "bvR" = (/obj/machinery/computer/shuttle_control/mining,/turf/simulated/shuttle/floor,/area/shuttle/mining/station)
"bvS" = (/obj/machinery/door/unpowered/shuttle,/obj/structure/docking_port/shuttle{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/mining/station) "bvS" = (/obj/machinery/door/unpowered/shuttle,/obj/structure/docking_port/shuttle{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/mining/station)
"bvT" = (/obj/machinery/door/airlock/external{name = "Mining Dock Airlock"; req_access = null; req_access_txt = "48"},/obj/structure/docking_port/destination/mining/station{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central) "bvT" = (/obj/machinery/door/airlock/external{name = "Mining Dock Airlock"; req_access = null; req_access_txt = "0"; req_one_access_txt = "47;48"},/obj/structure/docking_port/destination/mining/station{dir = 8},/turf/simulated/floor/plating,/area/hallway/primary/central)
"bvU" = (/turf/simulated/floor/plating,/area/hallway/primary/central) "bvU" = (/turf/simulated/floor/plating,/area/hallway/primary/central)
"bvV" = (/obj/machinery/door/airlock/external{name = "Mining Dock Airlock"; req_access = null; req_access_txt = "48"},/turf/simulated/floor/plating,/area/hallway/primary/central) "bvV" = (/obj/machinery/door/airlock/external{name = "Mining Dock Airlock"; req_access = null; req_access_txt = "0"; req_one_access_txt = "47;48"},/turf/simulated/floor/plating,/area/hallway/primary/central)
"bvW" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/hallway/primary/central) "bvW" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/hallway/primary/central)
"bvX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/turf/simulated/floor,/area/supply/storage) "bvX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/turf/simulated/floor,/area/supply/storage)
"bvY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/supply/storage) "bvY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/supply/storage)
@@ -9466,7 +9466,7 @@
"dAb" = (/obj/machinery/alarm{pixel_y = 24; req_one_access = list(24,11,47)},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/spectro) "dAb" = (/obj/machinery/alarm{pixel_y = 24; req_one_access = list(24,11,47)},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/spectro)
"dAc" = (/obj/structure/rack,/obj/item/clothing/suit/fire/heavy{name = "thermal protection suit"},/obj/item/clothing/gloves/black{name = "warm gloves"},/obj/item/clothing/ears/earmuffs,/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro) "dAc" = (/obj/structure/rack,/obj/item/clothing/suit/fire/heavy{name = "thermal protection suit"},/obj/item/clothing/gloves/black{name = "warm gloves"},/obj/item/clothing/ears/earmuffs,/turf/simulated/floor{dir = 4; icon_state = "whitegreen"},/area/research_outpost/spectro)
"dAd" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24; pixel_x = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry) "dAd" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24; pixel_x = 0},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry)
"dAe" = (/obj/machinery/computer/shuttle_control/research,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry) "dAe" = (/obj/machinery/computer/shuttle_control/mining,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry)
"dAf" = (/obj/machinery/alarm{pixel_y = 24; req_one_access = list(24,11,47)},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry) "dAf" = (/obj/machinery/alarm{pixel_y = 24; req_one_access = list(24,11,47)},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry)
"dAg" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/gloves/latex,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry) "dAg" = (/obj/structure/rack,/obj/item/clothing/suit/bio_suit/anomaly,/obj/item/clothing/head/bio_hood/anomaly,/obj/item/clothing/gloves/latex,/turf/simulated/floor{icon_state = "white"},/area/research_outpost/entry)
"dAh" = (/turf/simulated/wall/r_wall,/area/research_outpost/bathroom) "dAh" = (/turf/simulated/wall/r_wall,/area/research_outpost/bathroom)