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

New planet : Lythios 43a - The sky planet #6986

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
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
7 changes: 7 additions & 0 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3470,6 +3470,8 @@
#include "code\modules\maps\templates\submaps\lavaland\lavaland.dm"
#include "code\modules\maps\templates\submaps\lythios_rift\lyhtios.dm"
#include "code\modules\maps\templates\submaps\lythios_rift\lythios_areas.dm"
#include "code\modules\maps\templates\submaps\sky_planet\sky_planet_rigs.dm"
#include "code\modules\maps\templates\submaps\sky_planet\sky_planet_areas.dm"
#include "code\modules\maps\templates\submaps\virgo2\virgo2.dm"
#include "code\modules\maps\templates\submaps\virgo2\virgo2_areas.dm"
#include "code\modules\maps\templates\submaps\virgo3b\plains.dm"
Expand All @@ -3490,6 +3492,7 @@
#include "code\modules\maps\weather\lavaland.dm"
#include "code\modules\maps\weather\miaphus.dm"
#include "code\modules\maps\weather\rift_lythios-43c.dm"
#include "code\modules\maps\weather\sky_planet.dm"
#include "code\modules\maps\weather\tether_virgo3b.dm"
#include "code\modules\maps\weather\virgo4.dm"
#include "code\modules\materials\dynamics.dm"
Expand Down Expand Up @@ -5453,6 +5456,10 @@
#include "maps\sectors\nebula_tradeport\nebula_tradeport.dm"
#include "maps\sectors\piratebase_192\piratebase_192.dm"
#include "maps\sectors\roguemining_192\roguemining_192.dm"
#include "maps\sectors\sky_planet\sky_planet.dm"
#include "maps\sectors\sky_planet\sky_planet-areas.dm"
#include "maps\sectors\sky_planet\sky_planet-misc.dm"
#include "maps\sectors\sky_planet\sky_planet-shuttles.dm"
#include "maps\sectors\surt\surt.dm"
#include "maps\sectors\surt\surt_areas.dm"
#include "maps\sectors\virgo2_140\virgo2_140.dm"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/atmospherics/atmospheres.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
// Tethermap
/// Virgo 2 planetary atmosphere ID
#define ATMOSPHERE_ID_VIRGO2 /datum/atmosphere/planet/virgo2
/// Sky planet atmosphere ID
#define ATMOSPHERE_ID_SKYPLANET /datum/atmosphere/planet/sky_planet
#define ATMOSPHERE_ID_SKYPLANET_GROUND /datum/atmosphere/planet/sky_planet/ground
/// Virgo 3b (station) planetary atmosphere ID
#define ATMOSPHERE_ID_VIRGO3B /datum/atmosphere/planet/virgo3b
/// Lythios4c (station) atmosphere ID
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/planets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#define WEATHER_PRE_ASH_STORM "approaching ash storm"
/// Ripped from TG, like the above. Less harmless.
#define WEATHER_ASH_STORM "ash storm"
#define WEATHER_ACID_RAIN "acid rain"
#define WEATHER_PRE_ACID_RAIN "approching acid rain"
/// Modified emberfall, actually harmful. Admin only.
#define WEATHER_FALLOUT "fallout"
#define WEATHER_SANDSTORM "sandstorm"
Expand Down
12 changes: 12 additions & 0 deletions code/game/objects/structures/lightpost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,15 @@

/obj/structure/lightpost/festive/unlit
lit = FALSE

/obj/structure/lightpost/urban
desc = "A lightpost used in cities."
festive = TRUE
name = "lightpost"
icon = 'icons/obj/32x64.dmi'
icon_state = "lightpost_urban"
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
anchored = TRUE
density = FALSE
opacity = FALSE
4 changes: 4 additions & 0 deletions code/game/turfs/simulated/floor_types/water.dm
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ CREATE_STANDARD_TURFS(/turf/simulated/floor/water/acid)
slowdown = 4
depth = 4
layer = WATER_FLOOR_LAYER
light = 1
light_color = "#43ff09"
light_range = 8
light_power = 2

