merge - #4

Open

Realtimeslayer wants to merge 195 commits into

Realtimeslayer:cybersecfrom

Unionstation-13:dev

Commits on Apr 15, 2025

Fixed some bugs
ChickenKing1234
committed
2d50840

Commits on Apr 16, 2025

Fixes for last commit to dev. (#28) (#32)

authored
06acacb
Redoing some manuals
ChickenKing1234
committed
194c5ad

Commits on Apr 17, 2025

Add URC Envelope
ChickenKing1234
committed
74a5c49

Commits on Apr 23, 2025

Revert "Fixes for last commit to dev. (#28) (#32)"
Realtimeslayer
committed
8db3291
i am fixing tech debt please forgive
Realtimeslayer
committed
181b514

Commits on Apr 24, 2025

nested pathing
Realtimeslayer
committed
e63a149
fixing conflicts
Realtimeslayer
committed
8e7cff6
Revert "Expands current faction-based whitelist/blacklist system (#27)"
Realtimeslayer
committed
878a5d3
fixing tech debt
Realtimeslayer
committed
cb2e855
fixing tests
Realtimeslayer
committed
369525d
tests?
Realtimeslayer
committed
dfa9a02
Update manuals.dm
Realtimeslayer
committed
b5c17ce

Commits on May 2, 2025

Updated map
ChickenKing1234
committed
53d8911
Updating Deck 3 Brig into a contingency hub
ChickenKing1234
committed
0e715e7

Commits on Jun 7, 2025

peacekeeper physician + small clinic/office and rank changes (#37)
Realtimeslayer
authored
43d0d70

Commits on Aug 10, 2025

Bump actions/cache from 4.2.3 to 4.2.4 (#43)
dependabot[bot]
authored
033e9f4

Commits on Sep 20, 2025

Update 0.01 (#50)

authored
2279574

Commits on Oct 8, 2025

Update 0.02 (#52)

authored
25887f4

Commits on Oct 9, 2025

quick bug fix
DirectorAutumn
committed
56b2cb2
admin fix
DirectorAutumn
committed
1cf7bf8

Commits on Oct 19, 2025

added bridge officer

LegateJulius
authored and
DirectorAutumn
committed
ff97d0a
added BIO envelope for briefing

LegateJulius
authored and
DirectorAutumn
committed
bf5be30
fixed errors

LegateJulius
authored and
DirectorAutumn
committed
ecf80de
more error fixes

LegateJulius
authored and
DirectorAutumn
committed
4a68cc7
attempted bug fixes

LegateJulius
authored and
DirectorAutumn
committed
1a26fa4
finally fixed bugs

LegateJulius
authored and
DirectorAutumn
committed
f053d40
Tons of stuff
DirectorAutumn
committed
53638a1
updated config and made the server hub visible
DirectorAutumn
committed
de777b8
Bug help needed!
DirectorAutumn
committed
efbd78b
medical overhaul finished
DirectorAutumn
committed
692ea36
Some map updates
DirectorAutumn
committed
d444024
rerolled the entire deck 2 to fix a horrible bug
DirectorAutumn
committed
adb5355
Implemented Metameta(Sol)'s map suggestions
DirectorAutumn
committed
29c2d5e
changed a bit of brig
DirectorAutumn
committed
f0b561c
Fixed bridge errors with solars
DirectorAutumn
committed
99a1e2e
Upstream Update (#65)

authored and
DirectorAutumn
committed
4637ce6
final bug fixes
DirectorAutumn
committed
ee35dd3
Added title based naming system (#66)
LegateJulius
authored
a8816f4
quick ert fix (#67)
LegateJulius
authored
330522c
redid kitchen
DirectorAutumn
committed
25355d8
final fixes
DirectorAutumn
committed
d604903
A few things (#68)
LegateJulius
authored
8acd48e

Commits on Oct 22, 2025

quick map update
DirectorAutumn
committed
f8c046d
added runechat (#70)
LegateJulius
authored
8fef871
Add the runechat! (#71)

LegateJulius
and
DirectorAutumn
authored
b25f5cf
added runechat fixed this time (#72)

LegateJulius
and
DirectorAutumn
authored
39cef6b
actually fixed runechat (#73)

LegateJulius
and
DirectorAutumn
authored
2774bdc
Add runechat (#74)

LegateJulius
and
DirectorAutumn
authored
d872b74
Add runechat (#75)

LegateJulius
and
DirectorAutumn
authored
9043e02
added lights to mess
DirectorAutumn
committed
1ab3ca9
test addition of aquatic species + fixes
DirectorAutumn
committed
2af4529
fixed aquatic species
DirectorAutumn
committed
ed4d69b
fixed empty folder
DirectorAutumn
committed
ef69b09
aquatic restructure+ module info.md added
DirectorAutumn
committed
20b35fa

Commits on Oct 23, 2025

fixed some compilation errors
DirectorAutumn
committed
431e581

Commits on Oct 25, 2025

fixed cascading errors and implemnted rough draft of aquatic_species.dm
DirectorAutumn
committed
a153095
fixed some mapping stuff
DirectorAutumn
committed
032b7bc
fixed paper glitch and added new reports
DirectorAutumn
committed
92ebcfc
renamed POW to Drifter
DirectorAutumn
committed
39637df
fixed stuff
DirectorAutumn
committed
c09f981
Bump actions/labeler from 5 to 6 (#47)
dependabot[bot]
authored
49c2b1d
Bump actions/setup-python from 5.6.0 to 6.0.0 (#46)
dependabot[bot]
authored
6bc71c7
Bump actions/stale from 9 to 10 (#45)
dependabot[bot]
authored
d869b49
Update PULL_REQUEST_TEMPLATE.md (#76)
Realtimeslayer
authored
41d5e91

Commits on Oct 26, 2025

small bridge edits
DirectorAutumn
committed
3e99110
Update README.md
Realtimeslayer
authored
eae25cf
Update README.md
Realtimeslayer
authored
23f15c1
Update PULL_REQUEST_TEMPLATE.md
Realtimeslayer
authored
6b891f8

Commits on Oct 27, 2025

cultural overhaul pt1(of many)
DirectorAutumn
committed
47a01fd
made runechat default
DirectorAutumn
committed
e5a8398
bugfixes (#78)
Realtimeslayer
authored
07270c9
Chickenking1234 small updates (#77)

authored
743e52f

Commits on Oct 28, 2025

Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
3d97756
updated more culture stuff
DirectorAutumn
committed
747a31a
language change
DirectorAutumn
committed
5280ec4
fixed chapel doors and added funeral chamber (#85)
DirectorAutumn
authored
98dfbce
more language, culture, and location updates
DirectorAutumn
committed
e33e620
passport updates and more location work
DirectorAutumn
committed
fac8a7f
fixed errors
DirectorAutumn
committed
98820e1
Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
a648a5b

Commits on Oct 29, 2025

added NCGO + Art
DirectorAutumn
committed
bc4c761
added WALDO lore
DirectorAutumn
committed
ffde96a
added some culture stuff

DirectorAutumn
and
metameta
committed
f847226
added stamp changes (#87)
DirectorAutumn
authored
1ad0ae1
Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
d02820a
fixed errors
DirectorAutumn
committed
7a31383
actually fixed bugs(for now)
DirectorAutumn
committed
eff3703
quick bug fix
DirectorAutumn
committed
323ed5c
nitros and Helios updates
DirectorAutumn
committed
5d34320
small changes
DirectorAutumn
committed
7d46d8c
more rename work
DirectorAutumn
committed
1a0025d
added sollogo with UGN instead of SCG
DirectorAutumn
committed
77308e1
changed all SCG to UGN
DirectorAutumn
committed
9d2908a
changed all Sol Central Government to United Galactic Nations
DirectorAutumn
committed
9b39d1d
revert change(caused bugs)
DirectorAutumn
committed
51e5fc8
Map updates (#88)
DirectorAutumn
authored
8f0782c
Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
3aa3da7
small conflict fix
DirectorAutumn
committed
af4997e
more updates
DirectorAutumn
committed
ab7eed0
fixed errors
DirectorAutumn
committed
59c9822
removed sol police and replaced with PK
DirectorAutumn
committed
70d3d08

Commits on Oct 30, 2025

quick bug fix
DirectorAutumn
committed
61696dd
renamed law
DirectorAutumn
committed
5ec721e
Map updates (#91)
DirectorAutumn
authored
5e80790
renamed factions
DirectorAutumn
committed
b38ee62
Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
b867c65
removed some planets and more
DirectorAutumn
committed
9e38d97
removed magnitka
DirectorAutumn
committed
77e7e1f
fixed union bug
DirectorAutumn
committed
f42e027
proofread Benedict + other fixes
DirectorAutumn
committed
e8f36e8
more small fixes
DirectorAutumn
committed
2369a5c
small culture updates
DirectorAutumn
committed
d1b5b4a
more culture work(pt 5)
DirectorAutumn
committed
b1c0f87
language edits + more culture(pt 6??)
DirectorAutumn
committed
457d470
Culture Overhaul Final Update!!!!
DirectorAutumn
committed
e9fae16
final bug fixes
DirectorAutumn
committed
46aa6ce

Commits on Nov 2, 2025

test fix
DirectorAutumn
committed
a3e48c7
Revert "test fix"
DirectorAutumn
committed
e137494

Commits on Nov 4, 2025

fixed the bugs at last
DirectorAutumn
committed
01c3ecc

Commits on Nov 5, 2025

replaced corporate liason
DirectorAutumn
committed
50232d4
quick add
DirectorAutumn
committed
51a933e
Bump JamesIves/github-pages-deploy-action from 4.7.3 to 4.7.4 (#92)
dependabot[bot]
authored
5563b0c

Commits on Nov 6, 2025

Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
f8f6ca1
Bugfix (#90)
Realtimeslayer
authored
ba7a56e
Merge branch 'dev' into culture-overhaul
DirectorAutumn
authored
6334366
fixed error
DirectorAutumn
committed
0aba713
fixed icon state errors(they were vague so maybe not)
DirectorAutumn
committed
8096506
small fix for icon state pt 2
DirectorAutumn
committed
1e31836
removed alt titles for human resources manager and small lore update
DirectorAutumn
committed
8c1e465
another icon state fix(many more coming?)
DirectorAutumn
committed
f2b55d3
reverted changelog
DirectorAutumn
committed
b2920c9
Merge pull request #86 from Unionstation-13/culture-overhaul
friendlyguykasper857
authored
5bfdff3

Commits on Nov 8, 2025

Commits on Nov 9, 2025

Commits on Nov 14, 2025

Bugfixes + A few other things (#112)
Realtimeslayer
authored
5f0e9b9

Commits on Nov 17, 2025

WALDO Mission Prep (#111)
DirectorAutumn
authored
7ffce8b

Commits on Nov 21, 2025

Bump actions/checkout from 5.0.0 to 6.0.0 (#118)
dependabot[bot]
authored
0f48c54

Commits on Nov 23, 2025

mapping fixes (#119)
Realtimeslayer
authored
51ab618
Skeleton Crew Access (#120)
Realtimeslayer
authored
bce3cbc

Commits on Nov 28, 2025

Bump actions/setup-python from 6.0.0 to 6.1.0 (#121)
dependabot[bot]
authored
8b8dafd

Commits on Dec 3, 2025

sigh (#122)
Realtimeslayer
authored
dea5473

Commits on Dec 9, 2025

Medbay revamp (#124)
A124e
authored
d450d49

Commits on Dec 10, 2025

Commits on Dec 15, 2025

Bump actions/cache from 4.3.0 to 5.0.1 (#127)
dependabot[bot]
authored
2f939c8
Socialites Galore Update (#117)
DirectorAutumn
authored
4bc5cc7

Commits on Dec 16, 2025

Names many doors (#129)
A124e
authored
b51af80
Changes to jobs, stamps, lockers, and maps (#128)

A124e
and
DirectorAutumn
authored
1caaea9

Commits on Dec 19, 2025

Corporate Ranks and Accessories (#130)
A124e
authored
8eb51cc

Commits on Jan 11, 2026

Rank Changes Part 2 (#132)
A124e
authored
6f84a4b

Commits on Jan 12, 2026

Rank Changes Part 3: Peacekeeper Ex Machina (#133)
A124e
authored
ce3b6c0

Commits on Jan 14, 2026

Bump JamesIves/github-pages-deploy-action from 4.7.6 to 4.8.0 (#134)

dependabot[bot]
and
Realtimeslayer
authored
1c02d01

Commits on Jan 15, 2026

Clothing Corrections (#135)
A124e
authored
34ef0fc
Clothing fix addendum (#137)
A124e
authored
3383825

Commits on Jan 17, 2026

Corporate Overhaul! (#139)

DirectorAutumn
and
Realtimeslayer
authored
40621f4

Commits on Jan 26, 2026

Commits on Jan 28, 2026

Lore Polish (#140)

DirectorAutumn
and
Realtimeslayer
authored
0fc1afe

Commits on Feb 2, 2026

Misc Lore things (#144)

A124e
and
DirectorAutumn
authored
709e0d2

Commits on Feb 3, 2026

Bump actions/cache from 5.0.1 to 5.0.2 (#141)

dependabot[bot]
and
Realtimeslayer
authored
e1b102c

Commits on Feb 4, 2026

Bump actions/cache from 5.0.1 to 5.0.3 (#146)
dependabot[bot]
authored
a723241

Commits on Feb 5, 2026

AI Reintegration. (#145)

A124e
and
DirectorAutumn
authored
cb422df

Commits on Mar 4, 2026

Manifest alterations (#148)

A124e
and
DirectorAutumn
authored
de7d8db

Commits on Mar 8, 2026

AI Intercom Jacking and AI Core updates (#147)
DirectorAutumn
authored
e7bc891

Commits on Mar 24, 2026

Bump actions/cache from 5.0.3 to 5.0.4 (#152)
dependabot[bot]
authored
81f6a32
Bump dorny/paths-filter from 3.0.2 to 4.0.1 (#151)
dependabot[bot]
authored
90e1ea5
Docker Containers. Thats it. (#149)
DirectorAutumn
authored
103004f

Commits on Mar 28, 2026

Commits on Mar 29, 2026

Add CREDITS.md for development staff acknowledgment
DirectorAutumn
authored
c25b995

Commits on Apr 1, 2026

Testing code updates!
DirectorAutumn
authored
3ac50e9

Commits on May 10, 2026

Bump actions/cache from 5.0.4 to 5.0.5 (#155)
dependabot[bot]
authored
ef2577c
Documentation (#156)
DirectorAutumn
authored
4e68198