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

Upstream merge 28 jan #794

Open
wants to merge 2,444 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
2444 commits
Select commit Hold shift + click to select a range
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
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
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
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
3928065
Fix verb sub (#30667)
metalgearsloth Aug 5, 2024
fe86c83
Hotfix Verbs (#1597)
VMSolidus Jan 19, 2025
7c5c4ba
Fix Hissing & Another Airlock Error (#1596)
sleepyyapril Jan 19, 2025
09b5c3e
Update miningrock.yml (#1595)
VMSolidus 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
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
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
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
9a12e7b
Update CODEOWNERS (#1613)
sleepyyapril 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
6a9945a
Fix Fent Zombies in Medbay (#1614)
sleepyyapril Jan 20, 2025
1909b3f
Automatic Changelog Update (#1614)
SimpleStation14 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
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
89e8de3
Kill Mana (#1623)
sleepyyapril Jan 21, 2025
ef2587e
Automatic Changelog Update (#1623)
SimpleStation14 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
e337abb
Revert "Update MacOS Logo (#1625)" (#1628)
sleepyyapril Jan 21, 2025
01d1ec4
Gladiabot (#1548)
Timfa2112 Jan 21, 2025
38ed18e
Automatic Changelog Update (#1548)
SimpleStation14 Jan 21, 2025
1b6c061
Update MacOS Logo (#1629)
stellar-novas Jan 21, 2025
2c95329
Loadouts Item Failed to Spawn Check (#1630)
sleepyyapril 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
1ef0bd0
Better Progress Bar (#1648)
DocNITE Jan 24, 2025
28bc799
Removes Asphyxiation From Lamia in Favor of Pierce/Poison (#1645)
BlueHNT Jan 24, 2025
4b3c94f
Automatic Changelog Update (#1645)
SimpleStation14 Jan 24, 2025
011365f
Change Time Requirements for Command Positions & Mystagogue (#1649)
CerberusWolfie Jan 25, 2025
f52864c
Automatic Changelog Update (#1649)
SimpleStation14 Jan 25, 2025
0e309db
HideSpawnMenu Harpy Dummy (#1651)
Aidenkrz Jan 25, 2025
f88f206
Port Stunbot and Disablerbot From Floofstation PR (#1631)
Timfa2112 Jan 25, 2025
f81925a
Automatic Changelog Update (#1631)
SimpleStation14 Jan 25, 2025
cb06c41
MODsuits (Port From Goob #1242) (#1640)
Erisfiregamer1 Jan 25, 2025
805aba7
Automatic Changelog Update (#1640)
SimpleStation14 Jan 25, 2025
35c26cf
ChemMaster Improvements (#1650)
sleepyyapril Jan 25, 2025
54a88cd
Automatic Changelog Update (#1650)
SimpleStation14 Jan 25, 2025
6fbb3b7
Hardsuits Fire Protection (#1445)
VMSolidus Jan 25, 2025
001f48e
Automatic Changelog Update (#1445)
SimpleStation14 Jan 25, 2025
9b5cce2
[Port] Playing Cards (#1451)
RadsammyT Jan 25, 2025
dc7e2dd
Automatic Changelog Update (#1451)
SimpleStation14 Jan 25, 2025
3417f35
Try Fix Loadouts, Again (#1652)
sleepyyapril Jan 25, 2025
ce310bb
Chitinid (From Delta-V) (#1644)
sleepyyapril Jan 25, 2025
37b0fcc
Automatic Changelog Update (#1644)
SimpleStation14 Jan 25, 2025
f592d4c
Change "Kill" To "Teach a Lesson" (#1654)
sleepyyapril Jan 25, 2025
3897f4c
Automatic Changelog Update (#1654)
SimpleStation14 Jan 25, 2025
1c28a1c
Fix Melee Attack Speed Again (#1653)
VMSolidus Jan 25, 2025
8c6f1a4
Automatic Changelog Update (#1653)
SimpleStation14 Jan 25, 2025
e68e0c3
New Species: Plasmaman (#1291)
angelofallars Jan 25, 2025
9353794
Automatic Changelog Update (#1291)
SimpleStation14 Jan 25, 2025
53aaba2
Don't Assume Sessions Are Real (#1655)
VMSolidus Jan 25, 2025
8eafa7a
Hotfix for Disk Burner Examine (#1656)
Erisfiregamer1 Jan 25, 2025
f325d2e
Better Teach Lesson Code (#1657)
VMSolidus Jan 26, 2025
b7660b9
Tajara (#1647)
SX-7 Jan 26, 2025
c721646
Automatic Changelog Update (#1647)
SimpleStation14 Jan 26, 2025
91d14ac
Markings Port Wave 1 (#1658)
angelofallars Jan 26, 2025
e7524df
Automatic Changelog Update (#1658)
SimpleStation14 Jan 26, 2025
908bb49
Remove Almost All Default Playtime Requirements (#1660)
VMSolidus Jan 26, 2025
e2e4f8c
Automatic Changelog Update (#1660)
SimpleStation14 Jan 26, 2025
578fca1
Fix Missing Chat Language Localization (#1662)
sleepyyapril Jan 26, 2025
c640b0f
Micro Tajara Guidebook Text Fixes/ Bugfixes (#1664)
SX-7 Jan 26, 2025
eec674c
Automatic Changelog Update (#1664)
SimpleStation14 Jan 26, 2025
031a102
Glass Cannon Shadowkin (#1531)
SixplyDev Jan 26, 2025
9a0c6b2
Hotfix ChemMaster (#1663)
sleepyyapril Jan 26, 2025
7ea5ae0
Automatic Changelog Update (#1663)
SimpleStation14 Jan 26, 2025
0a2ace1
Make Markings Less Hell + Chitinid Hotfix (#1661)
sleepyyapril Jan 26, 2025
af62f69
Fix Chemmaster Two (#1667)
sleepyyapril Jan 26, 2025
84c9f16
Update Credits (#1659)
github-actions[bot] Jan 26, 2025
fd8c854
Mantis Violence Update (#1669)
SixplyDev Jan 27, 2025
dc72bc1
Automatic Changelog Update (#1669)
SimpleStation14 Jan 27, 2025
dac0f4d
Blueshield CPR Update (#1672)
SixplyDev Jan 27, 2025
e6dae90
Fix Jobs only Allowing Shadowkin by Accident (#1673)
sleepyyapril Jan 27, 2025
7b0f200
Automatic Changelog Update (#1672)
SimpleStation14 Jan 27, 2025
c57f3a0
Automatic Changelog Update (#1673)
SimpleStation14 Jan 27, 2025
a2c2fc0
Erm.... No More Foreigner Trait Head Roles !!!!!!!!! (#1670)
SixplyDev Jan 27, 2025
3607de2
Automatic Changelog Update (#1670)
SimpleStation14 Jan 27, 2025
e9036ff
Plasmaman Hotfix + Other Fixes (#1676)
angelofallars Jan 27, 2025
2902418
Automatic Changelog Update (#1676)
SimpleStation14 Jan 27, 2025
0b4ceb2
Ghost Bar!!!! (From Goobstation) (#1675)
angelofallars Jan 28, 2025
2b6f898
Automatic Changelog Update (#1675)
SimpleStation14 Jan 28, 2025
7d345cf
Display the Current Version in the Changelog Window (#34556) (#1678)
sleepyyapril Jan 28, 2025
272f077
Merge remote-tracking branch 'EE/master' into upstream_merge_24-jan
Peptide90 Jan 28, 2025
b6f0ad3
Merge remote-tracking branch 'EE/master' into upstream_merge_24-jan
Peptide90 Jan 28, 2025
64f08a6
more changes
Peptide90 Jan 28, 2025
695f476
Allow Cloning Living People (#1679)
angelofallars Jan 28, 2025
aaadc3b
Automatic Changelog Update (#1679)
SimpleStation14 Jan 28, 2025
ded3aaa
New BSO Armors/Outfits (#1682)
SixplyDev Jan 29, 2025
2419a62
Automatic Changelog Update (#1682)
SimpleStation14 Jan 29, 2025
cc36c01
Fix Plasmaman Temperature Perma-Slow (#1681)
angelofallars Jan 29, 2025
78e9694
Automatic Changelog Update (#1681)
SimpleStation14 Jan 29, 2025
ee9802c
Fix Rsi Diff Bot Detecting Spaces in File Names (#1683)
Peptide90 Jan 29, 2025
d58c83d
New Solar Sprites, New Solar Panel Upgrades, and some Solar Panel Fix…
sleepyyapril Jan 30, 2025
ebbada9
Automatic Changelog Update (#1677)
SimpleStation14 Jan 30, 2025
87eb664
Mind Over Machine, Machine Over Mind (#1665)
VMSolidus Jan 30, 2025
3f741b5
Automatic Changelog Update (#1665)
SimpleStation14 Jan 30, 2025
1028870
Psionics Registry Meta/Box (#1687)
Mike32oz Jan 30, 2025
09a3f6c
Automatic Changelog Update (#1687)
SimpleStation14 Jan 30, 2025
f8b64a5
Better AI Holo (#1680)
Ichaie Jan 30, 2025
fb87ff1
Automatic Changelog Update (#1680)
SimpleStation14 Jan 30, 2025
031a6c8
New Unpainted Hardsuits (#1692)
VMSolidus Jan 31, 2025
65362e5
Automatic Changelog Update (#1692)
SimpleStation14 Jan 31, 2025
641b99d
Update GlimmerSystem.cs (#1694)
VMSolidus Jan 31, 2025
e253355
Automatic Changelog Update (#1694)
SimpleStation14 Jan 31, 2025
5e201e6
Update GlimmerSystem.cs (#1695)
VMSolidus Feb 1, 2025
cdf8468
Hardsuit Walking Sounds And Refactor EmitSoundOnMove (#1698)
VMSolidus Feb 1, 2025
b7b7d1c
Automatic Changelog Update (#1698)
SimpleStation14 Feb 1, 2025
ed1bdb3
Holopad Context Menu Fix (#1699)
dootythefrooty Feb 1, 2025
481f5d1
Automatic Changelog Update (#1699)
SimpleStation14 Feb 1, 2025
a4fee27
Webbing Sound Effects (#1701)
VMSolidus Feb 2, 2025
f82c10e
Automatic Changelog Update (#1701)
SimpleStation14 Feb 2, 2025
b9a3b6c
MISSING HARPY EMOTES (#1707)
VMSolidus Feb 3, 2025
fcad75d
Remove Barotrauma Gibbing You Instantly. (#1708)
VMSolidus Feb 3, 2025
72a6735
Automatic Changelog Update (#1708)
SimpleStation14 Feb 3, 2025
428c83d
Fix Standard Cloners Not Transferring Appearance (#1709)
VMSolidus Feb 3, 2025
94ee4a2
Automatic Changelog Update (#1709)
SimpleStation14 Feb 3, 2025
9c97001
Make Hardsuits Not Destroy Ears (#1710)
VMSolidus Feb 3, 2025
7d8b61c
Automatic Changelog Update (#1710)
SimpleStation14 Feb 3, 2025
6aa5cbf
Merge remote-tracking branch 'EE/master' into upstream_merge_28-jan
Peptide90 Feb 3, 2025
aba626c
Merge branch 'master' into upstream_merge_28-jan
VMSolidus Feb 12, 2025
b559c33
Update SharedHandheldRadio.cs
VMSolidus Feb 12, 2025
6ec67f0
Fun
VMSolidus Feb 12, 2025
68828e3
Delete ShadowShacklesAuraComponent.cs
VMSolidus Feb 12, 2025
b97d19e
Mana was YEETED
VMSolidus Feb 12, 2025
43025f2
The entire N14 Nightvision folder going away because this is now enti…
VMSolidus Feb 12, 2025
3fe50d7
Why are there so many leftover server components that were moved to s…
VMSolidus Feb 12, 2025
548766c
Update gasmasks.yml
VMSolidus Feb 12, 2025
b9dec44
Update gasmasks.yml
VMSolidus Feb 12, 2025
ab6401c
OH MY GOOOOOOOOOOOOOOOOOOOOD
VMSolidus Feb 12, 2025
66c3829
This is nonsense
VMSolidus Feb 12, 2025
599981f
Update radio_channels.yml
VMSolidus Feb 12, 2025
9efa0be
Update radio_channels.yml
VMSolidus Feb 12, 2025
79549fe
Update head_of_personnel.yml
VMSolidus Feb 12, 2025
ea7f713
fix all yaml linter and locale errors
Peptide90 Feb 19, 2025
7ba4617
The Fashion Update (#1526)
Peptide90 Feb 19, 2025
38bfedf
Psionics Registry Computer, PsiWatch, and Epi-Glasses/Epi-HUD (#1598)
Peptide90 Feb 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Jobs only Allowing Shadowkin by Accident (#1673)
🆑
- fix: Other species can pick Cataloguer, Psionic Mantis, and Mystagogue
again.
  • Loading branch information
sleepyyapril authored Jan 27, 2025
commit e6dae9047f8b1dcf4467cac968e0c9a1ddb52ddb
Original file line number Diff line number Diff line change
@@ -22,11 +22,6 @@
inverted: true
traits:
- Pacifist
- !type:CharacterLogicOrRequirement
requirements:
- !type:CharacterSpeciesRequirement
species:
- Shadowkin
- !type:CharacterTraitRequirement
inverted: true
traits:
13 changes: 4 additions & 9 deletions Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
Original file line number Diff line number Diff line change
@@ -16,15 +16,10 @@
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
- !type:CharacterLogicOrRequirement
requirements:
- !type:CharacterSpeciesRequirement
species:
- Shadowkin
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
startingGear: LibrarianGear
icon: "JobIconLibrarian"
supervisors: job-supervisors-rd
13 changes: 4 additions & 9 deletions Resources/Prototypes/Roles/Jobs/Science/research_director.yml
Original file line number Diff line number Diff line change
@@ -14,15 +14,10 @@
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
- !type:CharacterLogicOrRequirement
requirements:
- !type:CharacterSpeciesRequirement
species:
- Shadowkin
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
weight: 10
startingGear: ResearchDirectorGear
icon: "JobIconResearchDirector"