cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7237 from VOREStation/aro-moretalon

Browse Source 
More various Talon tweaks and fixes
This commit is contained in:
Aronai Sieyes
2020-04-13 16:44:56 -04:00
committed by GitHub
parent 34169c2889 156d451038
commit 7375cd262f
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/submaps/shelters/shelter_4.dmm
+1 -1
View File
@@ -66,7 +66,7 @@
/obj/item/weapon/storage/box/survival/space,
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
/obj/item/device/subspaceradio,
/obj/item/device/bluespaceradio,
/obj/item/weapon/storage/box/survival/comp,
/obj/item/weapon/storage/box/survival/comp,
/obj/item/device/binoculars,
maps/tether/submaps/offmap/talon1.dmm
+21 -7
View File
@@ -2947,7 +2947,9 @@
/area/talon/maintenance/deckone_port)
"fA" = (
/obj/effect/map_helper/airlock/door/ext_door,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/plating,
/area/talon/maintenance/deckone_port)
"fB" = (
@@ -2975,7 +2977,9 @@
dir = 4
},
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/plating,
/area/talon/maintenance/deckone_port)
"fD" = (
@@ -3151,7 +3155,9 @@
dir = 4
},
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/plating,
/area/talon/maintenance/deckone_starboard)
"fU" = (
@@ -3175,7 +3181,9 @@
/area/talon/maintenance/deckone_starboard)
"fV" = (
/obj/effect/map_helper/airlock/door/ext_door,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/plating,
/area/talon/maintenance/deckone_starboard)
"fW" = (
@@ -5831,7 +5839,9 @@
"ln" = (
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/talonboat)
"lo" = (
@@ -5865,7 +5875,9 @@
/area/shuttle/talonboat)
"ls" = (
/obj/effect/map_helper/airlock/door/ext_door,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/talonboat)
"lt" = (
@@ -5874,7 +5886,9 @@
icon_state = "4-8";
dir = 1
},
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/talonboat)
"lu" = (
maps/tether/submaps/offmap/talon2.dmm
+9 -3
View File
@@ -64,6 +64,7 @@
/area/talon/decktwo/bridge_upper)
"al" = (
/obj/structure/table/steel,
/obj/item/weapon/paper/dockingcodes,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon/decktwo/bridge_upper)
"am" = (
@@ -2685,7 +2686,7 @@
/turf/simulated/floor/plating,
/area/talon/maintenance/decktwo_starboard)
"eN" = (
/turf/simulated/wall/rshull,
/turf/simulated/wall/rpshull,
/area/talon/decktwo/lifeboat)
"eO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2982,6 +2983,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 4
},
/obj/item/device/survivalcapsule/luxury,
/turf/simulated/floor/tiled/techfloor/grid,
/area/talon/decktwo/lifeboat)
"fp" = (
@@ -4305,7 +4307,9 @@
/area/talon/maintenance/decktwo_aft)
"ie" = (
/obj/effect/map_helper/airlock/door/ext_door,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/plating,
/area/talon/maintenance/decktwo_aft)
"if" = (
@@ -4391,7 +4395,9 @@
"in" = (
/obj/effect/map_helper/airlock/door/int_door,
/obj/machinery/atmospherics/pipe/simple/visible/aux,
/obj/machinery/door/airlock/external/glass,
/obj/machinery/door/airlock/glass_external{
req_one_access = list(301)
},
/turf/simulated/floor/plating,
/area/talon/maintenance/decktwo_aft)
"ip" = (
nano/templates/shuttle_control_console_exploration.tmpl
+6
View File
@@ -49,6 +49,12 @@
<span class="bad">ERROR</span>
{{/if}}
</div>
<div class="itemLabel">
Docking Codes:
</div>
<div class="itemContent">
{{:helper.link(data.docking_codes ? data.docking_codes : 'Not set', null, {'set_codes' : '1'}, null , null)}}
</div>
</div>
</div>
{{/if}}