Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

another draft pr for plasmaman #2

Open
wants to merge 575 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
575 commits
Select commit Hold shift + click to select a range
d965c73
Add Plastic Flaps Movement Slow (#1573)
VMSolidus Jan 17, 2025
536deb6
[Shitmed] Increase Brain Eating Time & Show Brain Eating Popup (#1563)
VMSolidus Jan 17, 2025
89101e3
Automatic Changelog Update (#1573)
SimpleStation14 Jan 17, 2025
3a1c2dd
Automatic Changelog Update (#1563)
SimpleStation14 Jan 17, 2025
638071c
Glimmer Rework 1: "Swingy Glimmer" (#1480)
VMSolidus Jan 17, 2025
b56f123
Automatic Changelog Update (#1480)
SimpleStation14 Jan 17, 2025
08154a9
Modular Computer System (#1556)
Erisfiregamer1 Jan 17, 2025
d185170
Automatic Changelog Update (#1556)
SimpleStation14 Jan 17, 2025
6c43d00
Martial Artist Rework + Fix MeleeWeapon Wizmerge Bugs (#1560)
angelofallars Jan 17, 2025
b5403ba
Automatic Changelog Update (#1560)
SimpleStation14 Jan 17, 2025
a0d6109
Merge branch 'master' into plasmaman
angelofallars Jan 17, 2025
19a350f
Handheld Frequencies (#1574)
sleepyyapril Jan 17, 2025
ae63a45
Automatic Changelog Update (#1574)
SimpleStation14 Jan 17, 2025
86f9dfd
Lobby Background Credits (#1558)
Piras314 Jan 17, 2025
b1162a3
Automatic Changelog Update (#1558)
SimpleStation14 Jan 17, 2025
a9f7fe8
Downstream Port (#1509)
sleepyyapril Jan 17, 2025
5acb331
Automatic Changelog Update (#1509)
SimpleStation14 Jan 17, 2025
00064a6
IPC Facial Hair (#1575)
angelofallars Jan 17, 2025
58edabd
Automatic Changelog Update (#1575)
SimpleStation14 Jan 17, 2025
e29ee86
Remove All Usages of DepartmentTimeRequirement (#1576)
sleepyyapril Jan 17, 2025
5990b03
Make Loadout Firearms Comply With Space Law (#1522)
VMSolidus Jan 17, 2025
5d1dbe4
Alternative Bunny Ears (#1577)
angelofallars Jan 17, 2025
7bf3692
Automatic Changelog Update (#1577)
SimpleStation14 Jan 17, 2025
64c1196
Fix Mining Drills & Reduce Stamina Cost (#1579)
angelofallars Jan 17, 2025
cc1cf10
Automatic Changelog Update (#1579)
SimpleStation14 Jan 17, 2025
b8a4870
Add Magistrate, Dignitary Department, and Minor FTL Fixes (#1536)
CerberusWolfie Jan 17, 2025
eefa06d
Automatic Changelog Update (#1536)
SimpleStation14 Jan 17, 2025
b338f1b
Vigor Buff & Lethargy Nerf (#1578)
angelofallars Jan 17, 2025
0ba8772
Automatic Changelog Update (#1578)
SimpleStation14 Jan 17, 2025
d14271b
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 17, 2025
3a6de6c
Fix Sophia Sending a Massive Float to Chat (#1581)
sleepyyapril Jan 18, 2025
2ca3ef0
Automatic Changelog Update (#1581)
SimpleStation14 Jan 18, 2025
2ce71b4
Make Room for Longer Chem Names. (#1582)
sleepyyapril Jan 18, 2025
2bf0c00
Automatic Changelog Update (#1582)
SimpleStation14 Jan 18, 2025
d326d4c
IPCs Can Cryo Again (#1583)
sleepyyapril Jan 18, 2025
18dfce3
Automatic Changelog Update (#1583)
SimpleStation14 Jan 18, 2025
357f837
Split All CVars Into Separate Files (#1587)
VMSolidus Jan 18, 2025
c1c61e9
Add Classic Asimov Laws (#1588)
VMSolidus Jan 18, 2025
f484195
Automatic Changelog Update (#1588)
SimpleStation14 Jan 18, 2025
9baa214
ChemMaster+ (#1585)
sleepyyapril Jan 18, 2025
b1490d8
Automatic Changelog Update (#1585)
SimpleStation14 Jan 18, 2025
48a3233
Remove Default Scream Action (#1589)
VMSolidus Jan 18, 2025
595ad86
Automatic Changelog Update (#1589)
SimpleStation14 Jan 18, 2025
6818344
Update build-test-debug.yml
VMSolidus Jan 18, 2025
12bec92
Update CCVars.Misc.cs (#1590)
VMSolidus Jan 18, 2025
568293a
Automatic Changelog Update (#1590)
SimpleStation14 Jan 18, 2025
d9adf3f
Merge branch 'master' into Ignore-Warnings-In-Tests
sleepyyapril Jan 18, 2025
4866f0f
fix whitelist.enabled test fail
VMSolidus Jan 18, 2025
85df476
Merge branch 'Ignore-Warnings-In-Tests' of https://github.com/VMSolid…
VMSolidus Jan 18, 2025
9ab44b0
Update PoolTestLogHandler.cs
VMSolidus Jan 18, 2025
ea182fc
Fix Cargo Shuttle
VMSolidus Jan 18, 2025
3856eee
Fix Lathe Issue
VMSolidus Jan 18, 2025
166d3f7
More various fixes
VMSolidus Jan 18, 2025
13bf44b
More Fixes
VMSolidus Jan 18, 2025
d7c5e48
Network Configurator Fixes (#1592)
sleepyyapril Jan 18, 2025
fbf0bf7
Automatic Changelog Update (#1592)
SimpleStation14 Jan 18, 2025
fbc9cc7
aaaaa
VMSolidus Jan 18, 2025
9d611b5
Disable Blood Traits For Lamia (#1586)
VMSolidus Jan 18, 2025
4ed887f
Automatic Changelog Update (#1586)
SimpleStation14 Jan 18, 2025
cb6a090
Add mapping editor (#23427)
DrSmugleaf Aug 4, 2024
3697509
Fix coords monitor in replays (#29512)
PJB3005 Jun 27, 2024
d1fefc0
Fix Airlock Error (#1593)
sleepyyapril Jan 18, 2025
a8a8395
Merge branch 'master' into Ignore-Warnings-In-Tests
VMSolidus Jan 18, 2025
39db850
Merge branch 'master' into plasmaman
angelofallars Jan 18, 2025
42181ed
Fix verbs in mapping state (#30631)
metalgearsloth Aug 4, 2024
3757996
MORE FIXES
VMSolidus Jan 19, 2025
3f29e24
Merge branch 'Ignore-Warnings-In-Tests' of https://github.com/VMSolid…
VMSolidus Jan 19, 2025
d84ad07
Update CCVars.Whitelist.cs
VMSolidus Jan 19, 2025
6b99e30
make dead plasmemes not get additional firestacks
angelofallars Jan 19, 2025
ee481dc
IPCs dont have blood
VMSolidus Jan 19, 2025
82b31d4
Update CCVars.Admin.Logs.cs
VMSolidus Jan 19, 2025
42b98be
SHUT
VMSolidus Jan 19, 2025
1865386
aaaaaaaaaaaa
VMSolidus Jan 19, 2025
61511ec
Resurrect The Build And Test Debug (#1591)
VMSolidus Jan 19, 2025
8fe7608
Merge branch 'master' into Cuba-Attack
BlueHNT Jan 19, 2025
8fb5dcb
Adds Cohiba Robusto Cigars (#1455)
VMSolidus Jan 19, 2025
c187070
Automatic Changelog Update (#1455)
SimpleStation14 Jan 19, 2025
c2d3227
cleanup of IgniteFromGas + serialize immunity parts + increase shitme…
angelofallars Jan 19, 2025
01ee417
use LimitedCharges system
angelofallars Jan 19, 2025
06b40c1
refactor UpdateIgniteImmunity to use Entity<T, U>
angelofallars Jan 19, 2025
3928065
Fix verb sub (#30667)
metalgearsloth Aug 5, 2024
fe86c83
Hotfix Verbs (#1597)
VMSolidus Jan 19, 2025
c8a8989
improve self-extinguisher
angelofallars Jan 19, 2025
989acc5
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 19, 2025
614d261
move self-extinguisher stuff to shared for prediction
angelofallars Jan 19, 2025
e6f20f1
remove codes about groups
angelofallars Jan 19, 2025
7c5c4ba
Fix Hissing & Another Airlock Error (#1596)
sleepyyapril Jan 19, 2025
09b5c3e
Update miningrock.yml (#1595)
VMSolidus Jan 19, 2025
18fff67
make Roman numeral last names generated programmatically with a function
angelofallars Jan 19, 2025
2cb4cbc
don't log if ents don't have IgniteFromGasComponent
angelofallars Jan 19, 2025
e924c0f
make clothes showable on client + fix prototype replacing bug
angelofallars Jan 19, 2025
6b11853
hide mask layer when envirohelm is worn
angelofallars Jan 19, 2025
ad8125c
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 19, 2025
9e7e77d
fix using `startingGear` instead of `newStartingGear`
angelofallars Jan 19, 2025
f54fb0f
hide cold alert from plasmaman
angelofallars Jan 19, 2025
68bdb3d
update guidebook entry for plasmemes
angelofallars Jan 19, 2025
f1396eb
Add never push inheritance to abstract field in StartingGearPrototype
angelofallars Jan 19, 2025
c38f34f
There's literally no reason to do this because it impacts only the pe…
sleepyyapril Jan 19, 2025
90cc907
Merge branch 'master' into bruizine-change
sleepyyapril Jan 19, 2025
631ad78
1984 "Unobtainium Chemistry" (#1600)
VMSolidus Jan 19, 2025
6616d0f
Automatic Changelog Update (#1600)
SimpleStation14 Jan 19, 2025
01faf46
Update CargoTest.cs
sleepyyapril Jan 19, 2025
bc7f5e0
Consolidate Arsenal Research
VMSolidus Jan 19, 2025
5092351
Bruizine Lithium Change (#1601)
VMSolidus Jan 19, 2025
29acc7b
Update arsenal.yml
VMSolidus Jan 19, 2025
dfb9a0d
aaaaaaaa
VMSolidus Jan 19, 2025
d3f3a51
Merge branch 'Simple-Station:master' into Consolidate-Civilian-Research
VMSolidus Jan 19, 2025
32fe4fb
aaaaaaaa
VMSolidus Jan 19, 2025
a67eadd
Consolidate Civilian Research
VMSolidus Jan 19, 2025
22e8a2d
Consolidate Arsenal Research (#1602)
VMSolidus Jan 19, 2025
95fc947
Automatic Changelog Update (#1602)
SimpleStation14 Jan 19, 2025
230c82c
Merge branch 'master' into Consolidate-Civilian-Research
VMSolidus Jan 19, 2025
5670924
Consolidate Civilian Research (#1603)
VMSolidus Jan 19, 2025
7a08091
Automatic Changelog Update (#1603)
SimpleStation14 Jan 19, 2025
d1821a1
Arsenal Tacsuit Research (#1604)
VMSolidus Jan 19, 2025
6cd57c0
Automatic Changelog Update (#1604)
SimpleStation14 Jan 19, 2025
323d82b
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 20, 2025
b7da1f4
Replace Tech Lockout With Softcap (#1605)
VMSolidus Jan 20, 2025
fca700a
Automatic Changelog Update (#1605)
SimpleStation14 Jan 20, 2025
9e24c4a
Fix Possible Loadout Related Crash (#1607)
VMSolidus Jan 20, 2025
b67fd10
Automatic Changelog Update (#1607)
SimpleStation14 Jan 20, 2025
84a892a
add HoP envirogloves and plasmaman eyes
angelofallars Jan 20, 2025
523818c
Augustine Lawset (#1609)
Elijahrane Jan 20, 2025
bb6693d
Automatic Changelog Update (#1609)
SimpleStation14 Jan 20, 2025
1797252
v240.1.0 (#1606)
sleepyyapril Jan 20, 2025
0fa6a90
Make CODEOWNERS (#1608)
sleepyyapril Jan 20, 2025
1a21140
update captain envirosuit colors
angelofallars Jan 20, 2025
f55ab5c
ATS V2 (#1612)
Mike32oz Jan 20, 2025
44d6099
Automatic Changelog Update (#1612)
SimpleStation14 Jan 20, 2025
7d59d26
Modular Computers Part 2: Disk Burner (#1580)
Erisfiregamer1 Jan 20, 2025
821acb7
Automatic Changelog Update (#1580)
SimpleStation14 Jan 20, 2025
5f99c3f
add names and descriptions to envirosuits
angelofallars Jan 20, 2025
9a12e7b
Update CODEOWNERS (#1613)
sleepyyapril Jan 20, 2025
625ed0e
set proper masks for roles
angelofallars Jan 20, 2025
2818f34
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 20, 2025
3efead8
rename language back to Calcic
angelofallars Jan 20, 2025
9272f65
Mapping Mini-Wizmerge & New Central Command (#1610)
sleepyyapril Jan 20, 2025
4d627ef
Automatic Changelog Update (#1610)
SimpleStation14 Jan 20, 2025
82a26e2
Update Credits (#1594)
github-actions[bot] Jan 20, 2025
9a770e6
add tacticool drip for thieves and traitors
angelofallars Jan 20, 2025
6a9945a
Fix Fent Zombies in Medbay (#1614)
sleepyyapril Jan 20, 2025
1909b3f
Automatic Changelog Update (#1614)
SimpleStation14 Jan 20, 2025
780f113
make paradox anomalies spawn with conditional gear and loadouts
angelofallars Jan 20, 2025
44d918e
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 20, 2025
9326ec3
Make plasmemes exhale nitrogen
angelofallars Jan 20, 2025
907c495
remove unused plasma envirogloves sprite
angelofallars Jan 20, 2025
fc6d5f7
Add placeholder starting gear for dignitary jobs
angelofallars Jan 20, 2025
6dbaaec
fix NanoTrasen Representative conditional starting gear formatting
angelofallars Jan 20, 2025
3177990
add inhands for envirosuit
angelofallars Jan 20, 2025
76a90fd
adjust plasmaman life support crate
angelofallars Jan 20, 2025
c384d91
add plain envirohelm inhands
angelofallars Jan 20, 2025
fc7ecc4
Psionics Registry Computer, PsiWatch, and Epi-Glasses/Epi-HUD (#1598)
CerberusWolfie Jan 20, 2025
bcdc010
Automatic Changelog Update (#1598)
SimpleStation14 Jan 20, 2025
227fbbe
add colorable envirosuit and envirohelm for jobs
angelofallars Jan 20, 2025
995a537
add fire extinguisher icon to self-extinguish action
angelofallars Jan 20, 2025
a1d9e34
add some more stuff to the mix n match envirosuit
angelofallars Jan 20, 2025
3538f7e
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 20, 2025
cd321e1
add todo for zookeepers
angelofallars Jan 20, 2025
099a536
add zookeeper outfit + fix roboticist outfit sprite
angelofallars Jan 20, 2025
1a27cfd
add suit for martial artist
angelofallars Jan 20, 2025
9769f5c
add Logistics Officer outfit
angelofallars Jan 20, 2025
4c9ca6f
fix tacticool left sprite
angelofallars Jan 20, 2025
adc33c3
Update Redshirt Trait Description (#1616)
DEATHB4DEFEAT Jan 20, 2025
c9b629e
Automatic Changelog Update (#1616)
SimpleStation14 Jan 20, 2025
0963702
BSO Changes - Headset and MedTek (#1617)
CerberusWolfie Jan 20, 2025
ae74780
Automatic Changelog Update (#1617)
SimpleStation14 Jan 20, 2025
c887fff
Supermatter Fixes (#1618)
VMSolidus Jan 20, 2025
97c1408
Automatic Changelog Update (#1618)
SimpleStation14 Jan 20, 2025
7cb19e6
Show Puddles and Footsteps in Context Menu (#1620)
sleepyyapril Jan 20, 2025
9a34920
Automatic Changelog Update (#1620)
SimpleStation14 Jan 20, 2025
34b55e1
Newtonian Singularity (#1619)
VMSolidus Jan 21, 2025
e3b5161
Automatic Changelog Update (#1619)
SimpleStation14 Jan 21, 2025
611cc19
Yet Another "OnPlayerSpawn" Crash Fix Attempt (#1621)
VMSolidus Jan 21, 2025
d5866a6
Use System (#1622)
sleepyyapril Jan 21, 2025
c62e620
Add plasma light
angelofallars Jan 21, 2025
89e8de3
Kill Mana (#1623)
sleepyyapril Jan 21, 2025
ef2587e
Automatic Changelog Update (#1623)
SimpleStation14 Jan 21, 2025
bd5bf23
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 21, 2025
c7784ce
Only Use Roundstart Species for RandomHumanoid (#1624)
sleepyyapril Jan 21, 2025
881ae3b
Update MacOS Logo (#1625)
stellar-novas Jan 21, 2025
9fffd87
add a skubton of new clothes options
angelofallars Jan 21, 2025
ced0851
integrate Plasmafire Punch into base plasmeme, remove plasmaman melee…
angelofallars Jan 21, 2025
e337abb
Revert "Update MacOS Logo (#1625)" (#1628)
sleepyyapril Jan 21, 2025
3913285
update melee audio and visuals
angelofallars Jan 21, 2025
14f7683
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 21, 2025
01d1ec4
Gladiabot (#1548)
Timfa2112 Jan 21, 2025
38ed18e
Automatic Changelog Update (#1548)
SimpleStation14 Jan 21, 2025
3cd0d58
add blueshield officer envirosuit
angelofallars Jan 21, 2025
d1a7ce9
add Heat to Martial Artist multipliers
angelofallars Jan 21, 2025
cb70e2a
fix blueshield envirosuit name
angelofallars Jan 21, 2025
b824d70
technicolor plasmamen real
angelofallars Jan 21, 2025
825abd6
add fixed sensors to prisoner envirosuit
angelofallars Jan 21, 2025
1b6c061
Update MacOS Logo (#1629)
stellar-novas Jan 21, 2025
16f63d7
add self-extinguisher refill + start loadouts setup for plasmamen
angelofallars Jan 21, 2025
c6b9ec5
increase odds of rolling 101-500 roman last name && slightly decrease…
angelofallars Jan 21, 2025
2c95329
Loadouts Item Failed to Spawn Check (#1630)
sleepyyapril Jan 22, 2025
9d99ac2
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 22, 2025
49dd8ca
add glowing visors on all envirohelms
angelofallars Jan 22, 2025
2eae7f4
add more bloat to custm envirohelms and envirosuits
angelofallars Jan 22, 2025
e1fcab4
fix salvage envirohelm light and hide hair/facial hair on plasmemes
angelofallars Jan 22, 2025
900e54b
add stuff lets do an experiment
angelofallars Jan 22, 2025
f3e3f5d
add outfits for corpsman, prison guard, gladiator, update plasmeme so…
angelofallars Jan 22, 2025
540fd92
add outfit for NanoTrasen Representative
angelofallars Jan 22, 2025
b43b183
increase cost of extra plasma tank
angelofallars Jan 22, 2025
a5507f3
add magistrate envirosuit
angelofallars Jan 22, 2025
794890a
update sprites for corpsman and prison guard
angelofallars Jan 22, 2025
288e1f7
update mystagogue outfit
angelofallars Jan 22, 2025
12d99c9
add grey assistant envirosuit and add a ton of generic envirosuits to…
angelofallars Jan 22, 2025
1fed2ea
add a bunch of colored envirosuits to loadouts
angelofallars Jan 22, 2025
c31f40f
make some plasmeme items into heirlooms
angelofallars Jan 22, 2025
edd5f02
add reporter envirogloves
angelofallars Jan 22, 2025
616226d
make plasmeme envirohelms battery-powered
angelofallars Jan 22, 2025
f8b72ac
rework plasmaman organ harvesting
angelofallars Jan 22, 2025
3e715e9
Add flavor profile for eating plasmaman organs
angelofallars Jan 22, 2025
4c0529c
Harpy Displacement Map (#1633)
VMSolidus Jan 22, 2025
bbddbf8
Automatic Changelog Update (#1633)
SimpleStation14 Jan 22, 2025
140e461
Engine Update v240.1.3 (#1634)
sleepyyapril Jan 22, 2025
26f20e3
v240.1.2 (#1636)
sleepyyapril Jan 22, 2025
3d9ac9b
Hotfix AI Being Eaten by Singulo (#1637)
sleepyyapril Jan 22, 2025
e3003b6
Goob Mechs (#1611)
sleepyyapril Jan 23, 2025
7dc8252
Automatic Changelog Update (#1611)
SimpleStation14 Jan 23, 2025
46c8540
Fix Gun Contests (#1638)
sleepyyapril Jan 23, 2025
e0f07e1
Fix RoundLevel Test Fail (#1635)
sleepyyapril Jan 23, 2025
07fb6bc
Player Customization (#1626)
sleepyyapril Jan 23, 2025
fd7793e
Remove Gamerule Count Test (#1639)
sleepyyapril Jan 23, 2025
193565c
Automatic Changelog Update (#1626)
SimpleStation14 Jan 23, 2025
1aa7619
Adds Veterancy Weapons to Sec, Removes Ion (Broken), Fixes Cutlass Sp…
BlueHNT Jan 23, 2025
9816bd2
Automatic Changelog Update (#1599)
SimpleStation14 Jan 23, 2025
0f9a795
Box Station For EE (#1615)
Mike32oz Jan 23, 2025
ade647d
Automatic Changelog Update (#1615)
SimpleStation14 Jan 23, 2025
09d438d
Add MathNet.Numerics To The Project (#1641)
VMSolidus Jan 23, 2025
570f371
Automatic Changelog Update (#1641)
SimpleStation14 Jan 23, 2025
e1afb1d
Update SupermatterSystem.Processing.cs (#1642)
VMSolidus Jan 23, 2025
8e4fc9d
MathNet.Numerics Apparently Needed To Be In Server And Client Too (#1…
VMSolidus Jan 23, 2025
e3b1c08
adjust equip/unequip delays, make immune to bloodloss
angelofallars Jan 23, 2025
cf0c781
add different helm battery/extinguisher charges per job
angelofallars Jan 23, 2025
a3b9307
update prisoner envirosuit to be more accurate to prisoner jumpsuit
angelofallars Jan 23, 2025
b6004c5
Merge remote-tracking branch 'origin/master' into plasmaman
angelofallars Jan 23, 2025
e0bcd91
Use Del to instantly delete extinguisher refill on refill
angelofallars Jan 23, 2025
72de70c
add sound effect for extinguisher refill
angelofallars Jan 23, 2025
c41b492
add blue flash animation for self-extinguish
angelofallars Jan 23, 2025
da695ce
remove stray file
angelofallars Jan 23, 2025
460774c
add icon for self-extinguish verb
angelofallars Jan 23, 2025
5c8a559
convert conditionalStartingGear to `StartingGearPrototype.SubGears`
angelofallars Jan 23, 2025
527c96f
add starting gear to all possible ghost roles (I think)
angelofallars Jan 24, 2025
0c3af43
add some todos
angelofallars Jan 24, 2025
c8198d5
remove unused font definitions
angelofallars Jan 24, 2025
a2206de
Make librarian suit available to all + update descriptions to upperca…
angelofallars Jan 24, 2025
c3624f7
fix YAML stuff
angelofallars Jan 24, 2025
d5f6b19
fix more funny yaml test fails
angelofallars Jan 24, 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.
5 changes: 3 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
set -e
if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
fi
use nix
use nix
98 changes: 96 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,97 @@
# Last match in file takes precedence.
# hasn't specified or all
* @sleepyyapril @VMSolidus @Remuchi

# TODO
/.* @DEATHB4DEFEAT
*.sln @DEATHB4DEFEAT
*.csproj @DEATHB4DEFEAT
*.dotsettings @DEATHB4DEFEAT
*.DotSettings @DEATHB4DEFEAT
*.toml @DEATHB4DEFEAT
/Content.*/IoC @DEATHB4DEFEAT


# Nix
*.nix @DEATHB4DEFEAT @stellar-novas
/flake.lock @DEATHB4DEFEAT @stellar-novas
/.envrc @DEATHB4DEFEAT @stellar-novas


# UI
*.xaml @DEATHB4DEFEAT
*.xaml.cs @DEATHB4DEFEAT

# Lobby
/Content.Client/Lobby @DEATHB4DEFEAT
/Content.Client/MainMenu @DEATHB4DEFEAT

# Queue
/Content.*/DiscordAuth @DEATHB4DEFEAT
/Content.*/JoinQueue @DEATHB4DEFEAT


# Writing
*.xml @DEATHB4DEFEAT
*.ftl @DEATHB4DEFEAT
*.md @DEATHB4DEFEAT
*.txt @DEATHB4DEFEAT

# Shaders
*.swsl @DEATHB4DEFEAT
/Resources/Prototypes/Shaders @DEATHB4DEFEAT

# Overlays
/Content.Client/Overlays @DEATHB4DEFEAT

# Paint
/Content.*/Paint @DEATHB4DEFEAT


# Parkstation/etc
**/SimpleStation14 @DEATHB4DEFEAT
**/Parkstation @DEATHB4DEFEAT

# Announcer system
/Content.*/Announcements @DEATHB4DEFEAT
/Content.Server/StationEvents @DEATHB4DEFEAT

# SSD
/Content.*/SSDIndicator @DEATHB4DEFEAT

# Station Goals
/Content.Server/StationGoal @DEATHB4DEFEAT

# Random Bark
/Content.Server/Speech/Components/RandomBarkComponent.cs @DEATHB4DEFEAT
/Content.Server/Speech/Systems/RandomBarkSystem.cs @DEATHB4DEFEAT
/Resources/Locale/en-US/random-barks @DEATHB4DEFEAT

# Punpun
/Content.Server/Punpun @DEATHB4DEFEAT


# Database
/Content.*/Database @DEATHB4DEFEAT
/Content.*/.Database @DEATHB4DEFEAT

# Preferences
/Content.*/Preferences @DEATHB4DEFEAT
**/*CVar*/*.cs @DEATHB4DEFEAT

# Discord
/Content.*/Discord* @DEATHB4DEFEAT

# Loadouts
/Resources/Prototypes/Loadouts @angelofallars
/Resources/Prototypes/CharacterItemGroups @angelofallars
/Resources/Locale/en-US/loadouts @angelofallars

# Traits
/Resources/Prototypes/Traits @angelofallars
/Resources/Locale/en-US/traits @angelofallars

# Throwing
/Content.*/DamageOtherOnHit @angelofallars
/Content.*/Embed @angelofallars
/Content.*/ProjectileSystem @angelofallars
/Content.*/ThrownItem @angelofallars
/Content.*/ThrowEvent @angelofallars
2 changes: 1 addition & 1 deletion .github/workflows/build-docfx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-map-renderer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-test-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand All @@ -51,7 +51,7 @@ jobs:
shell: pwsh
run: |
$env:DOTNET_gcServer=1
dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
ci-success:
name: Build & Test Debug
needs:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/no-submodule-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
this_aint_right:
if: github.actor != 'sleepyyapril' && github.actor != 'VMSolidus' && github.actor != 'DEATHB4DEFEAT'
name: Submodule update in pr found
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Get Engine Tag
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.100
dotnet-version: 9.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion Content.Client/Actions/ActionsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public void LoadActionAssignments(string path, bool userData)
continue;

var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
var actionId = Spawn(null);
var actionId = Spawn();
AddComp(actionId, action);
AddActionDirect(user, actionId);

Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public BanPanel()
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
foreach (var proto in prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
{
CreateRoleGroup(proto.ID, proto.Roles, proto.Color);
CreateRoleGroup(proto.ID, proto.Roles.Select(p => p.Id), proto.Color);
}

CreateRoleGroup("Antagonist", prototypeManager.EnumeratePrototypes<AntagPrototype>().Select(p => p.ID), Color.Red);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<cc:UICommandButton Command="callshuttle" Text="{Loc admin-player-actions-window-shuttle}" WindowType="{x:Type at:AdminShuttleWindow}"/>
<cc:CommandButton Command="adminlogs" Text="{Loc admin-player-actions-window-admin-logs}"/>
<cc:CommandButton Command="faxui" Text="{Loc admin-player-actions-window-admin-fax}"/>
<cc:CommandButton Command="timetransferpanel" Text="{Loc admin-player-actions-window-time-transfer}"/>
</GridContainer>
</BoxContainer>
</Control>
22 changes: 3 additions & 19 deletions Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,6 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
[AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state",
};

private Dictionary<Gas, string> _gasShorthands = new Dictionary<Gas, string>()
{
[Gas.Ammonia] = "NH₃",
[Gas.CarbonDioxide] = "CO₂",
[Gas.Frezon] = "F",
[Gas.Nitrogen] = "N₂",
[Gas.NitrousOxide] = "N₂O",
[Gas.Oxygen] = "O₂",
[Gas.Plasma] = "P",
[Gas.Tritium] = "T",
[Gas.WaterVapor] = "H₂O",
};

public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
{
RobustXamlLoader.Load(this);
Expand Down Expand Up @@ -160,15 +147,12 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
// Add an entry for each gas
foreach ((var gas, (var mol, var percent, var alert)) in gasData)
{
var gasPercent = (FixedPoint2)0f;
gasPercent = percent * 100f;

if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
gasShorthand = "X";
FixedPoint2 gasPercent = percent * 100f;
var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));

var gasLabel = new Label()
{
Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
FontOverride = normalFont,
FontColorOverride = GetAlarmStateColor(alert),
HorizontalAlignment = HAlignment.Center,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using Content.Shared.Atmos.Components;

namespace Content.Client.Atmos.Consoles;

public sealed class AtmosMonitoringConsoleBoundUserInterface : BoundUserInterface
{
[ViewVariables]
private AtmosMonitoringConsoleWindow? _menu;

public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }

protected override void Open()
{
base.Open();

_menu = new AtmosMonitoringConsoleWindow(this, Owner);
_menu.OpenCentered();
_menu.OnClose += Close;
}

protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);

if (state is not AtmosMonitoringConsoleBoundInterfaceState castState)
return;

EntMan.TryGetComponent<TransformComponent>(Owner, out var xform);
_menu?.UpdateUI(xform?.Coordinates, castState.AtmosNetworks);
}

protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
if (!disposing)
return;

_menu?.Dispose();
}
}
Loading
Loading