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

Twink Tweaks: The Second #2536

Merged
merged 32 commits into from
Feb 11, 2024
Merged

Twink Tweaks: The Second #2536

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5201975
new! it's new!
meemofcourse Nov 28, 2023
29434c5
sidings...
meemofcourse Nov 28, 2023
7746503
come again?
meemofcourse Nov 28, 2023
798594c
fukcing sanitization...
meemofcourse Nov 28, 2023
672e423
Merge branch 'master' into twink-2
meemofcourse Nov 29, 2023
e3e64ab
hammers
meemofcourse Nov 29, 2023
0c79921
Merge branch 'twink-2' of https://github.com/meemofcourse/Shiptest in…
meemofcourse Nov 29, 2023
7bc1ffe
misc
meemofcourse Dec 2, 2023
715e931
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Dec 6, 2023
282584a
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Dec 6, 2023
bb9ed8b
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Dec 8, 2023
ff6db5d
aweawaewasdasdsd
meemofcourse Dec 8, 2023
1951d9f
Merge branch 'master' into twink-2
meemofcourse Dec 8, 2023
a434dd9
hehe
meemofcourse Dec 8, 2023
a3d1494
Merge branch 'twink-2' of https://github.com/meemofcourse/Shiptest in…
meemofcourse Dec 8, 2023
be3b93a
Update syndicate_twinkleshine.dmm
meemofcourse Dec 9, 2023
9df4463
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Dec 30, 2023
ed9646d
balls
meemofcourse Dec 30, 2023
e537dfd
Update syndicate_twinkleshine.json
meemofcourse Jan 1, 2024
e07320e
Update syndicate_twinkleshine.dmm
meemofcourse Jan 1, 2024
9ebb0da
commodore to FADM
meemofcourse Jan 1, 2024
5815c43
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Feb 3, 2024
c207943
Update syndicate_twinkleshine.dmm
meemofcourse Feb 3, 2024
1174d2a
hng
meemofcourse Feb 3, 2024
a21ca83
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Feb 6, 2024
2ff8536
redshield officer
meemofcourse Feb 6, 2024
ea14880
miner
meemofcourse Feb 6, 2024
5dca0df
review
meemofcourse Feb 7, 2024
0458180
review
meemofcourse Feb 10, 2024
0c584f7
briefing room
meemofcourse Feb 10, 2024
97a6422
Merge remote-tracking branch 'upstream/master' into twink-2
meemofcourse Feb 11, 2024
1122465
sigh
meemofcourse Feb 11, 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
7 changes: 6 additions & 1 deletion _maps/configs/syndicate_twinkleshine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"map_short_name": "Twinkleshine-class",
"map_path": "_maps/shuttles/syndicate/syndicate_twinkleshine.dmm",
"job_slots": {
"Captain": {
"Flotilla Admiral": {
"outfit": "/datum/outfit/job/syndicate/captain/twink",
"officer": true,
"slots": 1
Expand All @@ -27,6 +27,11 @@
"officer": true,
"slots": 1
},
"Redshield Officer": {
"outfit": "/datum/outfit/job/syndicate/hos/suns/twink",
"officer": true,
"slots": 1
},
"Medic": {
"outfit": "/datum/outfit/job/syndicate/paramedic/twink",
"slots": 2
Expand Down
Loading
Loading