Skip to content

Commit

Permalink
Merge branch 'merge_resolve' into fd-cultures
Browse files Browse the repository at this point in the history
  • Loading branch information
VoiceInYourHead committed May 15, 2024
2 parents 5884df5 + 19f3d03 commit 99f8056
Show file tree
Hide file tree
Showing 651 changed files with 148,944 additions and 582 deletions.
72 changes: 40 additions & 32 deletions maps/torch_fd/fd_torch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@
#include "../away/lost_supply_base/lost_supply_base.dm"
#include "../away/smugglers/smugglers.dm"
#include "../away/magshield/magshield.dm"
#include "../away/casino/casino.dm"
// #include "../away/casino/casino.dm"
#include "../away/yacht/yacht.dm"
#include "../away/blueriver/blueriver.dm"
// #include "../away/blueriver/blueriver.dm"
#include "../away/slavers/slavers_base.dm"
#include "../away/mobius_rift/mobius_rift.dm"
#include "../away/errant_pisces/errant_pisces.dm"
Expand All @@ -218,49 +218,57 @@
// USED MODS
// Keep them in ascending alphabetical order, please

// #include "../../mods/_maps/sentinel/_map_sentinel.dme" // К чёрту оверрайдит все ранги флота ЦПСС, ломает роль SEA
// #include "../../mods/_maps/farfleet/_map_farfleet.dme" // Не совсем работает без карты Стража (инклюд выше)
// #include "../../mods/_maps/hand/_map_hand.dme" // Тоже зависим от предметов с карты Стража (инклюд над фарфлитом)

#include "../../mods/antagonists/_antagonists.dme"
// #include "../../mods/atmos_ret_field/_atm_ret_field.dme"
#include "../../mods/bluespace_kitty/_bluespace_kitty.dme"
#include "../../mods/fancy_sofas/_fancy_sofas.dme"
#include "../../mods/guns/_guns.dme"
#include "../../mods/jukebox_tapes/_jukebox_tapes.dme"
#include "../../mods/legalese_language/_legalese.dme"
#include "../../mods/petting_zoo/_petting_zoo.dme"
// #include "../../mods/resomi/_resomi.dme"
#include "../../mods/screentips/_screentips.dme"
#include "../../mods/tajara/_tajara.dme"
#include "../../mods/sauna_props/_sauna_props.dme"
#include "../../mods/wyccbay_optimization/_wyccbay_optimization.dme"

// NON-UPSTREAM MODS
#include "../../mods/runechat/_runechat.dme"
#include "../../mods/fd_assets/_fd_assets.dme"

#include "../../mods/accent_labels/_accent_labels.dme"
#include "../../mods/additional_biomods/_additional_biomods.dme"
#include "../../mods/ascent/_ascent.dme"
#include "../../mods/combat_stances/_combat_stances.dme"
#include "../../mods/conference_holopads/_conference_holopads.dme"
#include "../../mods/fd_backgrounds/_fd_backgrounds.dme"
#include "../../mods/hestia_missiles/_hestia_missiles.dme"
#include "../../mods/landing_eye/_landing_eye.dme"
#include "../../mods/mob_interactions/_mob_interactions.dme"
#include "../../mods/multitile_vehicles/_multitile_vehicles.dme"
#include "../../mods/old_space_cannons/_old_space_cannons.dme"

// UNUSED MODS
// Keep them in ascending alphabetical order too, please

// #include "../../mods/atmos_ret_field/_atm_ret_field.dme"
// #include "../../mods/resomi/_resomi.dme"
// #include "../../mods/_maps/sentinel/_map_sentinel.dme" // К чёрту оверрайдит все ранги флота ЦПСС, ломает роль SEA
// #include "../../mods/_maps/farfleet/_map_farfleet.dme" // Не совсем работает без карты Стража (инклюд выше)
// #include "../../mods/_maps/hand/_map_hand.dme" // Тоже зависим от предметов с карты Стража (инклюд над фарфлитом)

// Почему UNUSED MODS стоит хранить?
// Потому что никто не проверяет использование тех или иных файлов
// в коде, и мод просто исчезнет из поля зрения, когда находясь здесь
// он всегда напоминает о своём существовании. Небольшая библиотека,
// если так вообще можно выразиться.
// ~NON-UPSTREAM MODS~ //
#include "../../mods/_fd/runechat/_runechat.dme"
#include "../../mods/_fd/fd_assets/_fd_assets.dme"

