shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13717 from TheObserver-sys/shuttlefix

Browse Source 
Mining and Monastery Shuttle Fixes
This commit is contained in:
silicons
2020-12-03 16:34:00 -07:00
committed by GitHub
parent b6092086da 4559a153c3
commit 750f81920b
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+6 -2
View File
@@ -1552,10 +1552,14 @@
/turf/open/floor/plasteel/freezer, /turf/open/floor/plasteel/freezer,
/area/mine/living_quarters) /area/mine/living_quarters)
"yZ" = ( "yZ" = (
/obj/docking_port/stationary/public_mining_dock{ /obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
dir = 8; dir = 8;
dwidth = 3;
height = 7;
id = "lavaland_common_away"; id = "lavaland_common_away";
name = "Mining Station Public Wing" name = "Lavaland Mining Public Wing";
width = 7
}, },
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors) /area/lavaland/surface/outdoors)
_maps/shuttles/mining_common_kilo.dmm
+1 -1
View File
@@ -88,7 +88,7 @@
dir = 8; dir = 8;
dwidth = 3; dwidth = 3;
height = 5; height = 5;
id = "mining_common"; id = "mining_shuttle_common";
name = "lavaland shuttle"; name = "lavaland shuttle";
port_direction = 4; port_direction = 4;
width = 7 width = 7
_maps/shuttles/mining_common_meta.dmm
+1 -1
View File
@@ -37,7 +37,7 @@
dir = 8; dir = 8;
dwidth = 3; dwidth = 3;
height = 5; height = 5;
id = "mining_common"; id = "mining_shuttle_common";
name = "lavaland shuttle"; name = "lavaland shuttle";
port_direction = 4; port_direction = 4;
width = 7 width = 7
code/modules/mining/mine_items.dm
+3 -3
View File
@@ -79,13 +79,13 @@
no_destination_swap = TRUE no_destination_swap = TRUE
var/static/list/dumb_rev_heads = list() var/static/list/dumb_rev_heads = list()
/obj/machinery/computer/shuttle/mining/common /obj/machinery/computer/shuttle/mining/common
name = "lavaland shuttle console" name = "lavaland shuttle console"
desc = "Used to call and send the lavaland shuttle." desc = "Used to call and send the lavaland shuttle."
req_access = list() req_access = list()
circuit = /obj/item/circuitboard/computer/mining_shuttle/common circuit = /obj/item/circuitboard/computer/mining_shuttle/common
shuttleId = "mining_common" shuttleId = "mining_shuttle_common"
possible_destinations = "commonmining_home;lavaland_common_away;landing_zone_dock;mining_public" possible_destinations = "commonmining_home;lavaland_common_away"
/obj/machinery/computer/shuttle/mining/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) /obj/machinery/computer/shuttle/mining/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
code/modules/shuttle/monastery.dm
+1 -1
View File
@@ -2,6 +2,6 @@
name = "monastery shuttle console" name = "monastery shuttle console"
desc = "Used to control the monastery shuttle." desc = "Used to control the monastery shuttle."
circuit = /obj/item/circuitboard/computer/monastery_shuttle circuit = /obj/item/circuitboard/computer/monastery_shuttle
shuttleId = "pod1" shuttleId = "pod"
possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station" possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
no_destination_swap = TRUE no_destination_swap = TRUE