/turf/simulated/floor/water/acid/update_icon()
..() // To get the edges.
Expand Down
12 changes: 12 additions & 0 deletions code/game/turfs/simulated/sky.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,18 @@
skyfall_levels = list(z+1)
. = ..()

/turf/simulated/sky/skyplanet
name = "Sky Planet Clouds"
desc = "Be careful where you step!"
color = "#ffe8a9"
initial_gas_mix = ATMOSPHERE_ID_SKYPLANET
outdoors = 1
density = 0

/turf/simulated/sky/skyplanet/Initialize(mapload)
skyfall_levels = list(z - 1)
. = ..()

/turf/simulated/sky/depths
name = "darkness"
desc = "A straight drop down into the depths below."
Expand Down
51 changes: 51 additions & 0 deletions code/modules/maps/templates/submaps/sky_planet/sky_planet_areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/area/submap/skyplanet/poi/botany
name = "POI - Botany rig"
requires_power = 0

/area/submap/skyplanet/poi/sdf
name = "POI - Overrun SDF base"
requires_power = 0

/area/submap/skyplanet/poi/cludge
name = "POI - Fighter bay"
requires_power = 0

/area/submap/skyplanet/poi/home
name = "POI - Colonist home"
requires_power = 0

/area/submap/skyplanet/poi/nest
name = "POI - Bird Nest"
requires_power = 0

/area/submap/skyplanet/poi/mining
name = "POI - Drilling station"
requires_power = 0

/area/submap/skyplanet/poi/clown
name = "POI - Clown base"
requires_power = 0

/area/submap/skyplanet/poi/tajaranreb
name = "POI - Tajaran rebels base"
requires_power = 0

/area/submap/skyplanet/poi/mercbase
name = "POI - Merc base"
requires_power = 0

/area/submap/skyplanet/poi/mechbase
name = "POI - Mech fabricator rig"
requires_power = 0

/area/submap/skyplanet/poi/broken1
name = "POI - Ruined rig"
requires_power = 0

/area/submap/skyplanet/poi/broken2
name = "POI - Ruined rig 2"
requires_power = 0

/area/submap/skyplanet/poi/broken3
name = "POI - Ruined rig 3"
requires_power = 0
84 changes: 84 additions & 0 deletions code/modules/maps/templates/submaps/sky_planet/sky_planet_rigs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/datum/map_template/submap/level_specific/sky_planet_rigs
name = "Surface Content - Skyplanet Rigs"
desc = "Used to make the surface outside the outpost be 16% less boring."
prefix = "maps/submaps/sky_planet_rigs/"

//Rigs are to be arround 20x20

/datum/map_template/submap/level_specific/sky_planet_rigs/botany
name = "Botany rig"
desc = "A botany rig, used to grow vegetables"
suffix = "botany1.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/clown
name = "Clown rig"
desc = "A little goonstation, don't you think ?"
suffix = "clown.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/cludge
name = "Cludge rig"
desc = "A small pod bay made by someone repairing and making some cludge."
suffix = "cludge.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/home
name = "Home rig"
desc = "A small home made on rigs for frontier colonist."
suffix = "home.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/mechbase
name = "Mech fabrication rig"
desc = "A small factory making APLU Mechs."
suffix = "mechbase.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/mercbase
name = "Merc HQ rig"
desc = "The headquarters of a merc group."
suffix = "mercbase.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/miningrig
name = "Mining rig"
desc = "A mining rig."
suffix = "miningdrill.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/nest
name = "Nest rig"
desc = "Old rig, now broken, that became a nest."
suffix = "nest.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/ruin1
name = "Ruined rig"
desc = "Old rig, now broken."
suffix = "ruin1.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/ruin2
name = "Ruined rig"
desc = "Old rig, now broken."
suffix = "ruin2.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/ruin3
name = "Ruined rig"
desc = "Old rig, now broken."
suffix = "ruin3.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/sdf
name = "SDF Base"
desc = "A sdf base, that got overun."
suffix = "sdfoutpost.dmm"
cost = 5

/datum/map_template/submap/level_specific/sky_planet_rigs/tajaranrebel
name = "Tajaran rebel Base"
desc = "A tajaran base, that got overun."
suffix = "tajaranrebelbase.dmm"
cost = 5
Loading
Loading