#include "../../mods/_fd/accent_labels/_accent_labels.dme"
#include "../../mods/_fd/additional_biomods/_additional_biomods.dme"
#include "../../mods/_fd/ascent/_ascent.dme"
#include "../../mods/_fd/bruno_items/_bruno_items.dme"
#include "../../mods/_fd/combat_stances/_combat_stances.dme"
#include "../../mods/_fd/complementary_xeno_ablities/_complementary_xeno_ablities.dme"
#include "../../mods/_fd/conference_holopads/_conference_holopads.dme"
#include "../../mods/_fd/hestia_missiles/_hestia_missiles.dme"
#include "../../mods/_fd/immersive_overmap/_immersive_overmap.dme"
#include "../../mods/_fd/landing_eye/_landing_eye.dme"
#include "../../mods/_fd/mob_interactions/_mob_interactions.dme"
#include "../../mods/_fd/multitile_vehicles/_multitile_vehicles.dme"
#include "../../mods/_fd/old_space_cannons/_old_space_cannons.dme"
#include "../../mods/_fd/random_rooms/_random_rooms.dme"

#include "../../mods/_fd/_maps/airfield/_airfield.dme"
#include "../../mods/_fd/_maps/ares/_ares.dme"
#include "../../mods/_fd/_maps/casino/_casino.dme"
#include "../../mods/_fd/_maps/constructed_station/_constructed_station.dme"
#include "../../mods/_fd/_maps/drone_carrier/_drone_carrier.dme"
#include "../../mods/_fd/_maps/facility/_facility.dme"
#include "../../mods/_fd/_maps/fluffy_biscuit/_fluffy_biscuit.dme"
#include "../../mods/_fd/_maps/lighthouse/_lighthouse.dme"
#include "../../mods/_fd/_maps/new_blueriver/_new_blueriver.dme"
#include "../../mods/_fd/_maps/providence/_providence.dme"
#include "../../mods/_fd/_maps/smugglers_ship/_smugglers_ship.dme"
#include "../../mods/_fd/_maps/snow_cage/_snow_cage.dme"
#include "../../mods/_fd/_maps/trader_ship/_trader_ship.dme"
#include "../../mods/_fd/_maps/yacht/_yacht.dme"

#define using_map_DATUM /datum/map/torch

Expand Down
4 changes: 2 additions & 2 deletions maps/torch_fd/torch3_deck3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
"oq" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood/ebony,/area/crew_quarters/sleep/cryo/cabin1)
"or" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/maintenance/thirddeck/port)
"os" = (/obj/structure/railing/mapped{dir = 8; icon_state = "railing0-1"},/obj/structure/railing/mapped,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/random/junk,/turf/simulated/floor/plating,/area/maintenance/thirddeck/starboard)
"ot" = (/obj{anchored = 1; icon = 'icons/obj/structures/stairs.dmi'; icon_state = "above"; name = "stairs"},/turf/simulated/floor/grass,/area/crew_quarters/observation)
"ot" = (/obj/floor_decal/stairs,/turf/simulated/floor/grass,/area/crew_quarters/observation)
"ou" = (/obj/machinery/light_switch{pixel_x = -6; pixel_y = -25},/turf/simulated/floor/wood/ebony,/area/crew_quarters/sleep/cryo/cabin1)
"ov" = (/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/floor_decal/corner/green,/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/aft)
"ow" = (/obj/structure/table/standard,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/item/reagent_containers/food/drinks/glass2/fitnessflask{pixel_x = -5; pixel_y = 4},/turf/simulated/floor/wood/ebony,/area/crew_quarters/sleep/cryo/cabin1)
Expand Down Expand Up @@ -1084,7 +1084,7 @@
"uT" = (/obj/machinery/status_display,/turf/simulated/wall/prepainted,/area/crew_quarters/sleep/cryo)
"uU" = (/turf/simulated/wall/prepainted,/area/crew_quarters/head)
"uV" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/visible/fuel,/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftport)
"uW" = (/obj{anchored = 1; dir = 1; icon = 'icons/obj/structures/stairs.dmi'; icon_state = "above"; name = "stairs"},/turf/simulated/floor/grass,/area/crew_quarters/observation)
"uW" = (/obj/floor_decal/stairs{dir = 1},/turf/simulated/floor/grass,/area/crew_quarters/observation)
"uX" = (/obj/structure/railing/mapped{dir = 4; icon_state = "railing0-1"},/turf/space,/area/space)
"vb" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/light/small{dir = 8},/obj/floor_decal/industrial/outline/yellow,/obj/item/device/radio/intercom{dir = 4; pixel_x = -21},/obj/machinery/recharge_station,/turf/simulated/floor/tiled/monotile,/area/crew_quarters/cryolocker)
"vc" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftstarboard)
Expand Down
2 changes: 1 addition & 1 deletion maps/torch_fd/torch5_deck1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@
"guP" = (/obj/structure/table/rack,/obj/item/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/obj/item/storage/firstaid/toxin,/obj/random/medical/lite,/obj/floor_decal/corner/paleblue/mono,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/light,/turf/simulated/floor/tiled/white/monotile,/area/medical/equipstorage)
"gvC" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/safe_room/firstdeck)
"gvE" = (/obj/machinery/shield_diffuser,/obj/structure/lattice,/turf/space,/area/space)
"gvG" = (/obj{dir = 1; icon = 'icons/obj/structures/stairs.dmi'; icon_state = "above"; name = "stairs"},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/cryo/aux)
"gvG" = (/obj/floor_decal/stairs{dir = 1},/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/cryo/aux)
"gvJ" = (/turf/simulated/wall/r_wall/prepainted,/area/security/questioning)
"gxi" = (/obj/floor_decal/industrial/outline/yellow,/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled,/area/security/processing)
"gxX" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/catwalk_plated,/turf/simulated/floor/plating,/area/hallway/primary/firstdeck/aft)
Expand Down
4 changes: 4 additions & 0 deletions maps/torch_fd/torch_decals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@

