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

Mercenary Hub #1035

Closed
wants to merge 12 commits into from
Closed

Mercenary Hub #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1dd45e9
( ͡° ͜ʖ ͡°)Changes Stuff(Map is Ready for Review and so far done)
Feb 18, 2024
d5aa9e5
Changes Stuff(forgor to name the warp point)
Feb 18, 2024
ae90167
Added Disposals;Jani Room;Random Posters
Feb 19, 2024
eedaaa2
Fixed the distance of the Hub from the Station
Feb 19, 2024
b1ee748
Added SMES Rechargers and Vends
Feb 21, 2024
2beed03
Added Fire Exingusher and Defib also fixed an APC
Feb 22, 2024
5a2ac95
Addes the requested changes.
Mar 13, 2024
7578314
Added a Anomal Free Zone Marker
Mar 14, 2024
76e3b64
Fixed Solars and added an extra dock
Apr 10, 2024
7ba5c19
Merge branch 'new-frontiers-14:master' into Merchub
NkoKirkto Apr 10, 2024
1ac29ee
More Solars
Apr 10, 2024
9d53315
Merge branch 'master' into Merchub
dvir001 Jul 10, 2024
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
11 changes: 11 additions & 0 deletions Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ private void OnStartup(RoundStartingEvent ev)
var church = "Maps/_NF/POI/beacon.yml";
var grifty = "Maps/_NF/POI/grifty.yml";
var nfsdStation = "/Maps/_NF/POI/nfsd.yml";
var mercenaryhub = "/Maps/_NF/POI/mercenaryhub.yml";
var trade = "/Maps/_NF/POI/trade.yml";
var depotColor = new Color(55, 200, 55);
var civilianColor = new Color(55, 55, 200);
Expand Down Expand Up @@ -295,6 +296,16 @@ private void OnStartup(RoundStartingEvent ev)
_meta.SetEntityName(labUids[0], "Anomalous Laboratory", meta);
_shuttle.SetIFFColor(labUids[0], factionColor);
}

if (_map.TryLoad(mapId, mercenaryhub, out var merchubUids, new MapLoadOptions
{
Offset = _random.NextVector2(1500f, 2900f)
}))
{
var meta = EnsureComp<MetaDataComponent>(merchubUids[0]);
_meta.SetEntityName(merchubUids[0], "Mercenary Hub", meta);
_shuttle.SetIFFColor(merchubUids[0], factionColor);
}

if (_map.TryLoad(mapId, trade, out var tradeUids, new MapLoadOptions
{
Expand Down
Loading
Loading