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

Nanotrasen Career Trainer - REVIVAL (PT1) #26512

Merged
merged 73 commits into from
Dec 30, 2024
+2,874 −1,473
Merged

Nanotrasen Career Trainer - REVIVAL (PT1) #26512

Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
3990e46
Nct ID
LetXxx Aug 14, 2024
9dd1de7
Preferences, job creation, access and other stuff
LetXxx Aug 14, 2024
91a616c
Sprites, defines, hidden job pref and other stuff!
LetXxx Aug 14, 2024
a57679a
Missed a comma
LetXxx Aug 14, 2024
e2e45e0
Sprites updated, clothing code, outfit and id
LetXxx Aug 15, 2024
a5f506a
Fix a small oops
LetXxx Aug 15, 2024
1ecfd50
Data chip + Sechud icon
LetXxx Aug 15, 2024
afa8329
Offstation, access, datachip code, ticket autoresponse and a lot of o…
LetXxx Aug 15, 2024
18163c2
Typo, spritesheet fixingg and icon color
LetXxx Aug 16, 2024
a2fc402
Telebaton removed, not allowed to scan ERT IDs, blacklisted some access
LetXxx Aug 17, 2024
95f198c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Aug 17, 2024
d929f6d
Applies suggestion
LetXxx Aug 17, 2024
c2769f6
Applying Suggestions!
LetXxx Aug 17, 2024
37d2f38
Merge branch 'Trainer' of https://github.com/PeLuSoares/Paradise into…
LetXxx Aug 17, 2024
e358cb8
Forgot to increase the number of slots, oops
LetXxx Aug 17, 2024
453f575
Added a few items that I forgot, applying suggestions.
LetXxx Aug 17, 2024
f921de3
Fix check fail?
LetXxx Aug 17, 2024
76f24b4
Merge branch 'master' into Trainer
LetXxx Aug 19, 2024
9d5bc8d
Mapping Tools/Icons.
LetXxx Aug 19, 2024
8b3f207
Office added to all maps, a few modifications to fit.
LetXxx Aug 20, 2024
12f4e95
Adds ACCESS_TRAINER to who needs it.
LetXxx Aug 20, 2024
2c954db
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Aug 20, 2024
a516fdd
Fixing check fails.
LetXxx Aug 20, 2024
7d7b3e6
NCT Beret obj are now where they're supposed to be
LetXxx Aug 20, 2024
faa89a0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Aug 25, 2024
b4c0ad4
Suggestion
LetXxx Aug 25, 2024
e832a11
Sprites fix + NCT flag
LetXxx Aug 26, 2024
0f7b3f3
Merge branch 'Trainer' of https://github.com/PeLuSoares/Paradise into…
LetXxx Aug 26, 2024
b386a44
Go away conflict!
LetXxx Aug 26, 2024
69a0049
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Aug 29, 2024
3e628ff
Code Suggestion
LetXxx Aug 29, 2024
7494cfc
Sprite update
LetXxx Aug 31, 2024
0e49d86
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 3, 2024
83132be
Suggestions
LetXxx Sep 11, 2024
47f1296
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 12, 2024
cde4a92
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 13, 2024
7643b8f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 13, 2024
850c20a
Diagoras Office, conflict fix.
LetXxx Sep 13, 2024
4e9f348
Merge branch 'master' into Trainer
LetXxx Sep 13, 2024
33368e7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 14, 2024
74ee286
Merge branch 'Trainer' of https://github.com/PeLuSoares/Paradise into…
LetXxx Sep 14, 2024
e9be425
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 17, 2024
1f73be2
Day 1 fixes, suggestions.
LetXxx Sep 18, 2024
feb52aa
Merge branch 'master' into pr/LetXxx/26512
Burzah Sep 18, 2024
7e3d50a
bundle rebuild
Burzah Sep 18, 2024
f0a1a8d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 20, 2024
7baba58
Fixing a few issues.
LetXxx Sep 20, 2024
bb8a67c
Mapping review + Suggestions
LetXxx Sep 21, 2024
159c2ce
Fixed check fail.
LetXxx Sep 21, 2024
3ebbd40
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 21, 2024
59465bd
Conflict fix + Suggestion
LetXxx Sep 24, 2024
c8b34f8
Conflict fix + You shouldn't be able to insert the NCT chip into an i…
LetXxx Sep 24, 2024
5c670c5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Sep 24, 2024
7c9f504
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Oct 29, 2024
af9a0b7
Fix map conflicts
LetXxx Oct 29, 2024
7981461
Plasmaman icons and Kidan icon fix
LetXxx Oct 30, 2024
6706a17
Conflict fix?
LetXxx Oct 30, 2024
5cdfd26
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Nov 7, 2024
b2d346a
A few changes following feedback.
LetXxx Nov 7, 2024
5cb2a76
Small description changed, as per requested feedback.
LetXxx Nov 8, 2024
607d58e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Dec 1, 2024
99d3741
Suggestions/Fix
LetXxx Dec 1, 2024
4c0440a
Forgot some mapping issues
LetXxx Dec 1, 2024
90c849e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
LetXxx Dec 10, 2024
c9c93a3
Suggestions
LetXxx Dec 10, 2024
4987981
Fixed?
LetXxx Dec 10, 2024
caef1ba
Merge remote-tracking branch 'upstream' into pr/26512
DGamerL Dec 30, 2024
e3e249f
Merge remote-tracking branch 'upstream' into pr/26512
DGamerL Dec 30, 2024
2c4e3eb
Fix linters
DGamerL Dec 30, 2024
61b8118
More fixes
DGamerL Dec 30, 2024
aa80c2f
aaaaaaaaaaa
DGamerL Dec 30, 2024
38b47a4
Christa's reviews
LetXxx Dec 30, 2024
f4b2c3f
Naming stuff
LetXxx Dec 30, 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
Prev Previous commit
Next Next commit
Sprite update
@LetXxx
LetXxx committed Aug 31, 2024
commit 7494cfc31c452ac96a783fd82515d485bd07ce30
Binary file modified icons/mob/clothing/species/grey/under/procedure.dmi
View file
Binary file not shown.