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

Merge pull request #10578 from r4d6/Mining

Browse Source 
Port TG's Mining changes
This commit is contained in:
Ghom
2020-01-18 20:32:14 +01:00
committed by GitHub
parent 0bc10319d9 0d3706b7f9
commit d709edb1c2
10 changed files with 3141 additions and 1996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+59 -23
View File
@@ -53469,14 +53469,11 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"est" = (
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-03"
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/turf/open/floor/plasteel/white/corner{
dir = 1
@@ -53623,6 +53620,10 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"eZP" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/space/basic,
/area/hallway/secondary/entry)
"fbm" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -54816,6 +54817,15 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"jnX" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Shuttle Bay"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"job" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -56833,6 +56843,18 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/port)
"rHa" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"rKc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -58112,6 +58134,11 @@
"vYa" = (
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"vZs" = (
/obj/structure/lattice,
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
"wcy" = (
/obj/structure/reagent_dispensers/water_cooler,
/obj/structure/cable{
@@ -58553,6 +58580,15 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
"ycF" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Shuttle Bay"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"ydD" = (
/obj/effect/turf_decal/bot,
/obj/machinery/suit_storage_unit/rd,
@@ -66664,7 +66700,7 @@ aaa
aaa
aaa
aaa
aaf
aoV
aaa
aaa
aaa
@@ -66921,12 +66957,12 @@ aaa
aaa
aaa
aaa
aaf
aoV
aaa
rHa
aaa
aaa
aaa
aaa
aaf
aoV
aaa
aaa
aaa
@@ -67178,12 +67214,12 @@ aaa
aaa
aaa
aaa
aaf
aaa
aaa
aaa
aaf
aaf
asE
asE
ycF
asE
asE
aoV
aaa
aaa
aaa
@@ -67436,11 +67472,11 @@ aaa
aaa
aaa
aaf
aaa
aaf
aaa
aAC
eZP
auP
eZP
aaf
vZs
aaa
aaa
aaa
@@ -67693,10 +67729,10 @@ aaa
aaa
aaa
arB
awW
awW
asE
arB
jnX
asE
aAC
aaf
aaa
aaa
_maps/map_files/Deltastation/DeltaStation2.dmm
+67 -16
View File
@@ -159,7 +159,9 @@
/area/construction/mining/aux_base)
"abe" = (
/obj/effect/turf_decal/delivery,
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/stripes/end{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"abf" = (
@@ -182,7 +184,7 @@
pixel_x = -23
},
/obj/effect/turf_decal/stripes/line{
dir = 9
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -125764,6 +125766,17 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"eYg" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"faI" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -125922,6 +125935,15 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"gdb" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"giN" = (
/obj/structure/window/reinforced{
dir = 8
@@ -125933,6 +125955,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/circuit)
"gmn" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"gut" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -126067,6 +126102,11 @@
/obj/structure/sign/warning/vacuum,
/turf/closed/wall/r_wall,
/area/chapel/office)
"hlu" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"hrP" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -127470,6 +127510,17 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
"xDY" = (
/obj/docking_port/stationary{
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"xDZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -159477,8 +159528,8 @@ aaa
aaa
aaa
aaa
aaa
aaa
rqh
rqh
aad
aad
aaa
@@ -159733,8 +159784,8 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaO
aaO
aaO
aaO
abf
@@ -159989,10 +160040,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaO
xDY
eYg
gdb
gmn
abe
abp
abC
@@ -160247,10 +160298,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaO
abe
aaO
aaO
hlu
abq
abD
abD
@@ -160505,7 +160556,7 @@ aaa
aaa
aaa
aaa
aaa
rqh
aaO
aaO
abf
@@ -160762,8 +160813,8 @@ aaa
aaa
aaa
aaa
aaa
aaa
rqh
rqh
aad
aad
aaa
_maps/map_files/MetaStation/MetaStation.dmm
+931 -917
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Mining/Lavaland.dmm
+1918 -1040
View File
File diff suppressed because it is too large Load Diff
_maps/shuttles/mining_common_meta.dmm
+124
View File
@@ -0,0 +1,124 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
/obj/structure/table,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"d" = (
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"e" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"f" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"g" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"h" = (
/obj/machinery/door/airlock/titanium{
name = "Lavaland Shuttle Airlock"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 3;
height = 5;
id = "mining_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
},
/turf/open/floor/plating,
/area/shuttle/mining)
"i" = (
/obj/structure/closet/crate,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"j" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/mining)
"k" = (
/obj/structure/ore_box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"l" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/open/floor/plating/airless,
/area/shuttle/mining)
"Q" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
(1,1,1) = {"
a
a
b
a
b
a
a
"}
(2,1,1) = {"
a
c
e
g
f
i
a
"}
(3,1,1) = {"
b
d
Q
e
f
j
l
"}
(4,1,1) = {"
a
c
e
e
f
k
a
"}
(5,1,1) = {"
a
a
b
h
b
a
a
"}
code/datums/shuttles.dm
+8
View File
@@ -131,6 +131,10 @@
port_id = "mining"
can_be_bought = FALSE
/datum/map_template/shuttle/mining_common
port_id = "mining_common"
can_be_bought = FALSE
/datum/map_template/shuttle/cargo
port_id = "cargo"
can_be_bought = FALSE
@@ -493,6 +497,10 @@
suffix = "delta"
name = "labour shuttle (Delta)"
/datum/map_template/shuttle/mining_common/meta
suffix = "meta"
name = "lavaland shuttle (Meta)"
/datum/map_template/shuttle/arrival/delta
suffix = "delta"
name = "arrival shuttle (Delta)"
code/game/objects/items/circuitboards/computer_circuitboards.dm
+4
View File
@@ -293,6 +293,10 @@
name = "Mining Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining
/obj/item/circuitboard/computer/mining_shuttle/common
name = "Lavaland Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining/common
/obj/item/circuitboard/computer/white_ship
name = "White Ship (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+8
View File
@@ -66,6 +66,14 @@
req_access = null
locked = FALSE
/obj/structure/closet/secure_closet/freezer/gulag_fridge
name = "refrigerator"
/obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/drinks/beer/light(src)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+14
View File
@@ -290,3 +290,17 @@
..()
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
/obj/structure/closet/secure_closet/labor_camp_security
name = "labor camp security locker"
req_access = list(ACCESS_SECURITY)
icon_state = "sec"
/obj/structure/closet/secure_closet/labor_camp_security/PopulateContents()
..()
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/sec(src)
new /obj/item/clothing/under/rank/security(src)
new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/flashlight/seclite(src)
code/modules/mining/mine_items.dm
+8
View File
@@ -87,6 +87,14 @@
return
. = ..()
/obj/machinery/computer/shuttle/mining/common
name = "lavaland shuttle console"
desc = "Used to call and send the lavaland shuttle."
req_access = list()
circuit = /obj/item/circuitboard/computer/mining_shuttle/common
shuttleId = "mining_common"
possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"
/**********************Mining car (Crate like thing, not the rail car)**************************/
/obj/structure/closet/crate/miningcar