Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Little refactor maps module & fix space on lavaland ruins #1172

Merged
merged 6 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
693 changes: 385 additions & 308 deletions _maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm

Large diffs are not rendered by default.

382 changes: 189 additions & 193 deletions _maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions code/game/area/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@
/area/New(loc, ...)
if(!there_can_be_many) // Has to be done in New else the maploader will fuck up and find subtypes for the parent
GLOB.all_unique_areas[type] = src
..()
GLOB.all_areas += src
return ..()

/area/Initialize(mapload)
if(is_station_level(z))
RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(on_security_level_update))

GLOB.all_areas += src
icon_state = ""
layer = AREA_LAYER
uid = ++global_uid
Expand Down
14 changes: 8 additions & 6 deletions modular_ss220/maps220/_maps220.dme
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#include "_maps220.dm"

#include "code/Areas/station.dm"
#include "code/Areas/away.dm"
#include "code/Areas/gateway.dm"
#include "code/RandomRuins/lavaland_ruins.dm"
#include "code/RandomRuins/space_ruins.dm"
#include "code/RandomRuins/gateway/gateway_areas.dm"
#include "code/RandomRuins/gateway/gateway_turfs.dm"
#include "code/RandomRuins/lavaland/lavaland_areas.dm"
#include "code/RandomRuins/lavaland/lavaland_ruins.dm"
#include "code/RandomRuins/lavaland/lavaland_turfs.dm"
#include "code/RandomRuins/space/space_areas.dm"
#include "code/RandomRuins/space/space_ruins.dm"
#include "code/Station/station_areas.dm"
#include "code/Station/station_datums.dm"
#include "code/corpses.dm"
#include "code/directions.dm"
Expand All @@ -13,7 +16,6 @@
#include "code/mobs.dm"
#include "code/spawners.dm"
#include "code/walls.dm"
#include "code/floors.dm"
#include "code/effects.dm"
#include "code/objects.dm"
#include "code/papers.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,6 @@
density = TRUE
baseturf = /turf/simulated/floor/beach/away/water/drop_no_overlay/dense

/* Lavaland */
/turf/simulated/floor/plasteel/lavaland_air
name = "floor"
temperature = 500
oxygen = 8
nitrogen = 14

/* Indestructible */
/turf/simulated/floor/indestructible/grass
name = "grass patch"
Expand Down
10 changes: 10 additions & 0 deletions modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/area/lavaland/surface/outdoors/legion
name = "Necropolis"
no_teleportlocs = TRUE
tele_proof = TRUE

/area/ruin/powered/scpfacility
icon_state = "yellow"

/area/ruin/powered/cheesus
icon_state = "yellow"
23 changes: 23 additions & 0 deletions modular_ss220/maps220/code/RandomRuins/lavaland/lavaland_turfs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/turf/simulated/floor/plasteel/lavaland_air
name = "floor"
temperature = 500
oxygen = 8
nitrogen = 14

/turf/simulated/floor/wood/fancy/oak/lavaland_air
name = "oak"
temperature = 500
oxygen = 8
nitrogen = 14

/turf/simulated/floor/grass/lavaland_air
name = "grass patch"
temperature = 500
oxygen = 8
nitrogen = 14

/turf/simulated/floor/grass/no_creep/lavaland_air
name = "grass patch"
temperature = 500
oxygen = 8
nitrogen = 14
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
report_alerts = FALSE

/* Twin-Nexus Space Hotel */
// area zones for twin nexus space hotel

/area/ruin/space/spacehotelv1
report_alerts = FALSE
requires_power = TRUE
Expand Down Expand Up @@ -100,8 +98,3 @@
/area/ruin/space/spacehotelv1/barber
name = "Hotel Barber"
icon_state = "awaycontent22"

/area/lavaland/surface/outdoors/legion
name = "Necropolis"
no_teleportlocs = TRUE
tele_proof = TRUE
Loading