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

NGR Kali Andhi-class Destroyer #3554

Merged
merged 73 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
8737af5
draft 1
Apogee-dev Oct 12, 2024
00520da
size adjustment
Apogee-dev Oct 12, 2024
50284fa
config setup
Apogee-dev Oct 12, 2024
93c2101
draft 2: the tanning
Apogee-dev Oct 12, 2024
d4c9a05
tweaks
Apogee-dev Oct 13, 2024
c018444
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 13, 2024
d3aa6bc
the detailening + syndie softsuit tweak
Apogee-dev Oct 13, 2024
66a4ea9
decor done
Apogee-dev Oct 13, 2024
4ad5f73
wallmounts and pipes
Apogee-dev Oct 13, 2024
2e9ffe0
final touches
Apogee-dev Oct 13, 2024
7f9ce70
tweaks
Apogee-dev Oct 14, 2024
8aa2101
pipe fix
Apogee-dev Oct 14, 2024
1a41f18
centered captain's intercoms
Apogee-dev Oct 14, 2024
6ba7d55
more pipefix
Apogee-dev Oct 14, 2024
5469332
not sure how that happened
Apogee-dev Oct 14, 2024
4fbc9f4
faction fix
Apogee-dev Oct 14, 2024
bc1e28d
begone random magazine
Apogee-dev Oct 14, 2024
5e3fce9
clutter
Apogee-dev Oct 14, 2024
89b99c1
combustion thruster guide
Apogee-dev Oct 14, 2024
c25e2c5
hos gun
Apogee-dev Oct 14, 2024
92a0d8f
asp empty mags
Apogee-dev Oct 14, 2024
45165f3
soap.
Apogee-dev Oct 14, 2024
f69b18d
forgor wrecker slot
Apogee-dev Oct 14, 2024
f14d905
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 14, 2024
4a6e195
stamps
Apogee-dev Oct 14, 2024
c91b391
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 17, 2024
9173b94
hope this isnt too much gun
Apogee-dev Oct 17, 2024
da83a29
sirocco fix
Apogee-dev Oct 17, 2024
f159c27
bridge electro windows
Apogee-dev Oct 17, 2024
e8bec18
ship access
Apogee-dev Oct 17, 2024
e494ba9
forgor the restroom
Apogee-dev Oct 17, 2024
e1c1753
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 18, 2024
e5a052a
all this for a flag?
Apogee-dev Oct 18, 2024
ec57d27
all THIS for a FLAG?!
Apogee-dev Oct 18, 2024
b37a852
light switch
Apogee-dev Oct 18, 2024
8025b0c
review fixes
Apogee-dev Oct 19, 2024
d21025a
Merge remote-tracking branch 'upstream/master' into pr/3554
meemofcourse Oct 19, 2024
189109d
review
Apogee-dev Oct 19, 2024
54b9d6f
Merge branch 'ngr-cruiser' of https://github.com/Apogee-dev/Shiptest …
Apogee-dev Oct 19, 2024
1196891
knife.
Apogee-dev Oct 19, 2024
44e8248
thruster fix
Apogee-dev Oct 19, 2024
a7d98dc
turret edits
Apogee-dev Oct 20, 2024
30cfd9b
windows
Apogee-dev Oct 20, 2024
3c61563
handrails
Apogee-dev Oct 22, 2024
b79cae1
enforces NGR Navy alcohol & tobacco policy
Apogee-dev Oct 24, 2024
1bd71a1
too many signs
Apogee-dev Oct 24, 2024
84debeb
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 26, 2024
cfbb1a2
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 26, 2024
cbd6679
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Oct 26, 2024
f1d5b8a
guncases.
Apogee-dev Oct 26, 2024
548c887
guncases again
Apogee-dev Oct 26, 2024
e209493
janitor basin
Apogee-dev Oct 26, 2024
76af309
miner and engi balaclava
Apogee-dev Oct 26, 2024
056ead8
engi gas mask
Apogee-dev Oct 26, 2024
8e6589f
miner belt
Apogee-dev Oct 26, 2024
baccbc1
megaphones
Apogee-dev Oct 27, 2024
1350556
fixes the viper
Apogee-dev Oct 27, 2024
183b649
sirocco desc grammar
Apogee-dev Oct 27, 2024
fe2ca49
cell charger
Apogee-dev Oct 27, 2024
baee66d
depopulates wrecker locker
Apogee-dev Oct 27, 2024
faf30e3
Merge branch 'master' into ngr-cruiser
Sun-Soaked Oct 28, 2024
15fc847
Update code/modules/clothing/spacesuits/syndi.dm
Sun-Soaked Oct 28, 2024
f5347d8
Update code/modules/clothing/spacesuits/syndi.dm
Sun-Soaked Oct 28, 2024
c4c864b
spacing fix
Apogee-dev Oct 28, 2024
10f7c8a
Merge branch 'ngr-cruiser' of https://github.com/Apogee-dev/Shiptest …
Apogee-dev Oct 28, 2024
c828ece
dorm canteen window
Apogee-dev Oct 30, 2024
46f34c1
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Nov 3, 2024
1914efc
mask path fix
Apogee-dev Nov 3, 2024
5b8b486
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Nov 3, 2024
39b5929
moves thruster blast doors
Apogee-dev Nov 3, 2024
4dee9e3
fine. extra briefing room seats
Apogee-dev Nov 3, 2024
8e1d6f6
not fine. no extra briefing room seats
Apogee-dev Nov 3, 2024
70fb358
Merge remote-tracking branch 'upstream/master' into ngr-cruiser
Apogee-dev Nov 5, 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
58 changes: 58 additions & 0 deletions _maps/configs/syndicate_ngr_kaliandhi.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"faction": "/datum/faction/syndicate/ngr",
"prefix": "NGRV",
"namelists": [
"GORLEX",
"NATURAL_AGGRESSIVE",
"BEASTS",
"WEAPONS"
],
"map_name": "Kali Andhi-class Destroyer",
"map_short_name": "Kali Andhi-class",
"description": "A post-ICW destroyer design commissioned by the New Gorlex Republic and outfitted for general patrol and reclamation duties. The Kali Andhi-class, despite its young age, has been instrumental in securing New Gorlex's modest territorial claims, making them a somewhat unwelcome sight for the PGF's frontier mission.",
Apogee-dev marked this conversation as resolved.
Show resolved Hide resolved
"tags": [
"RP Focus",
"Combat"
],
"map_path": "_maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm",
"map_id": "syndicate_gorlex_kaliandhi",
"limit": 1,
"job_slots": {
Apogee-dev marked this conversation as resolved.
Show resolved Hide resolved
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain/ngr",
"officer": true,
"slots": 1
},
"Lieutenant": {
"outfit": "/datum/outfit/job/syndicate/hos/ngr",
"officer": true,
"slots": 1
},
"Ensign": {
"outfit": "/datum/outfit/job/syndicate/head_of_personnel/ngr",
"officer": true,
"slots": 1
},
"Medical Doctor": {
"outfit": "/datum/outfit/job/syndicate/doctor/ngr",
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/syndicate/engineer/ngr",
"slots": 1
},
"Wrecker": {
"outfit": "/datum/outfit/job/syndicate/miner/ngr",
"slots":1
},
"Operative": {
"outfit": "/datum/outfit/job/syndicate/security/ngr",
"slots": 3
},
"Initiate": {
"outfit": "/datum/outfit/job/syndicate/assistant/ngr",
"slots": 2
}
},
"enabled": true
}
Loading
Loading