/obj/floor_decal/corner/purple_dark/bordercee
icon_state = "bordercolorcee"

/obj/floor_decal/stairs
icon = 'icons/obj/structures/stairs.dmi'
icon_state = "above"
4 changes: 2 additions & 2 deletions maps/torch_fd/torch_define.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
default_law_type = /datum/ai_laws/solgov

use_overmap = 1
num_exoplanets = 1
num_exoplanets = 0

away_site_budget = 3
away_site_budget = 0
min_offmap_players = 12

id_hud_icons = 'maps/torch/icons/assignment_hud.dmi'
Expand Down
4 changes: 4 additions & 0 deletions mods/_fd/_maps/airfield/_airfield.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/singleton/modpack/airfield
name = "Аэродром"
desc = "Добавляет авейку-аэродром сразу с несколькими боевыми шаттлами ЦПСС."
author = "Doctor Alex"
13 changes: 13 additions & 0 deletions mods/_fd/_maps/airfield/_airfield.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#ifndef MODPACK_AIRFIELD
#define MODPACK_AIRFIELD

#include "_airfield.dm"

#include "code/airfield_areas.dm"
#include "code/airfield_job.dm"
#include "code/airfield_light.dm"
#include "code/airfield_shuttles.dm"
#include "code/airfield.dm"
#include "code/cadet_rank.dm"

#endif
149 changes: 149 additions & 0 deletions mods/_fd/_maps/airfield/code/airfield.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
/obj/submap_landmark/joinable_submap/airfield
name = "Rubicon 3 Airfield"
archetype = /singleton/submap_archetype/derelict/airfield

/singleton/submap_archetype/derelict/airfield
descriptor = "Rubicon 3 Airfield"
map = "Rubicon 3 Airfield"
crew_jobs = list(
/datum/job/submap/airfield/command/instructor,
/datum/job/submap/airfield/command/assistant,
/datum/job/submap/airfield/engineer,
/datum/job/submap/airfield/cadet,
)

/obj/overmap/visitable/ship/airfield
name = "Rubicon 3 Airfield"
desc = "Sensor array detects a large planet, named Rubicon 3, with big amount of various infrastructure on it."
vessel_mass = 100000
free_landing = FALSE
icon_state = "globe"
color = "#6db8b8"
fore_dir = NORTH
initial_restricted_waypoints = list(
"PM-55-L Star #1" = list("nav_airfield_star_1", "nav_airfield_1"),
"PM-55-L Star #2" = list("nav_airfield_star_2", "nav_airfield_2"),
"PM-55-L Star #3" = list("nav_airfield_star_3", "nav_airfield_3"),
"PM-55-L Star #4" = list("nav_airfield_star_4", "nav_airfield_4"),
"PM-08 Bull #1" = list("nav_airfield_bull_1", "nav_airfield_5"),
"PM-08 Bull #2" = list("nav_airfield_bull_2", "nav_airfield_6"),
"PM-15 Nightbat #1" = list("nav_airfield_nightbat_1", "nav_airfield_7"),
"PM-15 Nightbat #2" = list("nav_airfield_nightbat_2", "nav_airfield_8"),
"PM-57 Spear #1" = list("nav_airfield_spear_1", "nav_airfield_9"),
"PM-57 Spear #2" = list("nav_airfield_spear_2", "nav_airfield_10"),
"PM-100 Scarab" = list("nav_airfield_scarab", "nav_airfield_11")
)
initial_generic_waypoints = list(
"nav_airfield_1",
"nav_airfield_2",
"nav_airfield_3",
"nav_airfield_4",
"nav_airfield_5",
"nav_airfield_6",
"nav_airfield_7",
"nav_airfield_8",
"nav_airfield_9",
"nav_airfield_10",
"nav_airfield_11",
)

