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

The Ascent #2678

Merged
merged 14 commits into from
Sep 28, 2024
7 changes: 7 additions & 0 deletions code/__defines/~mods/~master_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
#define LANGUAGE_SIIK_TAJR "Siik'tajr"
// TAJARA - End

// ASCENT - Start
#define SPECIES_MANTID_ALATE "Kharmaan Alate"
#define SPECIES_MANTID_GYNE "Kharmaan Gyne"
#define SPECIES_MONARCH_WORKER "Monarch Serpentid Worker"
#define SPECIES_MONARCH_QUEEN "Monarch Serpentid Queen"
// ASCENT - End

// LEGALESE - Start
#define LANGUAGE_LEGALESE "Legalese"
// LEGALESE - End
Expand Down
5 changes: 4 additions & 1 deletion maps/sierra/sierra.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
#include "../../mods/_maps/hand/_map_hand.dme"

#include "../../mods/antagonists/_antagonists.dme"
//#include "../../mods/bluespace_kitty/_bluespace_kitty.dme" [SIERRA-REMOVE]
#include "../../mods/ascent/_ascent.dme"
#include "../../mods/fancy_sofas/_fancy_sofas.dme"
#include "../../mods/guns/_guns.dme"
#include "../../mods/jukebox_tapes/_jukebox_tapes.dme"
Expand All @@ -209,7 +209,10 @@
// UNUSED MODS
// Keep them in ascending alphabetical order too, please

// #include "../../mods/_maps/ascent/_map_ascent.dme"
// #include "../../mods/_maps/ascent_caulship/_map_ascent_caulship.dme"
// #include "../../mods/atmos_ret_field/_atm_ret_field.dme"
// #include "../../mods/bluespace_kitty/_bluespace_kitty.dme"

// Почему UNUSED MODS стоит хранить?
// Потому что никто не проверяет использование тех или иных файлов
Expand Down
3 changes: 3 additions & 0 deletions mods/_maps/ascent/_map_ascent.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/singleton/modpack/map_ascent
name = "Тогровое судно Liberia"
desc = "Авейка, включающая в себя две новые профессии и созданная для разнообразия геймплея с экономической стороны."
11 changes: 11 additions & 0 deletions mods/_maps/ascent/_map_ascent.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef MODPACK_MAP_ASCENT_SHIP
#define MODPACK_MAP_ASCENT_SHIP

#include "_map_ascent.dm"

#include "code/ascent.dm"
#include "code/ascent_areas.dm"
#include "code/ascent_jobs.dm"
#include "code/ascent_shuttles.dm"

#endif
62 changes: 62 additions & 0 deletions mods/_maps/ascent/code/ascent.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#define DAMAGED_ASCENT_COLONY_SHIP_NAME "\improper Ascent Colony Ship"

#include "ascent_areas.dm"
#include "ascent_jobs.dm"
#include "ascent_shuttles.dm"

// Map template data.
/datum/map_template/ruin/away_site/ascent_seedship_inf
name = DAMAGED_ASCENT_COLONY_SHIP_NAME
id = "awaysite_ascent_seedship_inf"
description = "A small Ascent colony ship. Looks like it was damaged."
prefix = "mods/_maps/ascent/maps/"
suffixes = list("ascent-1.dmm")
spawn_cost = 2000 // Отключено до лучших времен. Было 2 ~Laxesh
spawn_weight = 50 //HABITABLE SHIPS SPAWN
shuttles_to_initialise = list(
/datum/shuttle/autodock/overmap/ascent_inf,
/datum/shuttle/autodock/overmap/ascent_inf/two
)

// Overmap objects.
/obj/effect/overmap/visitable/ship/ascent_seedship_inf
name = DAMAGED_ASCENT_COLONY_SHIP_NAME
scanner_name = DAMAGED_ASCENT_COLONY_SHIP_NAME
desc = "Wake signature indicates a small to medium sized vessel of unknown design."
color = COLOR_PURPLE
vessel_mass = 6500
contact_class = /singleton/ship_contact_class/ship
fore_dir = WEST
max_speed = 0.6/(1 SECOND)
hide_from_reports = TRUE
initial_restricted_waypoints = list(
"Trichopterax" = list("nav_hangar_ascent_inf_one"),
"Lepidopterax" = list("nav_hangar_ascent_inf_two")
)
known = 0

