Skip to content

Commit

Permalink
Ahem.. NSV Endeavour Fixes 2 (#6830)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Working on Disposals!

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:

add: Added more things

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: AlphaM01 <AlphaaMachh@gmail.com>
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
  • Loading branch information
4 people authored Nov 15, 2024
1 parent b64bcdd commit 33a0709
Show file tree
Hide file tree
Showing 12 changed files with 20,265 additions and 9,896 deletions.
2 changes: 1 addition & 1 deletion _mapload/victory.dm → _mapload/endeavour.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#error Duplicate FORCE_MAP, what are you doing!?
#endif

#define FORCE_MAP "victory"
#define FORCE_MAP "endeavour"
27 changes: 27 additions & 0 deletions code/game/area/Space Station 13 areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3351,6 +3351,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
var/arrival_sound = 'sound/machines/ding.ogg'
var/delay_time = 2 SECONDS

// deck names for Triumph

/area/turbolift/t_ship/level1
name = "Deck 1"
lift_floor_label = "Deck 1"
Expand All @@ -3375,6 +3377,31 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
lift_floor_name = "Exploration, Arrivals & Departures, Security, Command, Chapel, Sauna, Docking Arm, Library, Garden, Tool Storage"
lift_announce_str = "Arriving at Deck 4."

// Deck names for Endeavour

/area/turbolift/e_ship/level4
name = "Deck 1"
lift_floor_label = "Deck 1"
lift_floor_name = "Exploration, Arrivals & Departures, Command, Chapel, Sauna, Docking Bay, Library, Garden, Tool Storage"
lift_announce_str = "Arriving at Deck 1."

/area/turbolift/e_ship/level3
name = "Deck 2"
lift_floor_label = "Deck 2"
lift_floor_name = "Medical, Science, Holo Deck, Teleporter"
lift_announce_str = "Arriving at Deck 3."

/area/turbolift/e_ship/level2
name = "Deck 3"
lift_floor_label = "Deck 3"
lift_floor_name = "Dorms, Cargo, Security, Mining, Bar, Cafe, Solars, Shops"
lift_announce_str = "Arriving at Deck 2."

/area/turbolift/e_ship/level1
name = "Deck 4"
lift_floor_label = "Deck 4"
lift_floor_name = "Engineering, Reactor, Telecomms, Trash Pit, Atmospherics, Main Battery, Small Craft Fabrication, Secondary Bridge"
lift_announce_str = "Arriving at Deck 1."

//Debug/Code areas

Expand Down
4 changes: 4 additions & 0 deletions code/game/area/endeavour_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@
name = "\improper Robotics Morgue"
icon_state = "robotics"

/area/rnd/robotics/smallcraft
name = "\improper Small Craft and Probe Assembly"
icon_state = "robotics"

/** Exploration
*/
/area/endeavour/exploration
Expand Down
2 changes: 1 addition & 1 deletion maps/endeavour/endeavour-overmap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[b]Notice[/b]: Nanotrasen Vessel, authorized personnel only"}

icon_state = "ship"
vessel_mass = 18500 // temporarily buffed by 3x due to vorestation fucking up large gas thruster code
vessel_mass = 48500 // temporarily buffed by 5x 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
Expand Down
8 changes: 4 additions & 4 deletions maps/endeavour/endeavour-turbolifts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
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
/area/turbolift/e_ship/level1,
/area/turbolift/e_ship/level2,
/area/turbolift/e_ship/level3,
/area/turbolift/e_ship/level4
)
2 changes: 1 addition & 1 deletion maps/endeavour/endeavour.dm
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
traits = list(
ZTRAIT_STATION,
ZTRAIT_FACILITY_SAFETY,
ZTRAIT_LEGACY_BELTER_DOCK,
)
base_turf = /turf/simulated/open
link_below = /datum/map_level/endeavour/ship/deck_three
Expand All @@ -175,6 +174,7 @@
traits = list(
ZTRAIT_STATION,
ZTRAIT_FACILITY_SAFETY,
ZTRAIT_LEGACY_BELTER_DOCK,
)
base_turf = /turf/simulated/open
link_below = /datum/map_level/endeavour/ship/deck_four
Expand Down
Loading

0 comments on commit 33a0709

Please sign in to comment.