/datum/map_template/ruin/away_site/airfield
name = "Rubicon 3 Airfield"
id = "awaysite_airfield"
description = "Free Trade Union salvage ship"
prefix = "mods/_fd/_maps/airfield/maps/"
suffixes = list("airfield-1.dmm", "airfield-2.dmm")
spawn_cost = INFINITY
player_cost = 6
area_usage_test_exempted_root_areas = list(/area/ship/airfield)
shuttles_to_initialise = list(
/datum/shuttle/autodock/overmap/airfield1,
/datum/shuttle/autodock/overmap/airfield2,
/datum/shuttle/autodock/overmap/airfield3,
/datum/shuttle/autodock/overmap/airfield4,
/datum/shuttle/autodock/overmap/airfield5,
/datum/shuttle/autodock/overmap/airfield6,
/datum/shuttle/autodock/overmap/airfield7,
/datum/shuttle/autodock/overmap/airfield8,
/datum/shuttle/autodock/overmap/airfield9,
/datum/shuttle/autodock/overmap/airfield10,
/datum/shuttle/autodock/overmap/airfield11,
/datum/shuttle/autodock/ferry/airfield1,
/datum/shuttle/autodock/ferry/airfield2
)
apc_test_exempt_areas = list(
/area/ship/airfield/outdoors = NO_SCRUBBER|NO_VENT|NO_APC
)


//elevator

/obj/machinery/computer/shuttle_control/lift/airfield1
name = "ODT 1 controls"
shuttle_tag = "ODT 1 lift"
ui_template = "shuttle_control_console_lift.tmpl"
icon_state = "tiny"
icon_keyboard = "tiny_keyboard"
icon_screen = "lift"
density = FALSE

/datum/shuttle/autodock/ferry/airfield1
name = "ODT 1 lift"
shuttle_area = /area/ship/airfield/lift1
warmup_time = 3
waypoint_station = "nav_airfield_adt1_lift_top"
waypoint_offsite = "nav_airfield_adt1_lift_bottom"
sound_takeoff = 'sound/effects/lift_heavy_start.ogg'
sound_landing = 'sound/effects/lift_heavy_stop.ogg'
ceiling_type = null
knockdown = 0
defer_initialisation = TRUE

/obj/shuttle_landmark/lift/airfield/top1
name = "Top Deck"
landmark_tag = "nav_airfield_adt1_lift_top"
base_area = /area/ship/airfield/adt1/upper
base_turf = /turf/simulated/open

/obj/shuttle_landmark/lift/airfield/bottom1
name = "Lower Deck"
landmark_tag = "nav_airfield_adt1_lift_bottom"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/ship/airfield/adt1
base_turf = /turf/simulated/floor/plating



/obj/machinery/computer/shuttle_control/lift/airfield2
name = "ODT 2 controls"
shuttle_tag = "ODT 2 lift"
ui_template = "shuttle_control_console_lift.tmpl"
icon_state = "tiny"
icon_keyboard = "tiny_keyboard"
icon_screen = "lift"
density = FALSE

/datum/shuttle/autodock/ferry/airfield2
name = "ODT 2 lift"
shuttle_area = /area/ship/airfield/lift2
warmup_time = 3
waypoint_station = "nav_airfield_adt2_lift_top"
waypoint_offsite = "nav_airfield_adt2_lift_bottom"
sound_takeoff = 'sound/effects/lift_heavy_start.ogg'
sound_landing = 'sound/effects/lift_heavy_stop.ogg'
ceiling_type = null
knockdown = 0
defer_initialisation = TRUE

/obj/shuttle_landmark/lift/airfield/top2
name = "Top Deck"
landmark_tag = "nav_airfield_adt2_lift_top"
base_area = /area/ship/airfield/adt2/upper
base_turf = /turf/simulated/open

/obj/shuttle_landmark/lift/airfield/bottom2
name = "Lower Deck"
landmark_tag = "nav_airfield_adt2_lift_bottom"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/ship/airfield/adt2
base_turf = /turf/simulated/floor/plating
Loading

0 comments on commit 99f8056

Please sign in to comment.