Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
358 commits
Select commit Hold shift + click to select a range
5f1e105
Marine Major, Ares Announcement (#3448)
ghostsheet May 29, 2023
1567bbc
Automatic changelog for PR #3448 [ci skip]
cm13-github May 29, 2023
2188bc1
VP78 Laser-Light Combo Attachment + Updated desc (#3436)
spartanbobby May 29, 2023
b0b1623
Automatic changelog for PR #3436 [ci skip]
cm13-github May 29, 2023
9a7ff7d
Revive fun fact (#3430)
May 29, 2023
3f10e92
Automatic changelog for PR #3430 [ci skip]
cm13-github May 29, 2023
65158df
SL gets Signal Flare (#3441)
ghostsheet May 29, 2023
3663289
Automatic changelog for PR #3441 [ci skip]
cm13-github May 29, 2023
d20b81f
Gets rid of Nuclear music on Admin Ending Round (#3452)
fira May 29, 2023
b08744b
Automatic changelog for PR #3452 [ci skip]
cm13-github May 29, 2023
cedc0d3
less medic vendors on WO (#3433)
hry-gh May 29, 2023
cb22b5c
Automatic changelog for PR #3433 [ci skip]
cm13-github May 29, 2023
3ee06d2
Fix xenos not ending overwatch when target dies (#3451)
Drulikar May 29, 2023
3375fd6
Automatic changelog for PR #3451 [ci skip]
cm13-github May 29, 2023
622abd9
Fix Radio Signaling Frequencies breaking down (#3429)
fira May 29, 2023
139d277
Automatic changelog for PR #3429 [ci skip]
cm13-github May 29, 2023
6e1d579
Better info when deferring to mhelps (#3437)
BeagleGaming1 May 29, 2023
bd5970b
Automatic changelog for PR #3437 [ci skip]
cm13-github May 29, 2023
22e1083
Fluff: Acid Runner BOOM Visual FX (#3443)
ghostsheet May 29, 2023
4357cc8
Automatic changelog for PR #3443 [ci skip]
cm13-github May 29, 2023
68c2dd9
Corpsmen buyable blood bags (#3459)
May 29, 2023
0f98f02
Automatic changelog for PR #3459 [ci skip]
cm13-github May 29, 2023
d367cd9
Revival of #2979: Ammo Can IMP Rack (#3392)
LynxSolstice May 29, 2023
ba181d7
Automatic changelog for PR #3392 [ci skip]
cm13-github May 29, 2023
a9a0f62
Automatic changelog compile [ci skip]
actions-user May 30, 2023
b5f5f7f
Rifleman Sandbags (#3382)
LynxSolstice May 30, 2023
603540b
Automatic changelog for PR #3382 [ci skip]
cm13-github May 30, 2023
b381cd0
Fix trijent shuttle apc can now be fixed. (#3462)
Huffie56 May 30, 2023
f936dd8
Automatic changelog for PR #3462 [ci skip]
cm13-github May 30, 2023
05fbdee
Nurse intro description correction (#3464)
TenguHangover May 30, 2023
32224a7
Automatic changelog for PR #3464 [ci skip]
cm13-github May 30, 2023
0972eb4
Allows staff to use more non standard symbols in names (#3458)
BeagleGaming1 May 30, 2023
6ec4c45
Automatic changelog for PR #3458 [ci skip]
cm13-github May 30, 2023
6e56886
You can restock vendors with armors again. (#3460)
NewyearnewmeUwu May 30, 2023
3ce36f9
Automatic changelog for PR #3460 [ci skip]
cm13-github May 30, 2023
b41868b
Canceling for the hive now resets its slowdown (#3449)
Drulikar May 30, 2023
4a6a8a3
Automatic changelog for PR #3449 [ci skip]
cm13-github May 30, 2023
75d3d6e
Black Market nerf (#3438)
BeagleGaming1 May 30, 2023
edd1cf1
Automatic changelog for PR #3438 [ci skip]
cm13-github May 30, 2023
861fca4
fix damage taken fun fact (#3479)
ihatethisengine May 30, 2023
8f9501b
Automatic changelog for PR #3479 [ci skip]
cm13-github May 30, 2023
18b0385
Removes the BFA from the SG vendor (#3463)
realforest2001 May 30, 2023
39a0df3
Automatic changelog for PR #3463 [ci skip]
cm13-github May 30, 2023
d1bf8ca
Fix naming of Ext M4RA boxes from Black Market (#3474)
fira May 30, 2023
e3e3361
Fix for crate exploit. (#3468)
Segrain May 30, 2023
1677c6a
Automatic changelog for PR #3468 [ci skip]
cm13-github May 30, 2023
c2aa4b0
LV522 OB Changes (#3473)
May 30, 2023
e7eb459
Automatic changelog for PR #3473 [ci skip]
cm13-github May 30, 2023
b468875
Sleen nerf (#3472)
May 30, 2023
0c05769
Automatic changelog for PR #3472 [ci skip]
cm13-github May 30, 2023
4ad9b95
Money Accounts for Admin USCM Cyro Spawns (#3409)
Drulikar May 30, 2023
cbbd7a1
Automatic changelog for PR #3409 [ci skip]
cm13-github May 30, 2023
0e61302
Logging for tech buys (#3475)
May 30, 2023
2b00573
Automatic changelog for PR #3475 [ci skip]
cm13-github May 30, 2023
26d6c6d
code doc fix
LynxSolstice May 30, 2023
24a7bd3
Adds the mines
LynxSolstice May 30, 2023
ec03742
Mines
LynxSolstice May 30, 2023
49c3874
micro grenade icon
LynxSolstice May 31, 2023
2c8cce0
grenade micro icon
LynxSolstice May 31, 2023
e308bd5
Antitank mine icon and micro active
LynxSolstice May 31, 2023
a4b957c
Minor name change, qdel removal (testing)
LynxSolstice May 31, 2023
c7ff27f
mine stuff
LynxSolstice May 31, 2023
6077bbf
Automatic changelog compile [ci skip]
actions-user May 31, 2023
3f1afad
Trigger change, icon placeholder fix, and explosive pouch change
LynxSolstice May 31, 2023
704e8ab
mine stuff things, trying to debug the damn cluster mine
LynxSolstice May 31, 2023
3deb217
Automatic TGS DMAPI Update (#3484)
cm13-github May 31, 2023
a7708fc
Removes the clustermine
LynxSolstice May 31, 2023
b4c0d1a
Removes the micro grenade
LynxSolstice May 31, 2023
795fe0c
Removes sleep(2)
LynxSolstice May 31, 2023
9b4aedd
description fix
LynxSolstice Jun 1, 2023
0ef1ca9
Second attempt to fix timers runtimes for overhead text system (#3418)
Drulikar Jun 1, 2023
4e125c8
Automatic changelog for PR #3418 [ci skip]
cm13-github Jun 1, 2023
f34c0af
Resin walls kill nodes under them (#3488)
Jun 1, 2023
eec41fc
Automatic changelog for PR #3488 [ci skip]
cm13-github Jun 1, 2023
4a90a2f
Fixes xeno trackers on some maps (#3487)
Jun 1, 2023
7651ef0
Automatic changelog for PR #3487 [ci skip]
cm13-github Jun 1, 2023
5213baa
Trackable Tunnels (#3481)
Jun 1, 2023
2f18e0d
Automatic changelog for PR #3481 [ci skip]
cm13-github Jun 1, 2023
440ca75
Automatic changelog compile [ci skip]
actions-user Jun 2, 2023
45c9ad3
FTP instead of run for admin log downloading (#3476)
Drulikar Jun 2, 2023
a15b1de
Automatic changelog for PR #3476 [ci skip]
cm13-github Jun 2, 2023
3b0350b
Enables the use of arrival message announcements. (#3494)
NewyearnewmeUwu Jun 2, 2023
288b907
Automatic changelog for PR #3494 [ci skip]
cm13-github Jun 2, 2023
f65d422
Fixes armor prefs (#3495)
NewyearnewmeUwu Jun 2, 2023
9098a86
Automatic changelog for PR #3495 [ci skip]
cm13-github Jun 2, 2023
ca86a73
fix xenos being able to build over tunnels (#3499)
realkhad Jun 2, 2023
6a20e03
Automatic changelog for PR #3499 [ci skip]
cm13-github Jun 2, 2023
e8f5398
Warrior Nerf (#3424)
Jun 2, 2023
ad1b9d5
Automatic changelog for PR #3424 [ci skip]
cm13-github Jun 2, 2023
44a0985
Update metatips.txt (#3478)
ihatethisengine Jun 3, 2023
a4c394d
Automatic changelog for PR #3478 [ci skip]
cm13-github Jun 3, 2023
bde5c8f
Automatic changelog compile [ci skip]
actions-user Jun 3, 2023
d2653e6
Remove field kit (#3506)
Jun 3, 2023
898045f
Automatic changelog for PR #3506 [ci skip]
cm13-github Jun 3, 2023
343297e
fix remove items anchored and on the LZ's on fiorina (#3465)
Huffie56 Jun 3, 2023
95fea9a
Automatic changelog for PR #3465 [ci skip]
cm13-github Jun 3, 2023
d17da2e
Fix Signal Flares Admin Log/JMP (#3453)
fira Jun 3, 2023
c73feb8
Automatic changelog for PR #3453 [ci skip]
cm13-github Jun 3, 2023
ac26403
Kills the change stone (#3507)
Jun 3, 2023
3d99cd6
Automatic changelog for PR #3507 [ci skip]
cm13-github Jun 3, 2023
940ec69
Remove old armor crit tip (#3526)
fira Jun 3, 2023
082f819
Automatic changelog compile [ci skip]
actions-user Jun 4, 2023
9af5a20
disable girders for cult walls (#3517)
fira Jun 4, 2023
a6b85a2
Fix ASRS Depths spam (#3515)
fira Jun 4, 2023
4f0e648
Automatic changelog for PR #3515 [ci skip]
cm13-github Jun 4, 2023
8c40415
UFOs can be photographed again (#3511)
fira Jun 4, 2023
bb446f9
Automatic changelog for PR #3511 [ci skip]
cm13-github Jun 4, 2023
5793d72
fixes construction nodes being placed inside of blocked spaces (#3512)
realkhad Jun 4, 2023
226fbf6
Automatic changelog for PR #3512 [ci skip]
cm13-github Jun 4, 2023
aa36ba8
fixes largecrates being invulnerable to projectiles (#3510)
realkhad Jun 4, 2023
b6b5cb9
Automatic changelog for PR #3510 [ci skip]
cm13-github Jun 4, 2023
3199f5e
fixes sandbags being fully built with just one bag (#3500)
realkhad Jun 4, 2023
d515a00
Automatic changelog for PR #3500 [ci skip]
cm13-github Jun 4, 2023
6c25eb7
Fix Xenos targeting their UI with abilities (#3516)
Drulikar Jun 4, 2023
9bb1663
Automatic changelog for PR #3516 [ci skip]
cm13-github Jun 4, 2023
ac22e6e
Vending Refactors - Vending Categories and Multi Vending (#3428)
fira Jun 4, 2023
ebd9df3
Fix Force Dropship Admin Verb (#3514)
Drulikar Jun 4, 2023
69e4c05
Automatic changelog for PR #3514 [ci skip]
cm13-github Jun 4, 2023
96711f9
Increases amount of survivor spawns on shivas to required level (#3513)
Jun 4, 2023
f92ffcb
Automatic changelog for PR #3513 [ci skip]
cm13-github Jun 4, 2023
e5f5588
Automatic forsaken spawns groundside during hijack (#3508)
Jun 4, 2023
926f952
Automatic changelog for PR #3508 [ci skip]
cm13-github Jun 4, 2023
e56e03c
Overwatch Signals for QDEL: Less client disconnection? (#3477)
Drulikar Jun 4, 2023
ec7c37b
Automatic changelog for PR #3477 [ci skip]
cm13-github Jun 4, 2023
5806a9c
Fixes the Solaris PMC nightmare's issue with locked rifles. (#3343)
LynxSolstice Jun 4, 2023
a314631
Automatic changelog for PR #3343 [ci skip]
cm13-github Jun 4, 2023
a7b1055
Nerfs lurker pounce movement and adds a cooldown for headbite. (#3496)
NewyearnewmeUwu Jun 4, 2023
1beddd2
Automatic changelog for PR #3496 [ci skip]
cm13-github Jun 4, 2023
568f1c5
LV624 adds glass ceilings to SW sand temple, West Shack, Inflat, Filt…
spartanbobby Jun 4, 2023
24c8a98
Automatic changelog for PR #3521 [ci skip]
cm13-github Jun 4, 2023
ff0f840
Adds more sidewalks to bigred, places warning stripe tiles under all …
spartanbobby Jun 4, 2023
41813fd
Automatic changelog for PR #3520 [ci skip]
cm13-github Jun 4, 2023
62a1d03
Automatic changelog compile [ci skip]
actions-user Jun 5, 2023
e58f76b
More custom loadout options. (#3467)
Segrain Jun 5, 2023
0a6daf0
Automatic changelog for PR #3467 [ci skip]
cm13-github Jun 5, 2023
233d3e2
Staff/IC Interactions chat setting. (#3522)
realforest2001 Jun 5, 2023
1c9b5de
Automatic changelog for PR #3522 [ci skip]
cm13-github Jun 5, 2023
a5b4f05
balance : increase minimum pay for everyone. (#3519)
Huffie56 Jun 6, 2023
f2258b3
Automatic changelog for PR #3519 [ci skip]
cm13-github Jun 6, 2023
bbcffe5
Automatic changelog compile [ci skip]
actions-user Jun 6, 2023
388c7a9
HPR is cast into the void (#3534)
Jun 6, 2023
e9a47ab
Automatic changelog for PR #3534 [ci skip]
cm13-github Jun 6, 2023
3ccf795
Automatic changelog compile [ci skip]
actions-user Jun 7, 2023
c36f2e8
Fix for queen eye runtime. (#3549)
Segrain Jun 7, 2023
18933dd
Automatic changelog for PR #3549 [ci skip]
cm13-github Jun 7, 2023
53830bb
Nerfs Lobby Music (#3541)
fira Jun 7, 2023
e818276
Automatic changelog for PR #3541 [ci skip]
cm13-github Jun 7, 2023
9da4780
add extra info to reagent tanks description (#3531)
realkhad Jun 7, 2023
8c218d5
Automatic changelog for PR #3531 [ci skip]
cm13-github Jun 7, 2023
ff9d977
Offers PO's and DCC's the M3-VL and M70 (#3544)
Greg-Joffer Jun 7, 2023
31a5b13
Automatic changelog for PR #3544 [ci skip]
cm13-github Jun 7, 2023
41d002f
Hand and feet now cannot get IB (#3545)
Jun 7, 2023
6ea210e
Automatic changelog for PR #3545 [ci skip]
cm13-github Jun 7, 2023
086eb86
Maintenance Jack Tweaks (#3096)
BeagleGaming1 Jun 7, 2023
6502cbd
Automatic changelog for PR #3096 [ci skip]
cm13-github Jun 7, 2023
976ff03
ASRS Screams fix #2 (#3539)
fira Jun 7, 2023
ae01043
Fix Map Landing Lights (#3543)
Steelpoint Jun 7, 2023
69ce495
Automatic changelog for PR #3543 [ci skip]
cm13-github Jun 7, 2023
02568cf
Automatic TGS DMAPI Update (#3532)
cm13-github Jun 7, 2023
fa8dd59
Admin Global Blurb (#3550)
realforest2001 Jun 7, 2023
057440a
Automatic changelog for PR #3550 [ci skip]
cm13-github Jun 7, 2023
1f9ea4f
Fix signallers bricking headsets on shared frequency (#3530)
fira Jun 7, 2023
89e6639
Automatic changelog for PR #3530 [ci skip]
cm13-github Jun 7, 2023
09a4099
fixes telepathically forcing people to grab chairs (#3551)
realkhad Jun 7, 2023
8b45787
Automatic changelog for PR #3551 [ci skip]
cm13-github Jun 7, 2023
718b653
Legacy resprites - June 5 (#3548)
nauticall Jun 7, 2023
29165d9
Automatic changelog for PR #3548 [ci skip]
cm13-github Jun 7, 2023
c6e8a17
Automatic changelog compile [ci skip]
actions-user Jun 8, 2023
a87fa21
Updates chemistry grammar (#3528)
Al-1ce Jun 8, 2023
d5fcdc3
Automatic changelog for PR #3528 [ci skip]
cm13-github Jun 8, 2023
ef60b94
Xeno ability standardization (#3537)
Drulikar Jun 8, 2023
825e8fe
Automatic changelog for PR #3537 [ci skip]
cm13-github Jun 8, 2023
71bdd9f
Tweak to garbage subsystem to use define constant (#3553)
Drulikar Jun 8, 2023
d1d2335
Reduces SG Full Auto Scatter (#3556)
fira Jun 8, 2023
25e8d22
Automatic changelog for PR #3556 [ci skip]
cm13-github Jun 8, 2023
e00cc09
Automatic changelog compile [ci skip]
actions-user Jun 9, 2023
e5cb703
Removes fourth awkward LZ2 Soro communication relay (#3566)
Jun 9, 2023
2e41c05
Automatic changelog for PR #3566 [ci skip]
cm13-github Jun 9, 2023
c7d4ac2
Refactor many object to remove code from DMM to DM code. (#3396)
Huffie56 Jun 9, 2023
d7cd9db
Automatic changelog for PR #3396 [ci skip]
cm13-github Jun 9, 2023
2586b31
Brings back the USCM blurb on first drop (#3560)
Jun 9, 2023
0f7ffc3
Automatic changelog for PR #3560 [ci skip]
cm13-github Jun 9, 2023
8a3c80d
Reintroduces auto red alert when xenos are aboard a dropship (#3558)
Jun 9, 2023
de20c8b
Automatic changelog for PR #3558 [ci skip]
cm13-github Jun 9, 2023
7d5a41d
Burrowers unable to burrow while inside a non-burrow area (#3559)
Jun 9, 2023
15e2825
Automatic changelog for PR #3559 [ci skip]
cm13-github Jun 9, 2023
150fd34
Find internal bleeding via Health Scanner (#3561)
Jun 9, 2023
1a70518
Automatic changelog for PR #3561 [ci skip]
cm13-github Jun 9, 2023
e7149ae
Drop pouch buyable by riflemen (#3562)
Jun 9, 2023
2bb81d9
Automatic changelog for PR #3562 [ci skip]
cm13-github Jun 9, 2023
3163a02
Adaptive clientside zoom for pixel perfect display (#3469)
fira Jun 9, 2023
a7cc2d2
Automatic changelog for PR #3469 [ci skip]
cm13-github Jun 9, 2023
d5b1193
FOB Tents (#3509)
fira Jun 9, 2023
a7197a9
Automatic changelog for PR #3509 [ci skip]
cm13-github Jun 9, 2023
6582d0a
Automatic changelog compile [ci skip]
actions-user Jun 10, 2023
ec1ab53
Fixes medical holocards (#3578)
Jun 10, 2023
c3f5528
Automatic changelog for PR #3578 [ci skip]
cm13-github Jun 10, 2023
97246bf
Forsaken ERT is now weighted by type (#3570)
Jun 10, 2023
3b7ac07
Automatic changelog for PR #3570 [ci skip]
cm13-github Jun 10, 2023
1db607f
fixes ridged armor not appearing properly: or, how i learned to regre…
NewyearnewmeUwu Jun 11, 2023
e66b1b3
Automatic changelog for PR #3580 [ci skip]
cm13-github Jun 11, 2023
7160f18
Automatic changelog compile [ci skip]
actions-user Jun 11, 2023
8de9fd3
Escape pod crash land chance (#3540)
Jun 11, 2023
4e06ae6
Automatic changelog for PR #3540 [ci skip]
cm13-github Jun 11, 2023
6809cd5
Poly_kevlon > Plastic (#3585)
Al-1ce Jun 11, 2023
ae9bb75
Automatic changelog for PR #3585 [ci skip]
cm13-github Jun 11, 2023
4cca984
Automatic changelog compile, [ci skip]
cm13-github Jun 11, 2023
95c24e0
Removes some broken forsaken ERT code (#3586)
Jun 11, 2023
39c5b28
Automatic changelog for PR #3586 [ci skip]
cm13-github Jun 11, 2023
df1d397
Less effective clamping bleeding in bad conditions (#3579)
Jun 11, 2023
f2eddb7
Automatic changelog for PR #3579 [ci skip]
cm13-github Jun 11, 2023
39939b9
Removes ability to high toss over ultra reinforced windows (#3587)
Jun 11, 2023
1305885
Automatic changelog for PR #3587 [ci skip]
cm13-github Jun 11, 2023
796b16d
Cryopods now give a slight glow when occupied (#3574)
Jun 11, 2023
e33a367
Automatic changelog for PR #3574 [ci skip]
cm13-github Jun 11, 2023
89ae6c1
Acid pillars now target crit burning friendly xenos (#3571)
BeagleGaming1 Jun 11, 2023
86a66ca
Automatic changelog for PR #3571 [ci skip]
cm13-github Jun 11, 2023
c17ba22
Automatic changelog compile, [ci skip]
cm13-github Jun 11, 2023
43a0d9e
Jobs and character slots. (#3552)
Segrain Jun 11, 2023
96166ec
Automatic changelog for PR #3552 [ci skip]
cm13-github Jun 11, 2023
0d8da2b
Automatic changelog compile [ci skip]
actions-user Jun 12, 2023
5535699
Fluff security record entry is now added as a comment to the security…
Bibby0110 Jun 12, 2023
f06cd1d
Automatic changelog for PR #3598 [ci skip]
cm13-github Jun 12, 2023
6ec2957
Hardy weeds now spread on CC shale rocks. (#3596)
Bibby0110 Jun 12, 2023
dce9787
Automatic changelog for PR #3596 [ci skip]
cm13-github Jun 12, 2023
8663c4e
Data detector no longer goes off on empty vial boxes (#3595)
Bibby0110 Jun 12, 2023
e56e522
Automatic changelog for PR #3595 [ci skip]
cm13-github Jun 12, 2023
a35b3ae
Sentries now work correctly on dropships (#3599)
Bibby0110 Jun 12, 2023
84c6a41
Automatic changelog for PR #3599 [ci skip]
cm13-github Jun 12, 2023
4854bd5
Limits view range of large crate destroy message. (#3594)
Bibby0110 Jun 12, 2023
abb1369
Automatic changelog for PR #3594 [ci skip]
cm13-github Jun 12, 2023
83fd1a9
Admin Map Overrides (#3567)
fira Jun 12, 2023
d39b98a
Automatic changelog for PR #3567 [ci skip]
cm13-github Jun 12, 2023
c566e1d
You can no longer use MMB to attack (probably) (#3576)
ihatethisengine Jun 12, 2023
20831f5
Automatic changelog for PR #3576 [ci skip]
cm13-github Jun 12, 2023
0f386c8
Stops Squad Leaders and ComTechs from blowing up the Almayer (#3602)
fira Jun 12, 2023
58523ed
Automatic changelog for PR #3602 [ci skip]
cm13-github Jun 12, 2023
d0f10df
Automatic changelog compile, [ci skip]
cm13-github Jun 12, 2023
5603b52
sprites
LynxSolstice Jun 12, 2023
e801f1a
jesus christ fucking outdated for sure
LynxSolstice Jun 13, 2023
1b27530
trait fix
LynxSolstice Jun 13, 2023
7e4b873
Desc
LynxSolstice Jun 13, 2023
0c9e8fd
Adds mines to the engineer vendor
LynxSolstice Jun 13, 2023
2ff19e7
Mines Boom: The PR (thanks silencer)
LynxSolstice Jun 13, 2023
045ada4
Merge remote-tracking branch 'upstream/master' into mineRefractor
LynxSolstice Jun 13, 2023
9f273f5
fix
LynxSolstice Jun 13, 2023
74f9b66
Update code/game/objects/items/explosives/mine.dm
LynxSolstice Jun 20, 2023
68587b6
Update code/game/objects/items/explosives/mine.dm
LynxSolstice Jun 20, 2023
3a3e3ea
WIP
LynxSolstice Jun 23, 2023
4d3a126
Merge branch 'mineRefractor' of https://github.com/LynxSolstice/cmss1…
LynxSolstice Jun 23, 2023
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
  •  
  •  
  •  
9 changes: 5 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- [Introduction](#introduction)
- [Getting Started](#getting-started)
- [Meet the Team](#meet-the-team)
- [Head Maintainer and Project Manager](#head-maintainer-and-project-manager)
- [Head Maintainer and Maintainer Managers](#head-maintainer-and-maintainer-managers)
- [Maintainers](#maintainers)
- [Staff Tools and Major Rule changing PR’s](#staff-tools-and-major-rule-changing-prs)
- [Issue Managers](#issue-managers)
Expand All @@ -16,6 +16,7 @@
- [Writing understandable code](#writing-understandable-code)
- [Misc](#misc)
- [Pull Request Process](#pull-request-process)
- [A note on balance impacting PRs](#a-note-on-balance-impacting-prs)
- [Good Boy Points](#good-boy-points)
- [Porting features/sprites/sounds/tools from other codebases](#porting-featuresspritessoundstools-from-other-codebases)
- [Things you can work on](#things-you-can-work-on)
Expand Down Expand Up @@ -52,9 +53,9 @@ You can of course, as always, ask for help on the Discord channels or the forums

## Meet the Team

### Head Maintainer and Project Manager
### Head Maintainer and Maintainer Managers

The Head Maintainer and Project Manager are responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not.
The Head Maintainer and Maintainer Managers are responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not.

### Maintainers

Expand Down Expand Up @@ -162,7 +163,7 @@ There is no strict process when it comes to merging pull requests. Pull requests

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.

* If a Project Manager or Head Maintainer has not reviewed a pull request that impacts balance in 7 days, maintainers may review and merge the PR themselves.
* If a Maintainer Manager or Head Maintainer has not reviewed a pull request that impacts balance in 7 days, maintainers may review and merge the PR themselves.

* We understand that having something you have worked on for quite some time being denied can be frustrating. Therefore, it is recommended that you check with a maintainer before beginning to code your PR if you have any doubts that it will be accepted. This will save everyone's time and energy.

Expand Down
9 changes: 9 additions & 0 deletions .github/alternate_byond_versions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file contains extra tests to run for specific BYOND versions.
# This is useful for making sure we maintain compatibility with both older and newer versions,
# while still having our main tests run on a guaranteed pinned version.

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

515.1603: lv624
31 changes: 31 additions & 0 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ jobs:
runs-on: ubuntu-20.04
outputs:
maps: ${{ steps.map_finder.outputs.maps }}
alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
concurrency:
group: find_all_maps-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand All @@ -95,6 +96,11 @@ jobs:
sed -i -e s+maps/+\"+g -e s+.json+\"+g maps_output.txt
echo "Maps: $(cat maps_output.txt)"
echo "maps={\"paths\":[$(cat maps_output.txt)]}" >> $GITHUB_OUTPUT
- name: Find Alternate Tests
id: alternate_test_finder
run: |
ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?<major>[0-9]+)\\.(?<minor>[0-9]+): (?<map>.+)$")]' .github/alternate_byond_versions.txt)
echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT
run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Unit Tests
Expand All @@ -110,6 +116,31 @@ jobs:
with:
map: ${{ matrix.map }}

run_alternate_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'"
name: Alternate Tests
needs: [find_all_maps]
strategy:
fail-fast: false
matrix:
setup: ${{ fromJSON(needs.find_all_maps.outputs.alternate_tests) }}
concurrency:
group: run_all_tests-${{ github.head_ref || github.run_id }}-${{ matrix.setup.major }}.${{ matrix.setup.minor }}-${{ matrix.setup.map }}
cancel-in-progress: true
uses: ./.github/workflows/run_unit_tests.yml
with:
map: ${{ matrix.setup.map }}
major: ${{ matrix.setup.major }}
minor: ${{ matrix.setup.minor }}

check_alternate_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'"
name: Check Alternate Tests
needs: [run_alternate_tests]
runs-on: ubuntu-20.04
steps:
- run: echo Alternate tests passed.

test_windows:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Windows Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS
tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -Werror
- name: Run Tests
run: |
source $HOME/BYOND/byond/bin/byondsetup
Expand Down
12 changes: 12 additions & 0 deletions .tgs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 1
byond: "514.1588"
static_files:
- name: config
- name: data
linux_scripts:
PreCompile.sh: tools/tgs_scripts/PreCompile.sh
WatchdogLaunch.sh: tools/tgs_scripts/WatchdogLaunch.sh
InstallDeps.sh: tools/tgs_scripts/InstallDeps.sh
windows_scripts:
PreCompile.bat: tools/tgs_scripts/PreCompile.bat
security: Trusted
10 changes: 1 addition & 9 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
{
"recommendations": [
"gbasood.byond-dm-language-support",
"platymuus.dm-langclient",
"arcanis.vscode-zipfs",
"EditorConfig.EditorConfig",
"stylemistake.auto-comment-blocks",
"anturk.dmi-editor",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"donkie.vscode-tgstation-test-adapter"
"cmss13-devs.cm-extpack"
]
}
5 changes: 5 additions & 0 deletions code/__DEFINES/_macros.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@

#define subtypesof(A) (typesof(A) - A)

#ifdef EXPERIMENT_515_DONT_CACHE_REF
/// Takes a datum as input, returns its ref string
#define text_ref(datum) ref(datum)
#else
/// Takes a datum as input, returns its ref string, or a cached version of it
/// This allows us to cache \ref creation, which ensures it'll only ever happen once per datum, saving string tree time
/// It is slightly less optimal then a []'d datum, but the cost is massively outweighed by the potential savings
/// It will only work for datums mind, for datum reasons
/// : because of the embedded typecheck
#define text_ref(datum) (isdatum(datum) ? (datum:cached_ref ||= "\ref[datum]") : ("\ref[datum]"))
#endif

#define addToListNoDupe(L, index) if(L) L[index] = null; else L = list(index)

Expand Down
13 changes: 13 additions & 0 deletions code/__DEFINES/blood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,16 @@
#define BLOOD_FEET (1<<2)

#define BLOOD_ALL (BLOOD_BODY|BLOOD_HANDS|BLOOD_FEET)

#define BLOOD_COLOR_HUMAN "#A10808"
#define BLOOD_COLOR_SYNTHETIC "#EEEEEE"

#define BLOOD_COLOR_NEAERA "#1d2cbf"

#define BLOOD_COLOR_XENO "#dffc00"
#define BLOOD_COLOR_XENO_ROYAL "#bbb900"

#define BLOOD_COLOR_YAUTJA "#20d450"
#define BLOOD_COLOR_YAUTJA_DARK "#5A934A"

#define BLOOD_COLOR_ZOMBIE "#333333"
1 change: 1 addition & 0 deletions code/__DEFINES/chat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#define MESSAGE_TYPE_ADMINCHAT "adminchat"
#define MESSAGE_TYPE_MODCHAT "modchat"
#define MESSAGE_TYPE_MENTOR "mentor"
#define MESSAGE_TYPE_STAFF_IC "staff_ic"
#define MESSAGE_TYPE_EVENTCHAT "eventchat"
#define MESSAGE_TYPE_ADMINLOG "adminlog"
#define MESSAGE_TYPE_ATTACKLOG "attacklog"
Expand Down
33 changes: 33 additions & 0 deletions code/__DEFINES/client_prefs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#define BE_ALIEN_AFTER_DEATH (1<<0)
#define BE_AGENT (1<<1)

#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself
#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless
#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking
#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks
#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines
// MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND
#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand
// MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE
#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallye jecting magazines from guns will cause you to unwield your gun
// and put the empty magazine in your hand
#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period
#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed.
#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them.
#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm
#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not
#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat
#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands
#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off
#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand.
#define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot.
#define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot.

#define JOB_SLOT_RANDOMISED_SLOT -1
#define JOB_SLOT_CURRENT_SLOT 0
#define JOB_SLOT_RANDOMISED_TEXT "Randomise name and appearance"
#define JOB_SLOT_CURRENT_TEXT "Current character"

#define AGE_MIN 19 //youngest a character can be
#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160.
#define MAX_GEAR_COST 7 //Used in chargen for loadout limit.
1 change: 1 addition & 0 deletions code/__DEFINES/cooldowns.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#define COOLDOWN_MOB_AUDIO "mob_audio_cooldown"
#define COOLDOWN_IDLOCK_TEXTALERT "mob_idlock_textalert"
#define COOLDOWN_HIJACK_BARRAGE "gamemode_explosive_barrage"
#define COOLDOWN_HIJACK_GROUND_CHECK "gamemode_ground_check"
#define COOLDOWN_ITEM_HOOD_SOUND "item_hood_sound"

//Define for ship alt
Expand Down
7 changes: 7 additions & 0 deletions code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#define COMSIG_HUMAN_OVERLAY_APPLIED "human_overlay_applied"
/// From /mob/living/carbon/human/remove_overlay(): (cache_index, overlay_image)
#define COMSIG_HUMAN_OVERLAY_REMOVED "human_overlay_removed"
/// From /datum/flaying_datum
#define COMSIG_HUMAN_FLAY_ATTEMPT "human_flay_attempt"

#define COMSIG_HUMAN_BONEBREAK_PROBABILITY "human_bonebreak_probability"

Expand All @@ -52,3 +54,8 @@

//from /mob/living/carbon/human/Life()
#define COMSIG_HUMAN_SET_UNDEFIBBABLE "human_set_undefibbable"

/// from /datum/surgery_step/proc/attempt_step()
#define COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS "human_surgery_apply_modifiers"
/// From /mob/living/carbon/human/proc/get_flags_cold_protection()
#define COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS "human_cold_protection_apply_modifiers"
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,5 @@
#define COMSIG_MOB_STAT_SET_ALIVE "mob_stat_set_alive"
//from /mob/living/set_stat()
#define COMSIG_MOB_STAT_SET_DEAD "mob_stat_set_dead"

#define COMSIG_GHOST_MOVED "ghost_moved"
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/atom/signals_item.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#define COMSIG_ITEM_ATTEMPT_ATTACK "item_attempt_attack" //Triggered on the target mob.
#define COMPONENT_CANCEL_ATTACK (1<<0)

#define COMSIG_ITEM_ATTACK_AIRLOCK "item_attack_airlocK"
#define COMPONENT_CANCEL_AIRLOCK_ATTACK (1<<0)

/// from /obj/item/attackby() : (obj/item, mob/user)
#define COMSIG_ITEM_ATTACKED "item_attacked"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/atom/signals_obj.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@

/// from /obj/structure/transmitter/update_icon()
#define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon"

#define COMSIG_TENT_COLLAPSING "tent_collapsing"
1 change: 1 addition & 0 deletions code/__DEFINES/dcs/signals/atom/signals_turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#define COMSIG_TURF_ENTER "turf_enter"
#define COMPONENT_TURF_ALLOW_MOVEMENT (1<<0)
#define COMPONENT_TURF_DENY_MOVEMENT (1<<1)
#define COMSIG_TURF_ENTERED "turf_entered"

/// Called when a bullet hits a turf
#define COMSIG_TURF_BULLET_ACT "turf_bullet_act"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/dropships.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
#define DROPSHIP_MAX_AUTO_DELAY 60 SECONDS
#define DROPSHIP_MIN_AUTO_DELAY 10 SECONDS
#define DROPSHIP_AUTO_RETRY_COOLDOWN 20 SECONDS
#define DROPSHIP_MEDEVAC_COOLDOWN 20 SECONDS
5 changes: 0 additions & 5 deletions code/__DEFINES/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,3 @@
#define RELIGION_AGNOSTICISM "Agnostic"

#define MAXIMUM_DROPPED_OBJECTS_REMEMBERED 2

///////////////////MISC HUMAN FLAGS (LINKED TO VAR: FLAGS_HUMAN_MISC)///////////////////

#define HUMAN_FLAG_CHANGED (1<<0)

12 changes: 9 additions & 3 deletions code/__DEFINES/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,15 @@
#define FACEHUGGER_LAYER 4.13
/// For WEATHER
#define WEATHER_LAYER 4.14
#define INTERIOR_WALL_SOUTH_LAYER 5.2
#define INTERIOR_DOOR_LAYER 5.21

//#define FLY_LAYER 5

#define RIPPLE_LAYER 5.1
#define INTERIOR_DOOR_INSIDE_LAYER 5.19
#define INTERIOR_WALL_SOUTH_LAYER 5.2
#define INTERIOR_DOOR_LAYER 5.21
#define INTERIOR_WALLMOUNT_LAYER 5.3
#define INTERIOR_ROOF_LAYER 5.5

#define ABOVE_FLY_LAYER 6

Expand Down Expand Up @@ -174,9 +177,12 @@
/// NEVER HAVE ANYTHING BELOW THIS PLANE ADJUST IF YOU NEED MORE SPACE
#define LOWEST_EVER_PLANE -200

/// Floor plane, self explanatory. Used for Ambient Occlusion filter
#define FLOOR_PLANE -7
/// Game Plane, where most of the game objects reside
#define GAME_PLANE -6
#define ABOVE_GAME_PLANE -5
/// Roof plane, disappearing when entering buildings
#define ROOF_PLANE -4

/// To keep from conflicts with SEE_BLACKNESS internals
#define BLACKNESS_PLANE 0
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,10 @@ require only minor tweaks.
#define GROUND_MAP "ground_map"
#define SHIP_MAP "ship_map"
#define ALL_MAPTYPES list(GROUND_MAP, SHIP_MAP)
#define OVERRIDE_MAPS_TO_FILENAME list(GROUND_MAP = "next_map_override.dmm", SHIP_MAP = "next_ship_override.dmm")
#define MAP_TO_FILENAME list(GROUND_MAP = "data/next_map.json", SHIP_MAP = "data/next_ship.json")
#define HUNTERSHIPS_TEMPLATE_PATH "maps/predship/huntership.dmm"
#define OVERRIDE_DEFAULT_MAP_CONFIG list(GROUND_MAP = "maps/override_ground.json", SHIP_MAP = "maps/override_ship.json")

// traity things
#define MAP_COLD "COLD"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/mob_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@
//for tracking the queen/hivecore on xeno locator huds
#define TRACKER_QUEEN "Queen"
#define TRACKER_HIVE "Hive Core"
#define TRACKER_LEADER "Leader"
#define TRACKER_TUNNEL "Tunnel"
34 changes: 3 additions & 31 deletions code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,6 @@

#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 3

#define BE_ALIEN_AFTER_DEATH 1
#define BE_AGENT 2

#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself
#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless
#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking
#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks
#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines
// MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND
#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand
// MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE
#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallyejecting magazines from guns will cause you to unwield your gun
// and put the empty magazine in your hand
#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period
#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed.
#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them.
#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm
#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not
#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat
#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands
#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off
#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand.

//=================================================
#define SHOW_ITEM_ANIMATIONS_NONE 0 //Do not show any item pickup animations
#define SHOW_ITEM_ANIMATIONS_HALF 1 //Toggles tg-style item animations on and off, default on.
Expand All @@ -111,16 +88,8 @@
//=================================================


var/list/be_special_flags = list(
"Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH,
"Agent" = BE_AGENT,
)

#define AGE_MIN 19 //youngest a character can be
#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160.
//Number of marine players against which the Marine's gear scales
#define MARINE_GEAR_SCALING_NORMAL 30
#define MAX_GEAR_COST 7 //Used in chargen for loadout limit.

#define RESOURCE_NODE_SCALE 95 //How many players minimum per extra set of resource nodes
#define RESOURCE_NODE_QUANTITY_PER_POP 11 //How many resources total per pop
Expand Down Expand Up @@ -286,6 +255,9 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,

#define FACTION_LIST_XENOMORPH list(FACTION_XENOMORPH, FACTION_XENOMORPH_CORRPUTED, FACTION_XENOMORPH_ALPHA, FACTION_XENOMORPH_BRAVO, FACTION_XENOMORPH_CHARLIE, FACTION_XENOMORPH_DELTA)

// Faction allegiances within a certain faction.

#define FACTION_ALLEGIANCE_USCM_COMMANDER list("Doves", "Hawks", "Magpies", "Unaligned")

// global vars to prevent spam of the "one xyz alive" messages

Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse
#define IS_PRY_CAPABLE_CROWBAR 2 //actual crowbar
#define IS_PRY_CAPABLE_FORCE 3 //can force open even powered airlocks


#define SELF_DESTRUCT_MACHINE_INACTIVE 0
#define SELF_DESTRUCT_MACHINE_ACTIVE 1
#define SELF_DESTRUCT_MACHINE_ARMED 2
Expand Down
Loading