cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set a z-level baseturf for Lavaland (#41113)

Browse Source 
* Set a z-level baseturf for Lavaland

* Remove nigh-useless ZTRAIT_PLANET

* Remove planet_z helper from away missions
This commit is contained in:
Tad Hardesty
2018-10-26 13:32:34 -04:00
committed by Joan Lung
parent 730ce67d63
commit e31bb2c91e
12 changed files with 19 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomZLevels/Cabin.dmm
+1 -5
View File
@@ -963,10 +963,6 @@
},
/turf/open/floor/plating,
/area/awaymission/cabin)
"dw" = (
/obj/effect/mapping_helpers/planet_z,
/turf/closed/indestructible/rock/snow,
/area/space)
(1,1,1) = {"
aa
@@ -1223,7 +1219,7 @@ aa
aa
aa
aa
dw
aa
"}
(2,1,1) = {"
aa
_maps/RandomZLevels/VR/snowdin_VR.dmm
+1 -5
View File
@@ -3,10 +3,6 @@
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin/cave/mountain)
"ab" = (
/obj/effect/mapping_helpers/planet_z,
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin/cave/mountain)
"ac" = (
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin/cave/mountain)
@@ -16019,7 +16015,7 @@ ac
ac
"}
(2,1,1) = {"
ab
ac
ac
ac
ac
_maps/RandomZLevels/caves.dmm
+1 -5
View File
@@ -2249,10 +2249,6 @@
initial_gas_mix = "n2=23;o2=14"
},
/area/awaymission/caves/BMP_asteroid)
"gW" = (
/obj/effect/mapping_helpers/planet_z,
/turf/closed/indestructible/rock,
/area/space/nearstation)
"gX" = (
/obj/effect/baseturf_helper/lava,
/turf/closed/mineral/volcanic,
@@ -2534,7 +2530,7 @@ aa
aa
aa
aa
gW
aa
"}
(2,1,1) = {"
aa
_maps/RandomZLevels/moonoutpost19.dmm
+1 -5
View File
@@ -7127,10 +7127,6 @@
heat_capacity = 1e+006
},
/area/awaymission/moonoutpost19/research)
"oV" = (
/obj/effect/mapping_helpers/planet_z,
/turf/open/space,
/area/space)
"vV" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -7424,7 +7420,7 @@ aa
aa
aa
aa
oV
aa
"}
(2,1,1) = {"
aa
_maps/RandomZLevels/snowdin.dmm
+1 -5
View File
@@ -3,10 +3,6 @@
/obj/effect/baseturf_helper/asteroid/snow,
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin/cave/mountain)
"ab" = (
/obj/effect/mapping_helpers/planet_z,
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin/cave/mountain)
"ac" = (
/turf/closed/indestructible/rock/snow,
/area/awaymission/snowdin/cave/mountain)
@@ -16130,7 +16126,7 @@ ac
ac
"}
(2,1,1) = {"
ab
ac
ac
ac
ac
_maps/RandomZLevels/spacebattle.dmm
+1 -5
View File
@@ -2887,10 +2887,6 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
/turf/open/floor/plating,
/area/awaymission/spacebattle/cruiser)
"kM" = (
/obj/effect/mapping_helpers/planet_z,
/turf/closed/mineral/random,
/area/space/nearstation)
"vw" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/awaymission/spacebattle/syndicate5)
@@ -3168,7 +3164,7 @@ aa
aa
aa
aa
kM
aa
"}
(2,1,1) = {"
aa
_maps/RandomZLevels/undergroundoutpost45.dmm
-1
View File
@@ -13916,7 +13916,6 @@
},
/area/awaymission/undergroundoutpost45/caves)
"zi" = (
/obj/effect/mapping_helpers/planet_z,
/turf/open/space,
/area/space/nearstation)
"KE" = (
_maps/map_files/Mining/Lavaland.dmm
+7 -35
View File
@@ -4099,14 +4099,6 @@
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"Wt" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall,
/area/mine/laborcamp/security)
"Wz" = (
/obj/effect/mapping_helpers/planet_z,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"WA" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -4158,26 +4150,6 @@
},
/turf/open/floor/plasteel,
/area/mine/production)
"WF" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall,
/area/mine/laborcamp)
"WH" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall,
/area/mine/eva)
"WI" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall,
/area/mine/production)
"WJ" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall/r_wall,
/area/mine/maintenance)
"WK" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/closed/wall,
/area/mine/living_quarters)
"WO" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -4458,7 +4430,7 @@ aj
aj
aj
aj
Wz
aj
"}
(2,1,1) = {"
aa
@@ -9303,7 +9275,7 @@ aq
WB
aq
bi
WF
aq
WC
aq
bZ
@@ -9564,7 +9536,7 @@ az
az
aq
ca
Wt
ca
ca
aj
aj
@@ -12654,7 +12626,7 @@ ai
cQ
dk
dA
WJ
cQ
ed
Kb
eM
@@ -13686,7 +13658,7 @@ dR
ef
es
vZ
WK
cM
fg
BD
cM
@@ -20872,9 +20844,9 @@ bt
bH
bV
cq
WH
bf
bq
bq
WI
db
bP
bP
code/__DEFINES/maps.dm
+5 -3
View File
@@ -37,8 +37,6 @@ require only minor tweaks.
#define ZTRAIT_AWAY "Away Mission"
#define ZTRAIT_SPACE_RUINS "Space Ruins"
#define ZTRAIT_LAVA_RUINS "Lava Ruins"
// prevents certain turfs from being stripped by a singularity
#define ZTRAIT_PLANET "Planet"
// number - bombcap is multiplied by this before being applied to bombs
#define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
@@ -66,7 +64,11 @@ require only minor tweaks.
#define ZTRAITS_CENTCOM list(ZTRAIT_CENTCOM = TRUE)
#define ZTRAITS_STATION list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_STATION = TRUE)
#define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE)
#define ZTRAITS_LAVALAND list(ZTRAIT_MINING = TRUE, ZTRAIT_LAVA_RUINS = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 2)
#define ZTRAITS_LAVALAND list(\
ZTRAIT_MINING = TRUE, \
ZTRAIT_LAVA_RUINS = TRUE, \
ZTRAIT_BOMBCAP_MULTIPLIER = 2, \
ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface)
#define ZTRAITS_REEBE list(ZTRAIT_REEBE = TRUE, ZTRAIT_BOMBCAP_MULTIPLIER = 0.5)
#define DL_NAME "name"
code/__HELPERS/level_traits.dm
-3
View File
@@ -12,6 +12,3 @@
#define is_reserved_level(z) SSmapping.level_trait(z, ZTRAIT_RESERVED)
#define is_away_level(z) SSmapping.level_trait(z, ZTRAIT_AWAY)
// If true, the singularity cannot strip away asteroid turf on this Z
#define is_planet_level(z) SSmapping.level_trait(z, ZTRAIT_PLANET)
code/game/turfs/simulated/floor/plating/asteroid.dm
-5
View File
@@ -73,11 +73,6 @@
for(var/obj/item/stack/ore/O in src)
SEND_SIGNAL(W, COMSIG_PARENT_ATTACKBY, O)
/turf/open/floor/plating/asteroid/singularity_act()
if(is_planet_level(z))
return ..()
ScrapeAway()
/turf/open/floor/plating/asteroid/ex_act(severity, target)
. = SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, severity, target)
contents_explosion(severity, target)
code/modules/mapping/mapping_helpers.dm
+1 -12
View File
@@ -48,7 +48,7 @@
else
thing.PlaceOnBottom(null, baseturf)
/obj/effect/baseturf_helper/space
name = "space baseturf editor"
@@ -165,17 +165,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
var/turf/T = get_turf(src)
T.flags_1 |= NO_LAVA_GEN_1
/// Adds the map it is on to the z_is_planet list
/obj/effect/mapping_helpers/planet_z
name = "planet z helper"
layer = POINT_LAYER
/obj/effect/mapping_helpers/planet_z/Initialize()
. = ..()
var/datum/space_level/S = SSmapping.get_level(z)
S.traits[ZTRAIT_PLANET] = TRUE
//This helper applies components to things on the map directly.
/obj/effect/mapping_helpers/component_injector
name = "Component Injector"