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

some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

Browse Source
This commit is contained in:
Detective Google
2020-05-01 01:17:56 -05:00
parent 231fd0edea
commit 2832b86e11
4 changed files with 169 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/icebox.json
+2 -1
View File
@@ -6,6 +6,7 @@
"IcemoonUnderground_Above.dmm",
"IceBoxStation.dmm"
],
"station_ruin_budget":0,
"space_ruin_levels":0,
"space_empty_levels":0,
"shuttles":{
@@ -43,4 +44,4 @@
}
],
"minetype":"none"
}
}
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+162 -173
View File
@@ -9278,15 +9278,10 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"asX" = (
/obj/docking_port/stationary{
dir = 4;
dwidth = 1;
height = 4;
name = "escape pod loader";
roundstart_template = /datum/map_template/shuttle/escape_pod/default;
width = 3
/obj/structure/sign/warning/securearea{
pixel_y = -32
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"asY" = (
/obj/docking_port/stationary/random{
@@ -9577,7 +9572,7 @@
"atS" = (
/obj/item/airlock_painter,
/obj/structure/closet,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/open/floor/plating/airless,
/area/icemoon/surface/outdoors)
"atU" = (
/obj/structure/rack,
@@ -11293,7 +11288,7 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
/turf/open/floor/plating/airless,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"aya" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -49899,7 +49894,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 8
},
/turf/open/floor/plating/airless,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ai_monitored/turret_protected/aisat_interior)
"ctq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -61241,12 +61236,6 @@
},
/turf/closed/wall,
/area/hallway/secondary/service)
"wGu" = (
/obj/structure/sign/warning/securearea{
pixel_y = -32
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"wHk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -74687,8 +74676,8 @@ aBM
aBM
aBM
aBM
aBM
aBM
wWu
wWu
aBM
aBM
aBM
@@ -74943,10 +74932,10 @@ beO
beO
beO
beO
aBM
aBM
aBM
aBM
wWu
wWu
wWu
wWu
aBM
aBM
aBM
@@ -75200,10 +75189,10 @@ bjb
bkz
blS
bnv
aBM
aBM
aBM
aBM
wWu
wWu
wWu
wWu
aBM
aBM
aBM
@@ -75457,11 +75446,11 @@ bja
beO
bja
bja
aBM
aBM
aBM
aBM
aBM
wWu
wWu
wWu
wWu
wWu
aBM
aBM
aBM
@@ -75714,11 +75703,11 @@ bjd
bkB
cAI
bja
aBM
aBM
aBM
aBM
aBM
wWu
wWu
wWu
wWu
wWu
aBM
aBM
aBM
@@ -75971,11 +75960,11 @@ bjc
cAF
cAF
bja
aBM
aBM
aBM
aBM
aBM
wWu
wWu
wWu
wWu
wWu
aBM
aBM
aBM
@@ -76228,9 +76217,9 @@ bjc
cAF
blV
beO
aBM
aBM
aBM
wWu
wWu
wWu
aBM
aBM
aBM
@@ -76485,8 +76474,8 @@ bje
bkC
cAJ
beO
aBM
aBM
wWu
wWu
aBM
aBM
aBM
@@ -77993,7 +77982,7 @@ arH
alU
ats
atS
ayF
ats
atO
asK
azF
@@ -80881,9 +80870,9 @@ bLv
bCq
ayF
cbj
ayF
ayF
ayF
crk
crk
crk
ayF
bCq
bCq
@@ -81667,9 +81656,9 @@ cgB
chQ
ciR
cfw
ayF
ayF
ayF
crk
crk
crk
ayF
aBM
aBM
@@ -85413,7 +85402,7 @@ aBM
ayF
ayF
ayF
abY
crk
abc
abu
abu
@@ -96210,7 +96199,7 @@ ayF
ayF
ayF
ayF
wGu
asX
abp
abp
adR
@@ -96985,9 +96974,9 @@ ayF
ayF
ayF
abp
ayF
asX
ayF
crk
nVR
crk
abp
aBM
ayF
@@ -111175,7 +111164,7 @@ cBl
aPq
bgg
aNa
aBM
ayF
bky
bqh
bme
@@ -111432,7 +111421,7 @@ aPq
aPs
bgf
aNa
aBM
ayF
bky
blP
bns
@@ -111689,7 +111678,7 @@ bdA
aNa
aNa
aNa
aBM
ayF
bky
blR
bns
@@ -111936,17 +111925,17 @@ aQE
aNa
aQE
aNa
aBM
aBM
aBM
ayF
ayF
ayF
aNa
aQE
aNa
aQE
aNa
aBM
aBM
aBM
ayF
ayF
ayF
bky
cyC
bns
@@ -112193,17 +112182,17 @@ aQE
aNa
aQE
aNa
aBM
aBM
aBM
ayF
ayF
ayF
aNa
aQE
aNa
aQE
aNa
aBM
aBM
aBM
ayF
ayF
ayF
crk
crk
bns
@@ -112450,19 +112439,19 @@ aeR
aNa
aQE
aNa
aBM
aBM
aBM
ayF
ayF
ayF
aNa
aQE
aNa
afE
aNa
aBM
aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
ayF
bns
boF
bqe
@@ -112707,18 +112696,18 @@ aQE
aNa
aQE
aNa
aBM
aBM
aBM
ayF
ayF
ayF
aNa
aQE
aNa
aQE
aNa
aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
aBM
bns
boH
@@ -112964,18 +112953,18 @@ cyh
aRW
aTo
aNa
aBM
aBM
aBM
ayF
ayF
ayF
aNa
aTo
aRW
cyr
aNa
aBM
aBM
aBM
aBM
ayF
ayF
ayF
aBM
bnu
bhG
@@ -113212,7 +113201,7 @@ aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -113221,9 +113210,9 @@ crk
crk
auN
crk
aBM
aBM
aBM
ayF
ayF
ayF
crk
crk
crk
@@ -113232,7 +113221,7 @@ crk
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -113469,27 +113458,27 @@ aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
ayF
aBM
aBM
ayF
ayF
ayF
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -113723,30 +113712,30 @@ aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
ayF
ayF
aBM
aBM
aBM
ayF
ayF
ayF
ayF
aBM
aBM
ayF
ayF
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
aBM
aBM
aBM
@@ -113978,32 +113967,32 @@ aBM
aBM
aBM
aBM
ayF
ayF
ayF
aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
ayF
ayF
aBM
aBM
aBM
aBM
aBM
ayF
aBM
ayF
ayF
ayF
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -114247,15 +114236,15 @@ aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -114503,16 +114492,16 @@ aBM
aBM
aBM
aBM
ayF
ayF
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
ayF
ayF
aBM
aBM
aBM
@@ -114761,15 +114750,15 @@ aBM
aBM
aBM
aBM
ayF
ayF
ayF
ayF
aBM
aBM
ayF
aBM
aBM
aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -115018,6 +115007,7 @@ aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -115025,8 +115015,7 @@ aBM
aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
@@ -115283,7 +115272,7 @@ aBM
aBM
aBM
aBM
aBM
ayF
aBM
aBM
aBM
code/controllers/subsystem/mapping.dm
+1 -1
View File
@@ -118,7 +118,7 @@ SUBSYSTEM_DEF(mapping)
// Generate station space ruins
var/list/station_ruins = levels_by_trait(ZTRAIT_STATION)
if (station_ruins.len)
seedRuins(station_ruins, CONFIG_GET(number/station_space_budget), /area/space/station_ruins, station_ruins_templates)
seedRuins(station_ruins, (SSmapping.config.station_ruin_budget < 0) ? CONFIG_GET(number/station_space_budget) : SSmapping.config.station_ruin_budget, list(/area/space/station_ruins), station_ruins_templates)
SSmapping.seedStation()
loading_ruins = FALSE
#endif
code/datums/map_config.dm
+4
View File
@@ -22,6 +22,7 @@
var/traits = null
var/space_ruin_levels = 2
var/space_empty_levels = 1
var/station_ruin_budget = -1
var/minetype = "lavaland"
@@ -130,6 +131,9 @@
log_world("map_config space_empty_levels is not a number!")
return
if("station_ruin_budget" in json)
station_ruin_budget = json["station_ruin_budget"]
temp = json["year_offset"]
if (isnum(temp))
year_offset = temp