Skip to content

Commit

Permalink
but why are things not in triumph folder?
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Sep 18, 2024
1 parent bacf0bf commit 530e2ad
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 17 deletions.
5 changes: 4 additions & 1 deletion citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3318,7 +3318,6 @@
#include "code\modules\maps\overmap\space\talon\talon_areas.dm"
#include "code\modules\maps\overmap\space\trade_station\trade_station.dm"
#include "code\modules\maps\overmap\space\trade_station\trade_station_jobs.dm"
#include "code\modules\maps\overmap\space\triumph\triumph.dm"
#include "code\modules\maps\templates\badmin_misc\fun.dm"
#include "code\modules\maps\templates\badmin_misc\templates.dm"
#include "code\modules\maps\templates\misc_presets\rift_shuttle_landmarks.dm"
Expand Down Expand Up @@ -5301,15 +5300,19 @@
#include "maps\triumph\sectors.dm"
#include "maps\triumph\shuttles.dm"
#include "maps\triumph\telecomms.dm"
#include "maps\triumph\triumph-overmap.dm"
#include "maps\triumph\triumph-sectors.dm"
#include "maps\triumph\triumph-shuttle-landmarks.dm"
#include "maps\triumph\triumph-turbolifts.dm"
#include "maps\triumph\triumph.dm"
#include "maps\victory\engines.dm"
#include "maps\victory\sectors.dm"
#include "maps\victory\shuttles.dm"
#include "maps\victory\telecomms.dm"
#include "maps\victory\victory-areas.dm"
#include "maps\victory\victory-overmap.dm"
#include "maps\victory\victory-sectors.dm"
#include "maps\victory\victory-shuttle-landmarks.dm"
#include "maps\victory\victory-turbolifts.dm"
#include "maps\victory\victory.dm"
// END_INCLUDE
16 changes: 0 additions & 16 deletions maps/generic/turbolifts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,6 @@
/area/turbolift/rwest_mining/surface
)

/obj/turbolift_map_holder/triumph
name = "Triumph Climber"
depth = 4
lift_size_x = 3
lift_size_y = 1
icon = 'icons/obj/turbolift_preview_3x3.dmi'
wall_type = null // Don't make walls

areas_to_use = list(
/area/turbolift/t_ship/level1,
/area/turbolift/t_ship/level2,
/area/turbolift/t_ship/level3,
/area/turbolift/t_ship/level4
)


/obj/turbolift_map_holder/tether
name = "Tether Climber"
depth = 6
Expand Down
File renamed without changes.
15 changes: 15 additions & 0 deletions maps/triumph/triumph-turbolifts.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

/obj/turbolift_map_holder/triumph
name = "Triumph Climber"
depth = 4
lift_size_x = 3
lift_size_y = 1
icon = 'icons/obj/turbolift_preview_3x3.dmi'
wall_type = null // Don't make walls

areas_to_use = list(
/area/turbolift/t_ship/level1,
/area/turbolift/t_ship/level2,
/area/turbolift/t_ship/level3,
/area/turbolift/t_ship/level4
)
27 changes: 27 additions & 0 deletions maps/victory/victory-overmap.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/obj/overmap/entity/visitable/ship/victory
name = "NSV Victory" // Name of the location on the overmap.
desc = "The Victory is one of the many ships that is a part of the NDV Marksmans Fleet in this sector"

scanner_desc = @{"[i]Registration[/i]: NSV Victory
[i]Class[/i]: Science Vessel
[i]Transponder[/i]: Transmitting (CIV), Nanotrasen IFF
[b]Notice[/b]: Nanotrasen Vessel, authorized personnel only"}

icon_state = "ship"
vessel_mass = 12500 // temporarily buffed by 2x due to vorestation fucking up large gas thruster code
burn_delay = 2 SECONDS
fore_dir = EAST // Which direction the ship/z-level is facing. It will move dust particles from that direction when moving.
base = TRUE // Honestly unsure what this does but it seems the main sector or "Map" we're at has this so here it stays
// The waypoints that are avaliable once you are at this Navpoint
initial_generic_waypoints = list("nav_capitalship_docking2", "victory_excursion_hangar", "victory_space_SW", "victory_mining_port")

initial_restricted_waypoints = list(
"Excursion Shuttle" = list("victory_excursion_hangar"),
"Courser Scouting Vessel" = list("victory_courser_hangar"),
"Hammerhead Patrol Barge" = list("victory_hammerhead_hangar"),
"Civilian Transport" = list("victory_civvie_home"),
"Dart EMT Shuttle" = list("victory_emt_dock"),
"Beruang Trade Ship" = list("victory_annex_dock"),
"Mining Shuttle" = list("victory_mining_port"),
"NDV Quicksilver" = list("victory_specops_dock")
)
15 changes: 15 additions & 0 deletions maps/victory/victory-turbolifts.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

/obj/turbolift_map_holder/triumph
name = "Triumph Climber"
depth = 4
lift_size_x = 3
lift_size_y = 1
icon = 'icons/obj/turbolift_preview_3x3.dmi'
wall_type = null // Don't make walls

areas_to_use = list(
/area/turbolift/t_ship/level1,
/area/turbolift/t_ship/level2,
/area/turbolift/t_ship/level3,
/area/turbolift/t_ship/level4
)

0 comments on commit 530e2ad

Please sign in to comment.