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.

Sign up for GitHub

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

Docking update and bug fixes (i got rid of the funny name) #6953

Merged
merged 14 commits into from
Jan 1, 2025
Merged

Docking update and bug fixes (i got rid of the funny name) #6953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1492d20
first pass
GySgtMurphy Dec 30, 2024
57b0a71
Docking stuff! Plus a bunch of bug fixes
GySgtMurphy Dec 31, 2024
33f3021
crap - two more tweaks to deck 3
GySgtMurphy Dec 31, 2024
fb4fe74
engineering changes
GySgtMurphy Dec 31, 2024
ef475df
Merge branch 'master' into Docking,-bigger,-better,-bolder
GySgtMurphy Dec 31, 2024
4e7509d
crap, some floor markings and moving some wires
GySgtMurphy Dec 31, 2024
2bb94b0
fixed an EMT area issue, and moved a disposals over
GySgtMurphy Dec 31, 2024
7ee4cd7
added a matriarch drone fabricator to engineering
GySgtMurphy Dec 31, 2024
8ae2dd3
fixed a stupid disposals issue.
GySgtMurphy Dec 31, 2024
252a74c
fixed the stupid name duplication I left
GySgtMurphy Dec 31, 2024
e501ce4
STUPID MISSING WIRE
GySgtMurphy Dec 31, 2024
77d4ce5
map in a window, kill me
GySgtMurphy Dec 31, 2024
d7afd49
fine - i'm not perfect, aaaa more fixes
GySgtMurphy Dec 31, 2024
a119108
fixed a vendor placement & a bad disposals pipe
GySgtMurphy Jan 1, 2025
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
1 change: 1 addition & 0 deletions citadel.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5391,6 +5391,7 @@
#include "interface\menus\main.dm"
#include "maps\endeavour\endeavour-areas.dm"
#include "maps\endeavour\endeavour-overmap.dm"
#include "maps\endeavour\endeavour-papers.dm"
#include "maps\endeavour\endeavour-sectors.dm"
#include "maps\endeavour\endeavour-shuttle-landmarks.dm"
#include "maps\endeavour\endeavour-turbolifts.dm"
Expand Down
5 changes: 5 additions & 0 deletions maps/endeavour/endeavour-papers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

/obj/item/paper/pamphlet/substation
name = "Notice to NSV Endeavour Auxiliary Engineering Staff"
desc = "Some sort of technical information regarding this generator doohickey"
info = "Hello! <br><br> If you are reading this, you are attempting to activate the back up supply generators for an Endeavour Class vessel! <br><br>Please take note! Distribute the fuel among four or more generators, and be sure to leave them connected to each other via the breakers! This ships is divided into power zones, rather than departmental power subgrids. Powering the generators and leaving them connected to the secondary net will combine the power of all the generators and power the ship via this combined effort. If part of the ship is damaged, and you need to get power up to your section of the ship, *then* disconnect your area of interest. <br><br> Thank you for reading, and have a secure day!"
Loading
Loading