Skip to content

[DNM] [TM ONLY] [IDB Ignore] Athena's Merge Box#1237

Draft
Athena148 wants to merge 793 commits intocmss13-devs:masterfrom
Athena148:Athena's-Merge-Box
Draft

[DNM] [TM ONLY] [IDB Ignore] Athena's Merge Box#1237
Athena148 wants to merge 793 commits intocmss13-devs:masterfrom
Athena148:Athena's-Merge-Box

Conversation

@Athena148
Copy link

@Athena148 Athena148 commented Jan 24, 2026 •
edited by github-actions bot
Loading

About the pull request

Final version, this one probably won't implode due to poor merge choices.
:)

Explain why it's good for the game

Bypasses TM conflicts via merging all the cool shit into one PR.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added something
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
spellcheck: fixed a few typos
ui: changed something relating to user interfaces
code: changed some code
refactor: refactored some code
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
mapadd: added a new map or section to a map
maptweak: tweaked a map
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

MistChristmas and others added 30 commits July 20, 2025 23:13
@MistChristmas
OhBoyILoveWarCrimes
a1529e4
@MistChristmas
CleanUpAndI'mDumb
e4f5edc
@MistChristmas
BuffLimbsFlyingOff
dcdc2ba
@MistChristmas
Merge branch 'master' into ZombieEasierDeath
840fdda
@MistChristmas
ZomboAINotUsingTheClawsInTheOtherHandBegone
dde99b7
@MistChristmas
AsFunnyAsItWouldBe
3f6069c
@MistChristmas
LocalDumbassIsDumb
bab479f
@MistChristmas
Dumbx2
2391229
@MistChristmas
Dumbx3
ab5e9f5
@MistChristmas
DumbDumbx4MaybeIShouldGoNap
dccb9f5
@MistChristmas
SeriouslyI'mStupid
e23ff00
@MistChristmas
IHateBitFields&Logic
769e28a
@MistChristmas
LetTheWarcrimesBegin
e293160
@AlanParkerMasters
Merge branch 'master' of https://github.com/AlanParkerMasters/cmss13-pve
f300234 
 into hybrisa_port
@MistChristmas
NumberBalans?
8b903d5
@MistChristmas
BalansPass
19c9a05
@MistChristmas
ActuallyNo
412275b
@MistChristmas
ALittleMoreNumber
8dd1568
@MistChristmas
AlsoThat
0fb3d6c
@AlanParkerMasters
Merge branch 'master' of https://github.com/AlanParkerMasters/cmss13-pve
7157208 
 into hybrisa_port
@MistChristmas
Blarg
8cdaa80
@MistChristmas
LooseChange
d450f06
@MistChristmas
LimbSelector3001
25db338
@MistChristmas
NullSafeSomestuffAndMaybeNotInfiniteRecursion
8243f80
@MistChristmas
ExtraSafetyNet
aa3c770
@The32bitguy
Merge remote-tracking branch 'upstream/master' into spacesuits-for-fi…
85d7ce0 
…ghting-done
@The32bitguy
fix
58c1cba
@The32bitguy
fix
067527f
@Yorkoh
add arctic
48cd616
@MistChristmas
hAIDoorWoes
c3b22dc
@cmss13-ci cmss13-ci bot added Sound Blast 5 minutes of bass boosted music to our players UI deletes nanoui/html Feature Feature coder badge labels Jan 24, 2026
@cm13-github
Copy link
Contributor

cm13-github commented Jan 24, 2026 •
edited
Loading

Test merge deployment history:

Test Merge Deployed @ 01/24/2026 07:45:16 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 15b4fd2
Server: e5e97de1d01fb16ed6270bdb04cf239fc448b68b

Test Merge Updated @ 01/24/2026 08:04:23 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 06c2fd8
Server: 0ad2a51d881760456289ed5c7cef345c5e4c640f

Test Merge Updated @ 01/24/2026 08:54:01 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: c466493
Server: 78c55d812709790b4469a25ebd7d0d70be907470

Test Merge Updated @ 01/24/2026 09:21:55 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 6f69ff1
Server: d87077032fec28d2acf20811c77c0c5cad537803

Test Merge Updated @ 01/24/2026 09:26:22 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: dd751d8
Server: d4c520acf3d072153db1d9191cd62afdc315314f

Test Merge Updated @ 01/25/2026 06:31:10 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 84efb5d
Server: 785e7168459e8801f86fd6ffa9186d60bd06c765

Test Merge Updated @ 01/25/2026 12:14:37 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 03613c7
Server: ba1d693f5fa18694c77ab6ce2399c5fdb76c2658

Test Merge Removed @ 01/26/2026 21:56:46 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 01/27/2026 02:35:47 +00:00:
Server Instance

PVECM: Green

Merged By

ShortTemperedLeprech

Revision

Origin: 978ab70
Pull Request: 03613c7
Server: cacc833d23dc8aefe0fb508c3fb6a0d5d02dab80

Test Merge Removed @ 01/28/2026 02:08:42 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 01/28/2026 18:38:35 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 05baa49
Server: aa87de6833ece7303d4aedb42256750173deeb49

Test Merge Removed @ 01/29/2026 07:49:39 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 02/01/2026 03:41:56 +00:00:
Server Instance

PVECM: Blue

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: 8cd4883
Server: 62198b87e7ed2b98af539eb84b25e61085f0e876

Test Merge Removed @ 02/01/2026 11:37:43 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 02/21/2026 20:19:19 +00:00:
Server Instance

PVECM: Red

Merged By

ody_sseus

Revision

Origin: 978ab70
Pull Request: ae39e35
Server: 15bbfa716d665112a652fa059f4a11d20325dc70

Test Merge Removed @ 02/23/2026 09:55:29 +00:00:
Server Instance

PVECM: Red

The32bitguy and others added 11 commits January 25, 2026 12:27
@The32bitguy
change pressure back to intended value
3b3cc38
@BonniePandora
PMC modular armor
47e84ea 
Shoves the PMC modular armor across from the strikeforce PR to this one
Coffins take much, much longer to build for how nice they are
Flamers don't get to mount flashlights on them, they're already light-sources in and of themselves
@BonniePandora
PMC shipmap tweaks
7b39b97 
Removes the tall and intimidating wey-med from the hallways, swaps PMC gunner armor from the storage type to the modular sort
@BonniePandora
Awaga
af06885
@Athena148
Merge branch 'pr/977' into Athena's-Merge-Box
9ef4f51
@BonniePandora
RMC pressure suit
2a78275 
Sprites by dimdi on discord
Small tweaks made to doctors/nurses paygrades whilst I was at it
@BonniePandora
Shinies
0b5cb67 
PltCo's can issue bronze-heart medals now
@Athena148
Merge branch 'pr/1218' into Athena's-Merge-Box
24178a9
@Athena148
fix
05baa49
@Athena148
Merge branch 'pr/781' into Athena's-Merge-Box
8cd4883
@Athena148
ithica fix
ae39e35
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 25, 2026
@cm13-github
Copy link
Contributor

cm13-github commented Feb 25, 2026

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Danilcus-W Danilcus-W Awaiting requested review from Danilcus-W Danilcus-W is a code owner

@Zonespace27 Zonespace27 Awaiting requested review from Zonespace27 Zonespace27 is a code owner

@fira fira Awaiting requested review from fira fira is a code owner

Assignees

No one assigned

Labels

Feature Feature coder badge Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game. UI deletes nanoui/html

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.