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

Awayshit #49

Merged
merged 3 commits into from
Aug 4, 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
8 changes: 5 additions & 3 deletions maps/torch_fd/fd_torch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@
#include "../../mods/sauna_props/_sauna_props.dme"
#include "../../mods/wyccbay_optimization/_wyccbay_optimization.dme"

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

// ~NON-UPSTREAM MODS~ //

Expand Down Expand Up @@ -283,13 +283,15 @@
#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/farfleet_fd/_map_farfleet.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/small_exoplanet_1/_small_exoplanet_1.dme"
#include "../../mods/_fd/_maps/smugglers_ship/_smugglers_ship.dme"
#include "../../mods/_fd/_maps/snow_cage/_snow_cage.dme"
#include "../../mods/_fd/_maps/sfv_dropship/_delman.dme"
// #include "../../mods/_fd/_maps/sentinel_fd/_sentinel.dme"
#include "../../mods/_fd/_maps/trader_ship/_trader_ship.dme"
#include "../../mods/_fd/_maps/yacht/_yacht.dme"
#include "../../mods/_fd/_maps/gccv_ulyanovsk/_ulyanovsk.dme"
Expand Down
3 changes: 3 additions & 0 deletions mods/_fd/_maps/farfleet_fd/_map_farfleet.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/singleton/modpack/map_farfleet
name = "Разведывательный корабль Пионерского Корпуса КФ ГКК"
desc = "Авейка, включающая в себя разведывательный корабль, принадлежащий к Пионерскому корпусу КФ ГКК."
16 changes: 16 additions & 0 deletions mods/_fd/_maps/farfleet_fd/_map_farfleet.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#ifndef MODPACK_MAP_FARFLEET
#define MODPACK_MAP_FARFLEET

#include "_map_farfleet.dm"
#include "code/farfleet.dm"
#include "code/farfleet_areas.dm"
#include "code/farfleet_crew.dm"
#include "code/farfleet_faction.dm"
#include "code/farfleet_items.dm"
#include "code/farfleet_presets.dm"
#include "code/farfleet_shuttle.dm"
#include "code/farfleet_structures.dm"
#include "code/farfleet_turbolift.dm"
#include "assets.dm"

#endif
58 changes: 58 additions & 0 deletions mods/_fd/_maps/farfleet_fd/assets.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/obj/paint/dark_gunmetal
color = COLOR_DARK_GUNMETAL

/obj/floor_decal/corner/darkblue
name = "dark blue corner"
color = COLOR_COMMAND_BLUE

/obj/floor_decal/corner/darkblue/diagonal
icon_state = "corner_white_diagonal"

/obj/floor_decal/corner/darkblue/three_quarters
icon_state = "corner_white_three_quarters"

/obj/floor_decal/corner/darkblue/full
icon_state = "corner_white_full"

/obj/floor_decal/corner/darkblue/border
icon_state = "bordercolor"

/obj/floor_decal/corner/darkblue/half
icon_state = "bordercolorhalf"

/obj/floor_decal/corner/darkblue/mono
icon_state = "bordercolormonofull"

/obj/floor_decal/corner/darkblue/bordercorner
icon_state = "bordercolorcorner"

/obj/floor_decal/corner/darkblue/bordercorner2
icon_state = "bordercolorcorner2"

/obj/floor_decal/corner/darkblue/borderfull
icon_state = "bordercolorfull"

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

/obj/floor_decal/industrial/warning/half
name = "floor decal"
icon = 'maps/sierra/icons/turf/decals.dmi'
icon_state = "warninghalf"

/obj/paint_stripe/nt_red
color = "#9d2300"

/obj/floor_decal/industrial/hatch/grey
color = "#808080"

/obj/floor_decal/corner/grey_alt/diagonal
icon_state = "corner_white_diagonal"

/obj/structure/sign/poster/no_alcohol
icon_state = "no_alcohol"
poster_type = /singleton/poster/no_alcohol

/obj/floor_decal/industrial/outline/green
name = "green outline" //INF, WAS orange outline
color = COLOR_GREEN_GRAY //INF, WAS COLOR_GREEN
110 changes: 110 additions & 0 deletions mods/_fd/_maps/farfleet_fd/code/farfleet.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@

///////////
//OVERMAP//
///////////