/obj/effect/submap_landmark/joinable_submap/ascent_seedship_inf
name = DAMAGED_ASCENT_COLONY_SHIP_NAME
archetype = /singleton/submap_archetype/ascent_seedship_inf
submap_datum_type = /datum/submap/ascent_inf

/obj/effect/submap_landmark/joinable_submap/ascent_seedship_inf/Initialize(mapload)
var/list/all_elements = list(
"Hydrogen", "Helium", "Lithium", "Beryllium", "Carbon", "Nitrogen", "Oxygen",
"Fluorine", "Neon", "Sodium", "Magnesium", "Silicon", "Phosphorus", "Sulfur",
"Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Chromium",
"Manganese", "Iron", "Cobalt", "Nickel", "Zinc", "Gallium", "Germanium",
"Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Zirconium",
"Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium",
"Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium",
"Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium",
"Gadolinium", "Dysprosium", "Holmium", "Erbium", "Ytterbium", "Hafnium", "Tantalum",
"Tungsten", "Rhenium", "Osmium", "Iridium", "Gold", "Mercury", "Lead",
"Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium",
"Thorium", "Uranium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium",
"Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium",
"Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium",
"Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"
)
name = "[pick(all_elements)]-[rand(10,99)]-[rand(10,99)]"
. = ..()
69 changes: 69 additions & 0 deletions mods/_maps/ascent/code/ascent_areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/area/ship/ascent_inf
name = "\improper Ascent Seedship"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT
base_turf = /turf/space
req_access = list(access_ascent)

/area/ship/ascent_inf/bridge
name = "\improper Ascent Seedship - Command Chamber"
icon_state = "bridge"

/area/ship/ascent_inf/habitation
name = "\improper Ascent Seedship - Habitation Chamber"
icon_state = "conf"

/area/ship/ascent_inf/wing_port
name = "\improper Ascent Seedship - Hospital Chamber"
icon_state = "entry_1"

/area/ship/ascent_inf/wing_starboard
name = "\improper Ascent Seedship - Maintenance Chamber"
icon_state = "entry_2"

/area/ship/ascent_inf/engineering
name = "\improper Ascent Seedship - Power Chamber"
icon_state = "engine_smes"

/area/ship/ascent_inf/hydroponics_starboard
name = "\improper Ascent Seedship - Starboard Hydroponics Chamber"
icon_state = "green"

/area/ship/ascent_inf/hydroponics_port
name = "\improper Ascent Seedship - Port Hydroponics Chamber"
icon_state = "hydro"

/area/ship/ascent_inf/shuttle_port
name = "\improper Trichopterax"
icon_state = "shuttlered"

/area/ship/ascent_inf/shuttle_starboard
name = "\improper Lepidopterax"
icon_state = "shuttlered"

/area/ship/ascent_inf/fore_hallway
name = "\improper Ascent Seedship - Antechamber"
icon_state = "dk_yellow"

/area/ship/ascent_inf/fore_starboard_prow
name = "\improper Ascent Seedship - Fabrication Bay"
icon_state = "armory"

/area/ship/ascent_inf/fore_starboard_jut
name = "\improper Ascent Seedship - Holding Cells"
icon_state = "purple"

/area/ship/ascent_inf/aft_starboard_jut
name = "\improper Ascent Seedship - Auxillary Storage"
icon_state = "green"

/area/ship/ascent_inf/fore_port_prow
name = "\improper Ascent Seedship - Feeding Chamber"
icon_state = "cafeteria"

/area/ship/ascent_inf/fore_port_spike
name = "\improper Ascent Seedship - Fore Port Spike"
icon_state = "purple"

/area/ship/ascent_inf/fore_starboard_spike
name = "\improper Ascent Seedship - Fore Starboard Spike"
icon_state = "ai"
Loading