cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-14 08:32:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mining underdark and telecomms tweaks

Browse Source
This commit is contained in:
Arokha Sieyes
2018-04-30 19:37:17 -04:00
parent 1849e1280e
commit a76d8a7fcb
4 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-08-mining.dmm
+71 -15
View File
@@ -177,7 +177,10 @@
dir = 8
},
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"aK" = (
/obj/structure/cable/green{
@@ -185,7 +188,10 @@
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"aM" = (
/obj/machinery/power/apc{
@@ -198,7 +204,10 @@
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"aW" = (
/obj/machinery/power/smes/buildable{
@@ -206,7 +215,10 @@
RCon_tag = "Mining Station"
},
/obj/structure/cable/green,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"aX" = (
/obj/structure/cable/yellow{
@@ -214,7 +226,10 @@
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"aY" = (
/obj/structure/cable/green{
@@ -228,11 +243,17 @@
name = "Powernet Sensor - Mining Station";
name_tag = "Mining Station"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"aZ" = (
/obj/machinery/mech_recharger,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"bg" = (
/obj/structure/cable/green{
@@ -245,19 +266,37 @@
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"bh" = (
/obj/machinery/telecomms/relay/preset/mining,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/obj/structure/table/steel,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/obj/item/stack/material/phoron,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"bi" = (
/obj/machinery/power/port_gen/pacman,
/obj/structure/cable/yellow,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"bv" = (
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"bE" = (
/obj/effect/floor_decal/rust/steel_decals_rusted2,
@@ -323,7 +362,10 @@
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"Nh" = (
/obj/structure/railing{
@@ -340,6 +382,13 @@
/obj/structure/railing,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"Uk" = (
/obj/machinery/telecomms/relay/preset/underdark,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
"Wy" = (
/obj/structure/railing{
icon_state = "railing0";
@@ -347,6 +396,13 @@
},
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"ZV" = (
/obj/machinery/telecomms/relay/preset/mining,
/turf/simulated/floor/tiled/steel_dirty/virgo3b{
name = "shed floor";
outdoors = 0
},
/area/outpost/engineering/atmospherics)
(1,1,1) = {"
aa
@@ -3879,7 +3935,7 @@ aC
aE
bg
bv
bv
ZV
ay
ab
ab
@@ -4021,7 +4077,7 @@ ao
ay
aM
aZ
bv
Uk
ay
al
ab
maps/tether/tether_defines.dm
+2 -1
View File
@@ -18,7 +18,7 @@
//Turfmakers
#define VIRGO3B_SET_ATMOS nitrogen=VIRGO3B_MOL_N2;oxygen=VIRGO3B_MOL_O2;carbon_dioxide=VIRGO3B_MOL_CO2;phoron=VIRGO3B_MOL_PHORON;temperature=VIRGO3B_AVG_TEMP
#define VIRGO3B_TURF_CREATE(x) x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP;x/virgo3b/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
#define VIRGO3B_TURF_CREATE(x) x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP;x/virgo3b/outdoors=TRUE;x/virgo3b/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
#define VIRGO3B_TURF_CREATE_UN(x) x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP
//Normal map defs
@@ -34,6 +34,7 @@
#define Z_LEVEL_CENTCOM 10
#define Z_LEVEL_MISC 11
#define Z_LEVEL_SHIPS 12
#define Z_LEVEL_UNDERDARK 13
/datum/map/tether
name = "Virgo"
maps/tether/tether_telecomms.dm
+7 -1
View File
@@ -38,13 +38,19 @@
id = "Science Outpost Relay"
listening_level = Z_LEVEL_SOLARS
autolinkers = list("sci_o_relay")
/obj/machinery/telecomms/relay/preset/underdark
id = "Mining Underground Relay"
listening_level = Z_LEVEL_UNDERDARK
autolinkers = list("ud_relay")
// #### Hub ####
/obj/machinery/telecomms/hub/preset/tether
id = "Hub"
network = "tcommsat"
autolinkers = list("hub",
"tbl_relay", "tbm_relay", "tbh_relay", "tsl_relay", "tsm_relay", "tsh_relay",
"c_relay", "m_relay", "r_relay", "sci_o_relay",
"c_relay", "m_relay", "r_relay", "sci_o_relay", "ud_relay",
"science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused",
"hb_relay", "receiverA", "broadcasterA"
)
maps/tether/tether_turfs.dm
+5 -25
View File
@@ -4,22 +4,21 @@ VIRGO3B_TURF_CREATE(/turf/simulated/open)
edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf
/turf/simulated/open/virgo3b/New()
..()
outdoor_turfs.Add(src)
if(outdoors)
outdoor_turfs.Add(src)
VIRGO3B_TURF_CREATE(/turf/simulated/floor)
/turf/simulated/floor/virgo3b/New()
..()
outdoor_turfs.Add(src)
/turf/simulated/floor/virgo3b_indoors
VIRGO3B_SET_ATMOS
/turf/simulated/floor/virgo3b_indoors/update_graphic(list/graphic_add = null, list/graphic_remove = null)
return 0
VIRGO3B_TURF_CREATE(/turf/simulated/floor/reinforced)
VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/steel_dirty)
VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/dirt)
VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks)
VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/grass/sif)
/turf/simulated/floor/outdoors/grass/sif
turf_layers = list(
@@ -28,15 +27,6 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/grass/sif)
)
VIRGO3B_TURF_CREATE(/turf/simulated/floor/reinforced)
/turf/simulated/floor/reinforced/virgo3b/New()
..()
outdoor_turfs.Add(src)
VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/steel_dirty)
/turf/simulated/floor/tiled/steel_dirty/virgo3b/New()
..()
outdoor_turfs.Add(src)
// Overriding these for the sake of submaps that use them on other planets.
// This means that mining on tether base and space is oxygen-generating, but solars and mining should use the virgo3b subtype
@@ -120,16 +110,6 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
UpdateMineral()
update_icon()
VIRGO3B_TURF_CREATE(/turf/simulated/shuttle/wall/dark/hard_corner)
/turf/simulated/shuttle/wall/dark/hard_corner/virgo3b/New()
..()
outdoor_turfs.Add(src)
VIRGO3B_TURF_CREATE(/turf/simulated/shuttle/floor/black)
/turf/simulated/shuttle/floor/black/virgo3b/New()
..()
outdoor_turfs.Add(src)
//Unsimulated
/turf/unsimulated/wall/planetary/virgo3b
name = "facility wall"