/obj/overmap/visitable/ship/farfleet
name = "Pioneer Corps Gunboat"
desc = "ICGNV Garibaldi-class Gunboat. This craft bears markings of Pioneer Corps"
color = "#fc7a00"
fore_dir = WEST
vessel_mass = 1000
known_ships = list(/obj/overmap/visitable/ship/landable/snz)
vessel_size = SHIP_SIZE_SMALL
hide_from_reports = TRUE
start_x = 39
start_y = 39

initial_generic_waypoints = list(
"nav_farfleet_1",
"nav_farfleet_2",
"nav_farfleet_3",
"nav_farfleet_4",
"nav_hangar_snz"
)

initial_restricted_waypoints = list(
"SNZ" = list("nav_hangar_snz")
)

#define RECON_SHIP_PREFIX pick("Admiral Sobolev","Ivan Kozhedub","Sevastopol","Zirkel","Kurchatov","Gomel","Admiral Kolchak","Udaloi","Omsk","Krondstatt","Admiral Nakhimov","Iron Dmitry","Simbirsk","Apostle Peter","Admiral Chernavin","Proryv","Triumph","Besstrashnyi","Elisarov","Magnitogorsk")
/obj/overmap/visitable/ship/farfleet/New()
name = "ICCGN PC [RECON_SHIP_PREFIX], \a [name]"
for(var/area/ship/farfleet/A)
A.name = "\improper [name] - [A.name]"
GLOB.using_map.area_purity_test_exempt_areas += A.type
..()
#undef RECON_SHIP_PREFIX

/datum/map_template/ruin/away_site/farfleet
name = "Pioneer Corps Gunboat (ICGNV)"
id = "awaysite_recon_ship"
description = "Garibaldi-class Gunboat, ICCG Pioneer Corps Reconnaissance Craft."
// prefix = "mods/_fd/_maps/farfleet/maps/"
// suffixes = list("farfleet-1.dmm", "farfleet-2.dmm")
// ban_ruins = list(/datum/map_template/ruin/away_site/patrol)
mappaths = list("mods/_fd/_maps/farfleet_fd/maps/farfleet-1.dmm", "mods/_fd/_maps/farfleet_fd/maps/farfleet-2.dmm")
spawn_cost = 0.5
player_cost = 7
spawn_weight = 1
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/snz)

area_usage_test_exempted_areas = list(
/area/turbolift/farfleet_first,
/area/turbolift/farfleet_second
)

#ifdef MODPACK_MAP_SENTINEL
/datum/map_template/ruin/away_site/farfleet
ban_ruins = list(/datum/map_template/ruin/away_site/patrol)
#endif

/obj/shuttle_landmark/nav_farfleet/nav1
name = "Pioneer Corps Ship Fore"
landmark_tag = "nav_farfleet_1"

/obj/shuttle_landmark/nav_farfleet/nav2
name = "Pioneer Corps Ship Aft"
landmark_tag = "nav_farfleet_2"

/obj/shuttle_landmark/nav_farfleet/nav3
name = "Pioneer Corps Ship Port"
landmark_tag = "nav_farfleet_3"

/obj/shuttle_landmark/nav_farfleet/nav4
name = "Pioneer Corps Ship Starboard"
landmark_tag = "nav_farfleet_4"

/obj/submap_landmark/joinable_submap/farfleet
name = "ICCGN PC Ship"
archetype = /singleton/submap_archetype/away_iccgn_farfleet

/* TCOMMS
* ======
*/

/obj/machinery/telecomms/allinone/iccgn
listening_freqs = list(ICCGN_FREQ)
channel_color = COMMS_COLOR_ICCG
channel_name = "Pioneer"
circuitboard = /obj/item/stock_parts/circuitboard/telecomms/allinone/iccgn


//Items
/obj/item/device/radio/headset/iccgn
name = "iccgn headset"
desc = "Headset belonging to an ICCGN operative."
icon_state = "syndie_headset"
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/iccgn

/obj/item/device/radio/headset/iccgn/Initialize()
. = ..()
set_frequency(ICCGN_FREQ)

/obj/item/device/encryptionkey/iccgn
name = "\improper ICCGN radio encryption key"
channels = list("ICGN Ship" = 1)

/obj/item/stock_parts/circuitboard/telecomms/allinone/iccgn
build_path = /obj/machinery/telecomms/allinone/iccgn
Loading
Loading