Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6623 commits
Select commit Hold shift + click to select a range
fcee445
very minor typo fix in helmet description (#9297)
byondsucks May 20, 2025
335132c
Automatic changelog for PR #9297 [ci skip]
cmss13-ci[bot] May 20, 2025
a5585a4
parametrization
uuuuhuuuu May 20, 2025
83f4357
back gun icon fix
uuuuhuuuu May 20, 2025
82e319b
laser color change, icon fixes
thwompa May 20, 2025
7015da6
vendor name fix
thwompa May 20, 2025
cc84c28
Merge pull request #1 from cuberound/brute-chances
thwompa May 20, 2025
19195a5
Merge pull request #2 from cuberound/brute-chances
thwompa May 20, 2025
cef01a0
conflicts
thwompa May 20, 2025
e76deb5
conflicts
thwompa May 20, 2025
b6d4051
Merge remote-tracking branch 'cmss13-devs/master' into BRUTE
thwompa May 20, 2025
76ad45b
Add missing label to CMO timelocks (#9301)
FebrezeNinja May 20, 2025
8c443a5
Automatic changelog for PR #9301 [ci skip]
cmss13-ci[bot] May 20, 2025
fe17ea7
Merge branch 'master' into BRUTE
thwompa May 20, 2025
d5913ef
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 21, 2025
be8dfef
Merge branch 'master' into BRUTE
thwompa May 21, 2025
408e4bb
Adds Yautja Cleanser Vials (#8068)
MeH0y May 21, 2025
393e8eb
Automatic changelog for PR #8068 [ci skip]
cmss13-ci[bot] May 21, 2025
aa7ea27
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 22, 2025
480757c
Updates USCM and PMC Sniper's HUD and Map icons (#9157)
TrollerNoob May 23, 2025
3d6048c
Adds Intel SL tracking and default tracking to XO/CO headsets (#9264)
realforest2001 May 23, 2025
d00185e
Automatic changelog for PR #9157 [ci skip]
cmss13-ci[bot] May 23, 2025
4972d4b
Automatic changelog for PR #9264 [ci skip]
cmss13-ci[bot] May 23, 2025
0b82622
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 24, 2025
ea4bb1f
Fixes a minor spelling mistake when attempting to tweak access requir…
Waseemq1235 May 24, 2025
4f694c8
Automatic changelog for PR #9275 [ci skip]
cmss13-ci[bot] May 24, 2025
c35a1e0
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 25, 2025
39ff307
Merge branch 'master' into BRUTE
thwompa May 25, 2025
fdb6ac6
The great cache update and byond mirror fallback (#9343)
Drulikar May 25, 2025
15f03a4
Automatic changelog for PR #9343 [ci skip]
cmss13-ci[bot] May 25, 2025
dd8494a
Makes xeno resin doors unacidable (#9351)
ShadedLamp May 25, 2025
682772e
Automatic changelog for PR #9351 [ci skip]
cmss13-ci[bot] May 25, 2025
a6e22d0
Health scanners can no longer scan xenos (#9355)
ShadedLamp May 25, 2025
c0c3511
Automatic changelog for PR #9355 [ci skip]
cmss13-ci[bot] May 25, 2025
77c0bbb
Adds a special sprite to locked flight controls (#9295)
Contrabang May 25, 2025
607e27d
Automatic changelog for PR #9295 [ci skip]
cmss13-ci[bot] May 25, 2025
2378f2a
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 26, 2025
6823e3f
RMC ert changes (#9124)
IroquoisLou May 26, 2025
89076d6
Automatic changelog for PR #9124 [ci skip]
cmss13-ci[bot] May 26, 2025
9fe7b62
Re-adds the (rebalanced) double barrel shotgun to the voteable maps i…
toolmind May 26, 2025
2640971
Automatic changelog for PR #9185 [ci skip]
cmss13-ci[bot] May 26, 2025
8eba1ff
Minor synth k9 improvements (#9279)
DarkLordCabbage May 26, 2025
98cf77b
Update rocket.dm
Git-Nivrak May 26, 2025
77ea7e0
Automatic changelog for PR #9279 [ci skip]
cmss13-ci[bot] May 26, 2025
f04e5a7
map tarps have stun to match the rest (#9306)
Red-byte3D May 26, 2025
3057901
Update rocket.dm
Git-Nivrak May 26, 2025
e61b235
Update rocket.dm
Git-Nivrak May 26, 2025
3572c54
Update rocket.dm
Git-Nivrak May 26, 2025
41140ef
Update rocket.dm
Git-Nivrak May 26, 2025
dd2e2af
Automatic changelog for PR #9306 [ci skip]
cmss13-ci[bot] May 26, 2025
1b5cd69
Dogtags on crosses will always appear at end of round, even if cross …
ShadedLamp May 26, 2025
67a5b22
Automatic changelog for PR #9298 [ci skip]
cmss13-ci[bot] May 26, 2025
2c89274
adds a new io satchel to ios (#9277)
psyendrocronologicalwarfare May 26, 2025
0984647
Automatic changelog for PR #9277 [ci skip]
cmss13-ci[bot] May 26, 2025
68db9e0
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 27, 2025
65573df
Fixes minor spelling mistake in the description of meatbread (#9359)
May 27, 2025
614e384
Automatic changelog for PR #9359 [ci skip]
cmss13-ci[bot] May 27, 2025
e5fe726
High Command and Provost Resprite, alongside MSF Herculis Patch V2 (#…
IroquoisLou May 27, 2025
c892a29
Automatic changelog for PR #8979 [ci skip]
cmss13-ci[bot] May 27, 2025
f0e18c1
dmi conflicts
thwompa May 27, 2025
f2f4d29
Armored gloves resprite (#9238)
Ansekishokuu May 27, 2025
2e16832
Squashed commit of the following:
thwompa May 27, 2025
fab827a
Revert "Squashed commit of the following:"
thwompa May 27, 2025
df85042
Merge branch 'master' into BRUTE
thwompa May 27, 2025
57df052
Merge branch 'master' into BRUTE
thwompa May 27, 2025
f1e4fcc
Automatic changelog for PR #9238 [ci skip]
cmss13-ci[bot] May 27, 2025
9a1abf7
trijent LZs now powerable (#9259)
Detective-Google May 27, 2025
60aeb52
Automatic changelog for PR #9259 [ci skip]
cmss13-ci[bot] May 27, 2025
82bc0e6
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 28, 2025
740b357
Xenos now heal at normal speed when not on fire (#9364)
ShadedLamp May 28, 2025
f77bbd1
Automatic changelog for PR #9364 [ci skip]
cmss13-ci[bot] May 28, 2025
b1f58df
fixes m5 rockets fitting to every launcher, adds ear protection to se…
uuuuhuuuu May 28, 2025
0f76fe5
prevents mar-50 from attaching a bipod (#9323)
BOBAMAx May 28, 2025
f805504
Automatic changelog for PR #9323 [ci skip]
cmss13-ci[bot] May 28, 2025
135e448
pushes living
uuuuhuuuu May 28, 2025
6e791f2
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 29, 2025
db1e6b8
include testmerge info in world api (#9369)
hry-gh May 29, 2025
734912f
Weapons in scabbards can now be used for reverse bursting (#9353)
ShadedLamp May 29, 2025
992078e
Automatic changelog for PR #9369 [ci skip]
cmss13-ci[bot] May 29, 2025
4446bde
Xenos that evolve while resting no longer act as a solid wall when re…
ShadedLamp May 29, 2025
b027988
Guarantees a fog gap on LV-624 (#9305)
Willzadl May 29, 2025
cdf4995
Adds Black Drop Pouches to vendors and resprites existing Drop Pouche…
Ansekishokuu May 29, 2025
98846d3
Automatic changelog for PR #9354 [ci skip]
cmss13-ci[bot] May 29, 2025
2c1ed55
Automatic changelog for PR #9353 [ci skip]
cmss13-ci[bot] May 29, 2025
d2d6fbf
Dropping crew monitor now closes the UI (#9352)
ShadedLamp May 29, 2025
faa5a07
Automatic changelog for PR #9352 [ci skip]
cmss13-ci[bot] May 29, 2025
c85669f
fixes specs in crew monitor (#9348)
realforest2001 May 29, 2025
9b1e2e7
Automatic changelog for PR #9348 [ci skip]
cmss13-ci[bot] May 29, 2025
abda4a7
CLF survivor changes/nerfs (#9311)
Lagomorphica May 29, 2025
219c7ad
Automatic changelog for PR #9305 [ci skip]
cmss13-ci[bot] May 29, 2025
c034e97
Automatic changelog for PR #9311 [ci skip]
cmss13-ci[bot] May 29, 2025
9936673
Changes the Jungle Moon hunting grounds map (#9292)
Joelampost May 29, 2025
ef51c90
Automatic changelog for PR #9292 [ci skip]
cmss13-ci[bot] May 29, 2025
3034931
Automatic changelog for PR #9284 [ci skip]
cmss13-ci[bot] May 29, 2025
a0e7c67
Adds supply radio to SL headsets (#9336)
booile May 29, 2025
e077946
Automatic changelog for PR #9336 [ci skip]
cmss13-ci[bot] May 29, 2025
17e3399
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 30, 2025
49880a6
Disables Queen auto-shove when unconcious/lying down. (#9361)
Venuska1117 May 30, 2025
66f8384
Automatic changelog for PR #9361 [ci skip]
cmss13-ci[bot] May 30, 2025
646883a
Automatic changelog compile [ci skip]
cmss13-ci[bot] May 31, 2025
87e000e
Moves xeno wound icons into xeno caste dmi files (#9358)
Blundir May 31, 2025
5551eba
Automatic changelog for PR #9358 [ci skip]
cmss13-ci[bot] May 31, 2025
5169069
Accessory attaching fixes and reorganization (#9247)
Nihisohel May 31, 2025
a8ba5d9
Automatic changelog for PR #9247 [ci skip]
cmss13-ci[bot] May 31, 2025
cfbbde2
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 1, 2025
b9f0de9
Gibs player huggers on ghost (#9384)
Git-Nivrak Jun 1, 2025
a7c5607
Automatic changelog for PR #9384 [ci skip]
cmss13-ci[bot] Jun 1, 2025
a545ebc
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 2, 2025
6abd1de
fix clf surv skills (#9390)
BOBAMAx Jun 2, 2025
9ed483f
Automatic changelog for PR #9390 [ci skip]
cmss13-ci[bot] Jun 2, 2025
26ec80b
Fixes a typo in synth maint station (#9411)
DarkLordCabbage Jun 2, 2025
8baac10
Automatic changelog for PR #9411 [ci skip]
cmss13-ci[bot] Jun 2, 2025
25007e3
Fix a source of nulls in GLOB.new_player_list and GLOB.player_list (#…
Drulikar Jun 2, 2025
129e76f
Automatic changelog for PR #9409 [ci skip]
cmss13-ci[bot] Jun 2, 2025
05ae354
Allows Yautja to Flay Prey with the Ceremonial Dagger Instead of Butc…
matttheficus Jun 2, 2025
1fd7e0b
Automatic changelog for PR #9243 [ci skip]
cmss13-ci[bot] Jun 2, 2025
88b98d7
introduces two factor authentication for admins (#9274)
hry-gh Jun 2, 2025
b8cab33
Automatic changelog for PR #9274 [ci skip]
cmss13-ci[bot] Jun 2, 2025
b6ad901
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 3, 2025
e989f09
fixes an attachment bug (#9286)
Detective-Google Jun 3, 2025
9b03d56
Fixes message when autodoc powers down (#9407)
DarkLordCabbage Jun 3, 2025
b7473f5
New sound usage, for vanguard, dancer, punches, shrapnel embed, pred …
Red-byte3D Jun 3, 2025
d3fa55e
Automatic changelog for PR #9407 [ci skip]
cmss13-ci[bot] Jun 3, 2025
4ea1547
Nuke messaging clarity (again) (#9418)
zzzmike Jun 3, 2025
5baa5d6
Fixes the area checks for the hunting grounds (#9393)
Joelampost Jun 3, 2025
eaa3901
Automatic changelog for PR #9418 [ci skip]
cmss13-ci[bot] Jun 3, 2025
1e3c6be
Fix king jump (#9395)
kalazus Jun 3, 2025
bd22943
Prevents CPR'ing synths (#9399)
DarkLordCabbage Jun 3, 2025
4f7dc9e
Automatic changelog for PR #9395 [ci skip]
cmss13-ci[bot] Jun 3, 2025
b79fa09
Automatic changelog for PR #9269 [ci skip]
cmss13-ci[bot] Jun 3, 2025
47acc38
adds some new clothing items to synth selection (#9260)
Lagomorphica Jun 3, 2025
8564929
Automatic changelog for PR #9393 [ci skip]
cmss13-ci[bot] Jun 3, 2025
fbf2698
Automatic changelog for PR #9260 [ci skip]
cmss13-ci[bot] Jun 3, 2025
3cfdafc
All door control buttons are now explosion-proof (#9396)
Willzadl Jun 3, 2025
758eb68
Ability "For The Hive!" status countdown now displays on action butto…
Venuska1117 Jun 3, 2025
aceec80
Automatic changelog for PR #9396 [ci skip]
cmss13-ci[bot] Jun 3, 2025
282451b
Automatic changelog for PR #9399 [ci skip]
cmss13-ci[bot] Jun 3, 2025
5466141
Hand labelers can be used on crates (#9410)
DarkLordCabbage Jun 3, 2025
8c4283e
Automatic changelog for PR #9367 [ci skip]
cmss13-ci[bot] Jun 3, 2025
d9efc05
Automatic changelog for PR #9410 [ci skip]
cmss13-ci[bot] Jun 3, 2025
120e846
Merge pull request #3 from cuberound/some-fixes
thwompa Jun 3, 2025
b42fe42
Merge branch 'master' into BRUTE
thwompa Jun 3, 2025
1eceffb
Adds Minimap Icons and Plasma Column to Hive Status (#9330)
ShadedLamp Jun 3, 2025
482666d
Automatic changelog for PR #9330 [ci skip]
cmss13-ci[bot] Jun 3, 2025
ae0d32b
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 4, 2025
99690a3
One retry on relay browser (#9426)
Drulikar Jun 4, 2025
5fc025f
MRE grammar and typo fixes, adds some fluff to the descriptions. (#9420)
DarkLordCabbage Jun 4, 2025
d6d7f7b
Automatic changelog for PR #9426 [ci skip]
cmss13-ci[bot] Jun 4, 2025
c47bff9
30 min timeouts for jobs involving setup node (#9422)
Drulikar Jun 4, 2025
2b1a96a
Automatic changelog for PR #9420 [ci skip]
cmss13-ci[bot] Jun 4, 2025
f98128c
All mobs should call parent Life() (#9319)
Drulikar Jun 4, 2025
77bac34
Merge branch 'master' into BRUTE
thwompa Jun 4, 2025
b3e82d3
Automatic changelog for PR #9319 [ci skip]
cmss13-ci[bot] Jun 4, 2025
c44d923
increases brute req rockets to 6
uuuuhuuuu Jun 4, 2025
eecc396
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 5, 2025
ce06283
minor fixes
uuuuhuuuu Jun 5, 2025
008052b
Merge pull request #4 from cuberound/brute-chances
thwompa Jun 5, 2025
f0912b9
Merge branch 'master' into BRUTE
thwompa Jun 5, 2025
eeded9e
Fixes an attachment exploit (#9439)
kiVts Jun 5, 2025
c641968
Update byond mirror path for CI (#9429)
Drulikar Jun 5, 2025
830491c
Automatic changelog for PR #9439 [ci skip]
cmss13-ci[bot] Jun 5, 2025
a9428b5
trashcart infinte money glitch patch (#9435)
dadlips Jun 5, 2025
396cf93
Automatic changelog for PR #9435 [ci skip]
cmss13-ci[bot] Jun 5, 2025
0a65061
Fix hauling pull responses and monkey wandering (#9438)
Drulikar Jun 5, 2025
10d357f
Automatic changelog for PR #9438 [ci skip]
cmss13-ci[bot] Jun 5, 2025
3412b72
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 6, 2025
259dcc1
Youngblood Hour changes. (#9342)
Joelampost Jun 6, 2025
51a30fa
Automatic changelog for PR #9342 [ci skip]
cmss13-ci[bot] Jun 6, 2025
4e9ff40
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 7, 2025
f6c26a9
Prevents C4 and breaching charges from sticking to dense fog. (#9448)
MemesLauncher Jun 7, 2025
2e18dca
Automatic changelog for PR #9448 [ci skip]
cmss13-ci[bot] Jun 7, 2025
73909db
Removes cyborg/drone dead code (#9450)
fira Jun 7, 2025
5594b3c
Fix inconsistent labeler removal messaging (#9428)
Drulikar Jun 7, 2025
adfb470
Automatic changelog for PR #9428 [ci skip]
cmss13-ci[bot] Jun 7, 2025
734a03b
light/med armor bomb armor changes (Light armor no longer protects yo…
private-tristan Jun 7, 2025
70ace4a
Automatic changelog for PR #9391 [ci skip]
cmss13-ci[bot] Jun 7, 2025
533a912
Fixes typos & rewrites most of magazines .dms (#9381)
Willzadl Jun 7, 2025
af92877
Automatic changelog for PR #9381 [ci skip]
cmss13-ci[bot] Jun 7, 2025
36a05c4
Capturing Rebalance (#9412)
Drulikar Jun 7, 2025
11d39d2
Automatic changelog for PR #9412 [ci skip]
cmss13-ci[bot] Jun 7, 2025
c3d0f39
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 8, 2025
dd76d1f
removes xm51 from marine supply
uuuuhuuuu Jun 8, 2025
285683b
Merge pull request #5 from cuberound/brute-chances
thwompa Jun 8, 2025
766070e
Merge branch 'master' into BRUTE
thwompa Jun 8, 2025
0a877a7
Uscm headset accessory & Directional helmet rail flashlight (#9308)
psyendrocronologicalwarfare Jun 10, 2025
4745044
Automatic changelog for PR #9308 [ci skip]
cmss13-ci[bot] Jun 10, 2025
1bdd465
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 11, 2025
4223ba2
fix: make portable vendor scrollable (#9555)
PGrayCS Jun 11, 2025
4678653
Automatic changelog for PR #9555 [ci skip]
cmss13-ci[bot] Jun 11, 2025
ccfc634
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 12, 2025
8d3b0de
Prevents lurker from evolving while invisible/stealthed (#9559)
Jun 12, 2025
957b103
Automatic changelog for PR #9559 [ci skip]
cmss13-ci[bot] Jun 12, 2025
b3934ca
Adds button to toggle displaying Plasma on the updated Hive Status (#…
Bibby0110 Jun 12, 2025
25012e9
Automatic changelog for PR #9441 [ci skip]
cmss13-ci[bot] Jun 12, 2025
dd40c5b
Single monkey burst (#9560)
Drulikar Jun 12, 2025
6667ccb
Fix Autodoc bug caused by patient expiration (#9542)
FebrezeNinja Jun 12, 2025
8ba10d3
Automatic changelog for PR #9560 [ci skip]
cmss13-ci[bot] Jun 12, 2025
1984ccf
gives IO supply key in headset (#9573)
psyendrocronologicalwarfare Jun 12, 2025
8a96d2d
Automatic changelog for PR #9573 [ci skip]
cmss13-ci[bot] Jun 12, 2025
2d0f513
Automatic changelog for PR #9542 [ci skip]
cmss13-ci[bot] Jun 12, 2025
a83646e
fixes the intel sl tracker (#9445)
Detective-Google Jun 12, 2025
7031fdf
Weyland-Yutani Intranet Terminal (#7511)
realforest2001 Jun 12, 2025
76dcf17
Another labeler fix (#9561)
Drulikar Jun 12, 2025
0ed911c
Overwatch Console Bugfixes (#9571)
SpypigDev Jun 12, 2025
cb6dc82
Automatic changelog for PR #7511 [ci skip]
cmss13-ci[bot] Jun 12, 2025
e39b947
Cigarette Lore (#9403)
AI-1CE Jun 12, 2025
f412c67
Automatic changelog for PR #9403 [ci skip]
cmss13-ci[bot] Jun 12, 2025
1d1de20
Helps new players understand hivemind collapse. (#9567)
zzzmike Jun 12, 2025
8ba3db2
Automatic changelog for PR #9567 [ci skip]
cmss13-ci[bot] Jun 12, 2025
5192a9e
Automatic changelog for PR #9561 [ci skip]
cmss13-ci[bot] Jun 12, 2025
ee855a5
M10 ammo box crafting (#9577)
FebrezeNinja Jun 12, 2025
0aa58db
Automatic changelog for PR #9577 [ci skip]
cmss13-ci[bot] Jun 12, 2025
41fbca1
Fixes missing pixels on jeans (#9434)
Generallemon07 Jun 12, 2025
67bac6f
Automatic changelog for PR #9434 [ci skip]
cmss13-ci[bot] Jun 12, 2025
5d2fcea
Automatic changelog for PR #9571 [ci skip]
cmss13-ci[bot] Jun 12, 2025
accc94f
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 13, 2025
821c0f3
acid now moves with acided things, you can no longer pickup acided it…
Detective-Google Jun 13, 2025
734b321
Automatic changelog for PR #9256 [ci skip]
cmss13-ci[bot] Jun 13, 2025
ccfda67
Reverts the jamming system, replaces it with a single saved acid atta…
Detective-Google Jun 13, 2025
b253b0b
Automatic changelog for PR #9241 [ci skip]
cmss13-ci[bot] Jun 13, 2025
5fb4e98
Fix missing predalien and hellhound icons in hive status (#9574)
Drulikar Jun 13, 2025
32be5ee
Automatic changelog for PR #9574 [ci skip]
cmss13-ci[bot] Jun 13, 2025
a94e79c
tweak: Xeno can be fed with more types of food (#9545)
LiquidPotroh Jun 13, 2025
2ca04d2
Automatic changelog for PR #9545 [ci skip]
cmss13-ci[bot] Jun 13, 2025
bbbd9b4
Mentors can De-Admin (#9544)
realforest2001 Jun 13, 2025
01c601a
Automatic changelog for PR #9544 [ci skip]
cmss13-ci[bot] Jun 13, 2025
1ce5e66
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 14, 2025
5620739
Fix tunnel hauling exploit (#9581)
Drulikar Jun 14, 2025
a99872d
Automatic changelog for PR #9581 [ci skip]
cmss13-ci[bot] Jun 14, 2025
e944f1e
new yautja weapon "chain gauntlets" (#9196)
Red-byte3D Jun 14, 2025
a472182
Automatic changelog for PR #9196 [ci skip]
cmss13-ci[bot] Jun 14, 2025
72872ec
Equipment Preset and Manifest interaction backend changes (#9443)
realforest2001 Jun 15, 2025
0edfd48
Automatic changelog for PR #9443 [ci skip]
cmss13-ci[bot] Jun 15, 2025
605cec3
ammo rack can carry filled sandbags (#9424)
cuberound Jun 15, 2025
15233aa
Automatic changelog for PR #9424 [ci skip]
cmss13-ci[bot] Jun 15, 2025
4317658
Enables the storage of flags and tesla into the construction belt. (#…
MemesLauncher Jun 15, 2025
cc076bf
Automatic changelog for PR #9425 [ci skip]
cmss13-ci[bot] Jun 15, 2025
4960673
Automatic changelog compile [ci skip]
cmss13-ci[bot] Jun 15, 2025
3468227
Rename `var/mob/usr` to `var/mob/user` (#9592)
ike709 Jun 15, 2025
ea919a8
clarify accidental discharge admin logging (#9589)
Detective-Google Jun 16, 2025
2c528c4
should work I quess?
uuuuhuuuu Jun 17, 2025
596c0f2
Merge pull request #7 from cuberound/minor-fixes
thwompa Jun 17, 2025
a92a358
Merge branch 'master' into BRUTE
thwompa Jun 17, 2025
48e570b
Sorokyne Strata - Complete revamp - Begone Snow! (#8770)
Zenith00000 Jun 17, 2025
98c2671
Automatic changelog for PR #8770 [ci skip]
cmss13-ci[bot] Jun 17, 2025
2be1ba7
Merge remote-tracking branch 'upstream/master' into BRUTE
thwompa Jun 18, 2025
963b435
adresses remaining issues
uuuuhuuuu Jun 18, 2025
de3ecd0
adresses remaining issues
uuuuhuuuu Jun 18, 2025
7605fba
Merge pull request #8 from cuberound/minor-fixes
thwompa Jun 18, 2025
b767ad3
comments
uuuuhuuuu Jun 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 15 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,21 @@
/tools/docker/ @Fira
/Dockerfile @Fira

# MorrowWolf
# Forest2001

/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @morrowwolf
/code/modules/gear_presets/survivors.dm @morrowwolf
/code/game/machinery/ARES @realforest2001
/tgui/packages/tgui/interfaces/AresAdmin.jsx @realforest2001
/tgui/packages/tgui/interfaces/AresInterface.jsx @realforest2001
/tgui/packages/tgui/interfaces/WorkingJoe.jsx @realforest2001

# Nanu

/maps @Nanu308

# Zonespace

/code/datums/tutorial/ @Zonespace27
/code/modules/admin/verbs/SDQL2/ @Zonespace27
/maps/tutorial/ @Zonespace27

# MULTIPLE OWNERS
15 changes: 11 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ There is no strict process when it comes to merging pull requests. Pull requests

* After leaving reviews on an open pull request, maintainers should convert it to a draft. Once you have addressed all their comments to the best of your ability, feel free to mark the pull as `Ready for Review` again.

* We ask that you refrain from pinging staff about getting your pull request reviewed until after it is automatically marked stale pending review. If it ends up stale exempt, give it a week, but usually this situation will be explained such as when a relevant maintainer is currently unavailable.

* Whenever sprites are added, please include screenshots or video(s) of them in game in the pull request description.

### A note on balance impacting PRs

Certain PRs, such as those which directly change number values (i.e. health, recoil, damage) or add large pieces of content to the game (i.e. a new gun, a new dropship weapon, or a new xeno structure) can have the potential to highly impact game balance or gameflow.
Expand All @@ -174,7 +178,7 @@ If you are porting features/tools from other codebases, you must give them credi
Regarding sprites & sounds, you must credit the artist and possibly the codebase.

## Things you can work on
The following list is non-exhaustive, but should give you a good idea of what the dev team would like to see in Pull Requests.
The following list is non-exhaustive, but should give you a good idea of what we would like to see in Pull Requests.

### Spriting

Expand All @@ -199,7 +203,7 @@ The following list is non-exhaustive, but should give you a good idea of what th
- Bug fixes and inconsistency fixes

**A note on new maps.**
Entirely new maps are generally considered to be stepping stones into the Development team’s mapping dept. proper. However, making a new map is a months long process that requires dedication and constant communication and oversight from mappers on the Maintainer team. Mapping, like spriting and coding is an acquired skill, and it is highly likely your first map is going to suck. Maps are fluid entities that are never absolutely complete, don’t wed yourself to your initial layout, always be prepared to remap half the project when going in.
Entirely new maps are generally considered to be stepping stones into the maintainers’ mapping dept. proper. However, making a new map is a months long process that requires dedication and constant communication and oversight from mappers on the Maintainer team. Mapping, like spriting and coding is an acquired skill, and it is highly likely your first map is going to suck. Maps are fluid entities that are never absolutely complete, don’t wed yourself to your initial layout, always be prepared to remap half the project when going in.


### Coding
Expand All @@ -216,7 +220,7 @@ Entirely new maps are generally considered to be stepping stones into the Develo
- New TGUI

## What we don't want
The following list is non-exhaustive, but should give you a good idea of what the dev team don't want to see in Pull Requests.
The following list is non-exhaustive, but should give you a good idea of what we don't want to see in Pull Requests.

### Spriting
- Resprites of recently updated content, such as uniforms, guns, marine armor
Expand All @@ -236,7 +240,10 @@ The following list is non-exhaustive, but should give you a good idea of what th
- Player-facing HTML UIs
- Prior denied content/PRs (without approval)

Remember that the following lists are not exhaustive. And you can freely contribute an PR with content that can be shuffled into the “What we don’t want” category, and still get it merged. It is just unlikely without prior talk/approval from a maintainer.
### Frozen
- See pinned [issues](https://github.com/cmss13-devs/cmss13/issues) for anything that requires explicit permission.

Remember that the list is not exhaustive. And you can freely contribute an PR with content that can be shuffled into the “What we don’t want” category, and still get it merged. It is just unlikely without prior talk/approval from a maintainer.

## Banned content
Do not add any of the following in a Pull Request or risk getting the PR closed:
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ body:
placeholder: "#1, #2, #3, etc"
validations:
required: true
- type: input
id: round-id
attributes:
label: Round ID
description: If known, what was the Round ID this bug was found on? Can be left blank if unknown or occured across multiple rounds.
placeholder: "12345"
- type: textarea
id: what-happened
attributes:
Expand Down
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Remember: something that is self-evident to you might not be to others. Explain

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! -->

<details>
<summary>Screenshots & Videos</summary>

Expand Down
51 changes: 51 additions & 0 deletions .github/actions/restore_or_install_byond/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# This action attempts to restore BYOND from a cache, or to install it otherwise.
name: Restore or Install BYOND
description: Attempts to restore a specified BYOND version from cache; if it can't, it installs it.

inputs:
major:
description: "The major BYOND version to install. Defaults to the BYOND_MAJOR specified in `dependencies.sh`."
required: false
type: string
minor:
description: "The minor BYOND version to install. Defaults to the BYOND_MINOR specified in `dependencies.sh`."
required: false
type: string

runs:
using: composite
steps:
- name: Configure BYOND version from inputs
if: ${{ inputs.major }}
shell: bash
run: |
echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
echo "BYOND_MINOR=${{ inputs.minor }}" >> $GITHUB_ENV
- name: Configure BYOND version from dependencies.sh
if: ${{ !inputs.major }}
shell: bash
run: |
source dependencies.sh
echo "BYOND_MAJOR=$BYOND_MAJOR" >> $GITHUB_ENV
echo "BYOND_MINOR=$BYOND_MINOR" >> $GITHUB_ENV

# The use of `actions/cache/restore` and `actions/cache/save` here is deliberate, as we want to
# save the BYOND install to a cache as early as possible. If we used just `actions/cache`, it
# would only attempt to save the cache at the end of a job. This ensures that if a workflow run
# is cancelled, we already have a cache to restore from.
- name: Restore BYOND cache
id: restore_byond_cache
uses: actions/cache/restore@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
- name: Install BYOND
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
shell: bash
run: bash tools/ci/install_byond.sh
- name: Save BYOND cache
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
uses: actions/cache/save@v4
with:
path: ~/BYOND
key: ${{ steps.restore_byond_cache.outputs.cache-primary-key }}
26 changes: 26 additions & 0 deletions .github/actions/setup_node/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This action is a wrapper around `actions/setup-node`, to use the version specified in
# `dependencies.sh`.
name: Setup Node
description: Install Node using the version specified in `dependencies.sh`; additionally, restores the Yarn cache if one exists

inputs:
restore-yarn-cache:
description: 'If `true`, restores the Yarn cache alongside installing node.'
required: false
type: boolean
default: false

runs:
using: composite
steps:
- name: Configure Node version
shell: bash
run: |
source dependencies.sh
echo "NODE_VERSION_REQUIRED=$NODE_VERSION_LTS" >> $GITHUB_ENV
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION_REQUIRED }}
cache: ${{ fromJSON(inputs.restore-yarn-cache) && 'yarn' || '' }}
cache-dependency-path: ${{ fromJSON(inputs.restore-yarn-cache) && 'tgui/yarn.lock' || '' }}
158 changes: 88 additions & 70 deletions .github/add_labels.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import os, re
from github import Github
from github import Github, GithubException

# Format - Key: Array[Label, [StringsToIgnore]]
changelogToPrefix = {
'fix': ["Fix", ["fixed a few things"]],
'qol': ["Quality of Life", ["made something easier to use"]],
'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
'del': ["Removal", ["Removed old things"]],
'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
'balance': ["Balance", ["rebalanced something"]],
'code': ["Code Improvement", ["changed some code"]],
'refactor': ["Refactor", ["refactored some code"]],
'config': ["Config", ["changed some config setting"]],
'admin': ["Admin", ["messed with admin stuff"]],
'server': ["Server", ["something server ops should know"]],
'fix': ["Fix", ["fixed a few things"]],
'qol': ["Quality of Life", ["made something easier to use"]],
'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
'del': ["Removal", ["Removed old things"]],
'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
'balance': ["Balance", ["rebalanced something"]],
'code': ["Code Improvement", ["changed some code"]],
'refactor': ["Refactor", ["refactored some code"]],
'config': ["Config", ["changed some config setting"]],
'admin': ["Admin", ["messed with admin stuff"]],
'server': ["Server", ["something server ops should know"]],
'soundadd': ["Sound", ["added a new sound thingy"]],
'sounddel': ["Sound", ["removed an old sound thingy"]],
'imageadd': ["Sprites", ["added some icons and images"]],
Expand All @@ -24,78 +24,96 @@
}

fileToPrefix = {
'wav': 'Sound',
'ogg': 'Sound',
'wav': 'Sound',
'ogg': 'Sound',
'mp3': 'Sound', ## Can't believe they forgot about the best sound format
'dmm': 'Mapping',
'dmm': 'Mapping',

'js': 'UI',
'tsx': 'UI',
'ts': 'UI',
'jsx': 'UI',
'scss': 'UI',
'js': 'UI',
'tsx': 'UI',
'ts': 'UI',
'jsx': 'UI',
'scss': 'UI',

'dmi': "Sprites",
'dmi': "Sprites",
}

githubLabel = "Github"
missingLogLabel = "Missing Changelog"

def get_labels(pr):
labels = {}

files = pr.get_files()
for file in files:
prefix = file.filename.split(".")[-1]
if file.filename.startswith(".github"):
labels[githubLabel] = True
if not prefix in fileToPrefix:
continue
labels[fileToPrefix[prefix]] = True

changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
if changelog_match is None:
changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
if changelog_match is None:
return labels
lines = changelog_match.group(1).split('\n')
for line in lines:
line = line.strip()
if not line:
continue

contentSplit = line.split(":")

key = contentSplit.pop(0).strip()
content = ":".join(contentSplit).strip()

if not key in changelogToPrefix:
continue

if content in changelogToPrefix[key][1]:
continue

labels[changelogToPrefix[key][0]] = True

return list(labels)
labels = {}
failed = False

files = pr.get_files()
for file in files:
prefix = file.filename.split(".")[-1]
if file.filename.startswith(".github"):
labels[githubLabel] = True
if not prefix in fileToPrefix:
continue
labels[fileToPrefix[prefix]] = True

changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
if changelog_match is None:
changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
if changelog_match is None:
print("::warning ::No changelog detected.")
labels[missingLogLabel] = True
return labels, False

lines = changelog_match.group(1).split('\n')
failed = len(lines) <= 2 # Make sure its not an empty changelog
if failed:
print("::error ::Empty changelog.")

for line in lines[1:-1]: # Skip first line with authors and last
line = line.strip()
if not line:
continue

contentSplit = line.split(":")

key = contentSplit.pop(0).strip()
content = ":".join(contentSplit).strip()

if not key in changelogToPrefix: # Some key that we didn't expect
print(f"::error ::Invalid changelog entry: {line}")
failed = True
continue

if content in changelogToPrefix[key][1]: # They left the template entry in
print(f"::error ::Invalid changelog entry: {line}")
failed = True
continue

labels[changelogToPrefix[key][0]] = True

return list(labels), failed

def main():
g = Github(os.environ["TOKEN"])
repo = g.get_repo(os.environ['REPO'])
g = Github(os.environ["TOKEN"])
repo = g.get_repo(os.environ['REPO'])

pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
if not pr:
print("Not a PR.")
return
pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
if not pr:
print("::warning ::Not a PR.")
return

labels = get_labels(pr)
labels, failed = get_labels(pr)

if labels is None: # no labels to add
print("No labels to add.")
return
if not missingLogLabel in labels:
try:
pr.remove_from_labels(missingLogLabel)
except GithubException as e:
if e.status == 404:
pass # 404 if we try to remove a label that isn't set

for label in labels:
pr.add_to_labels(label)
for label in labels:
pr.add_to_labels(label)

if failed:
exit(1)

if __name__ == '__main__':
main()
main()
4 changes: 1 addition & 3 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

# Format is version: map
# Example:
# 500.1337: runtimestation

515.1610: lv624
# 500.1337: runtime
Binary file added .github/assets/discord-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/discord-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/docs-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/docs-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/website-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/website-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/wiki-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/wiki-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions .github/guides/AUTODOC.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# dmdoc
[DOCUMENTATION]: **PUT DOCUMENTATION LINK HERE**
[DOCUMENTATION]: https://docs.cm-ss13.com/

[BYOND]: https://secure.byond.com/

[DMDOC]: https://github.com/SpaceManiac/SpacemanDMM/tree/master/src/dmdoc
[DMDOC]: https://github.com/SpaceManiac/SpacemanDMM/tree/master/crates/dmdoc

[DMDOC] is a documentation generator for DreamMaker, the scripting language
of the [BYOND] game engine. It produces simple static HTML files based on
Expand All @@ -13,9 +13,9 @@ We use **dmdoc** to generate [DOCUMENTATION] for our code, and that documentatio
is automatically generated and built on every new commit to the master branch

This gives new developers a clickable reference [DOCUMENTATION] they can browse to better help
gain understanding of the /tg/station codebase structure and api reference.
gain understanding of the CM-SS13 codebase structure and api reference.

## Documenting code on /tg/station
## Documenting code on CM-SS13
We use block comments to document procs and classes, and we use `///` line comments
when documenting individual variables.

Expand Down
Loading