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

Updated psionics import #1

Closed
wants to merge 2,696 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
2696 commits
Select commit Hold shift + click to select a range
8fce1cf
Automatic Changelog (#840)
FrontierATC Jan 27, 2024
557bd28
Latejoin spawnpoint on Bazaar (#929)
TsjipTsjip Jan 27, 2024
ab059d7
Jobslots patches (#935)
TsjipTsjip Jan 28, 2024
52e9d7c
Mail Truck (Update) (#920)
ErhardSteinhauer Jan 28, 2024
aeb681e
Automatic Changelog (#920)
FrontierATC Jan 28, 2024
79f9ee6
Mission (Update) (#925)
ErhardSteinhauer Jan 28, 2024
7b49f73
Automatic Changelog (#925)
FrontierATC Jan 28, 2024
cbb1f92
Biomass experiment (#936)
TsjipTsjip Jan 28, 2024
555e6ac
Automatic Changelog (#936)
FrontierATC Jan 28, 2024
dd6929d
Remove insurance form (#937)
TsjipTsjip Jan 28, 2024
39d8d19
Bocadillo (Update) (#918)
ErhardSteinhauer Jan 28, 2024
1c1ce05
Automatic Changelog (#918)
FrontierATC Jan 28, 2024
90842e6
Liquidator (Update) (#895)
ErhardSteinhauer Jan 28, 2024
b571c19
Automatic Changelog (#895)
FrontierATC Jan 28, 2024
32236c8
NC Barge Update (#919)
ErhardSteinhauer Jan 28, 2024
2db3fee
Automatic Changelog (#919)
FrontierATC Jan 28, 2024
ffebbae
Empress (Update) (#909)
TsjipTsjip Jan 28, 2024
53556d3
Prospector (Update) (#934)
ErhardSteinhauer Jan 28, 2024
c2490b0
Automatic Changelog (#934)
FrontierATC Jan 28, 2024
8e60411
Garden (Update) (#913)
ErhardSteinhauer Jan 28, 2024
79699d6
Automatic Changelog (#913)
FrontierATC Jan 28, 2024
8c96403
Merge branch 'master' into january-vanilla-upstream-merge
dvir001 Jan 28, 2024
c0a16c4
Update jobs.yml (#939)
dvir001 Jan 28, 2024
3fe2005
Hospitaller (Update) (#910)
TsjipTsjip Jan 29, 2024
a68059b
Tabletop Consoles Fix (#943)
ErhardSteinhauer Jan 29, 2024
a7fcc6f
Automatic Changelog (#943)
FrontierATC Jan 29, 2024
5e9a617
Suit Wallstorage Unit Fix (Maybe) (#942)
ErhardSteinhauer Jan 29, 2024
6934082
Automatic Changelog (#942)
FrontierATC Jan 29, 2024
cca7dfb
Bulker (Update) (#914)
ErhardSteinhauer Jan 29, 2024
213d4f6
Automatic Changelog (#914)
FrontierATC Jan 29, 2024
58264ba
Patches (#945)
TsjipTsjip Jan 29, 2024
d3747fa
WaveShot (Update) (#944)
ErhardSteinhauer Jan 29, 2024
f7d6134
Automatic Changelog (#944)
FrontierATC Jan 29, 2024
a063a39
Cargo Cleanup (#941)
dvir001 Jan 29, 2024
7d70835
Automatic Changelog (#941)
FrontierATC Jan 29, 2024
d8d3b99
Kestrel (Update) (#946)
ErhardSteinhauer Jan 29, 2024
f9b5422
Automatic Changelog (#946)
FrontierATC Jan 29, 2024
f41093d
Guardians code tweaks (#927)
dvir001 Jan 29, 2024
8607ba4
Factorio Magnet Refactor (#899)
dvir001 Jan 29, 2024
766b725
Automatic Changelog (#899)
FrontierATC Jan 29, 2024
cdc595d
Diona Tags Fix (#868)
dvir001 Jan 29, 2024
cf8e3e5
Added Cyborg Charging Station & Cell Charger Machine Boards to Fronti…
wafehling Jan 29, 2024
cae106c
Fix Plants Protos (#928)
dvir001 Jan 29, 2024
16ce89b
Adjust prices (#947)
TsjipTsjip Jan 29, 2024
f60f138
Crescent (Update) (#915)
ErhardSteinhauer Jan 29, 2024
4004121
Automatic Changelog (#915)
FrontierATC Jan 29, 2024
0bf5fb9
Esquire (Update) (#951)
ErhardSteinhauer Jan 30, 2024
f3f3594
Automatic Changelog (#951)
FrontierATC Jan 30, 2024
b3ae69a
Praeda (Update) (#950)
ErhardSteinhauer Jan 30, 2024
6166366
Automatic Changelog (#950)
FrontierATC Jan 30, 2024
79fa146
Skipper (Update) (#949)
ErhardSteinhauer Jan 30, 2024
8426f6c
Automatic Changelog (#949)
FrontierATC Jan 30, 2024
226a39b
Rosebud Mk I (Update) (#948)
ErhardSteinhauer Jan 30, 2024
0152eda
Automatic Changelog (#948)
FrontierATC Jan 30, 2024
609b73c
Inquisitor (Update) (#911)
TsjipTsjip Jan 30, 2024
7920419
PTS (Update) (#924)
ErhardSteinhauer Jan 30, 2024
07a3439
Automatic Changelog (#924)
FrontierATC Jan 30, 2024
c4cc5a7
Pathfinder (Update) (#926)
ErhardSteinhauer Jan 30, 2024
32504b7
Automatic Changelog (#926)
FrontierATC Jan 30, 2024
aaa2d44
Nugget (Update) (#954)
ErhardSteinhauer Jan 30, 2024
70507c3
Automatic Changelog (#954)
FrontierATC Jan 30, 2024
dbc7121
RSI Cleanup (#958)
dvir001 Jan 30, 2024
6258084
Merge branch 'master' into january-vanilla-upstream-merge
dvir001 Jan 31, 2024
6f45fb6
Fixes (#952)
Mnemotechnician Jan 31, 2024
3b448bf
Automatic Changelog (#952)
FrontierATC Jan 31, 2024
2329f00
Pilot Drip Update (#960)
ErhardSteinhauer Jan 31, 2024
adf1179
Automatic Changelog (#960)
FrontierATC Jan 31, 2024
eeced1a
fryer system update
Cheackraze Feb 1, 2024
c4925c1
fryer CI fix
Cheackraze Feb 1, 2024
6590299
yml cleanup
Cheackraze Feb 1, 2024
3bd56c9
Avoid errors with this one line later
dvir001 Feb 1, 2024
972d552
salvage reversion
Cheackraze Feb 1, 2024
d508583
Merge remote-tracking branch 'origin/january-vanilla-upstream-merge' …
Cheackraze Feb 1, 2024
a537fd2
EEEE (#966)
TsjipTsjip Feb 2, 2024
49a178f
Automatic Changelog (#966)
FrontierATC Feb 2, 2024
c969b30
storage yml work
Cheackraze Feb 2, 2024
fbf82e3
more yml fixups
Cheackraze Feb 2, 2024
2b1d755
Pulse (Update) (#956)
ErhardSteinhauer Feb 2, 2024
0c03a10
Helix (Update) (#953)
ErhardSteinhauer Feb 2, 2024
afc0635
Automatic Changelog (#956)
FrontierATC Feb 2, 2024
8fbe472
Automatic Changelog (#953)
FrontierATC Feb 2, 2024
3ec6eed
rsi fixes and vending machine fix
Cheackraze Feb 2, 2024
b55fa9e
Revert "kill machine parts + migrate machine part spawners to salvage…
Cheackraze Feb 2, 2024
70f514a
re-implement more machine upgrades
Cheackraze Feb 2, 2024
fb3fd8b
Sparrow (Update) (#955)
ErhardSteinhauer Feb 2, 2024
c572e62
Automatic Changelog (#955)
FrontierATC Feb 2, 2024
0f150bf
McCargo (Update) (#940)
dvir001 Feb 3, 2024
eeced0a
RSI Errors
dvir001 Feb 3, 2024
232f70b
Merge branch 'january-vanilla-upstream-merge' of https://github.com/n…
dvir001 Feb 3, 2024
606a65d
Update armor.yml
dvir001 Feb 3, 2024
cb8e1b1
Sparrow
dvir001 Feb 3, 2024
3fd16f8
Merge branch 'master' into january-vanilla-upstream-merge
dvir001 Feb 3, 2024
7d0c428
RSI Please work
dvir001 Feb 3, 2024
cf19480
Update generators.yml
dvir001 Feb 3, 2024
6921710
Not the issue but still was spiting errors on YAML tester.
dvir001 Feb 3, 2024
d149751
ccv
dvir001 Feb 3, 2024
853be3a
Shuttle Generators (#846)
dvir001 Feb 3, 2024
457384c
Tabletop Computers Fix (#971)
dvir001 Feb 3, 2024
2d6c320
Clown&Mime (#965)
dvir001 Feb 3, 2024
4163300
Automatic Changelog (#965)
FrontierATC Feb 3, 2024
1563c47
Small (#931)
dvir001 Feb 3, 2024
6da3e15
Automatic Changelog (#931)
FrontierATC Feb 3, 2024
d554894
Emotional Hats For Emotional Cats (#959)
dvir001 Feb 3, 2024
9faa343
Automatic Changelog (#959)
FrontierATC Feb 3, 2024
b6fae8e
POI and Outpost
dvir001 Feb 3, 2024
8ae82b4
YML Cleanup (#968)
dvir001 Feb 3, 2024
e338f65
Tickets Machine Cleanup (#970)
dvir001 Feb 3, 2024
da83d1a
Merge branch 'master' into january-vanilla-upstream-merge
dvir001 Feb 3, 2024
2d8c634
ForensicInVends (#963)
dvir001 Feb 3, 2024
7e4d07c
Automatic Changelog (#963)
FrontierATC Feb 3, 2024
11b7784
Merge branch 'master' into january-vanilla-upstream-merge
dvir001 Feb 3, 2024
263bdb6
toys yml
dvir001 Feb 3, 2024
4c62999
This broke somehow with upstream change
dvir001 Feb 3, 2024
6bb9fe4
events maps
dvir001 Feb 3, 2024
67ade90
Update barge.yml
dvir001 Feb 3, 2024
a156129
#829
dvir001 Feb 4, 2024
f5568e1
fix the linter
Cheackraze Feb 4, 2024
bc5e23f
Merge remote-tracking branch 'origin/january-vanilla-upstream-merge' …
Cheackraze Feb 4, 2024
800b626
Update play_time_trackers.yml
dvir001 Feb 4, 2024
5c2f3c6
Ships
dvir001 Feb 4, 2024
c2cfff6
Honker
dvir001 Feb 4, 2024
fd072de
Happy MapChecker?
dvir001 Feb 4, 2024
2f03f26
yml cleanup
Cheackraze Feb 4, 2024
524d730
storage and misc yaml
Cheackraze Feb 4, 2024
9c2f720
psuedoitem work and storage tweaks
Cheackraze Feb 4, 2024
5dfad6d
Mags
dvir001 Feb 4, 2024
2e811fc
FTL Errors
dvir001 Feb 4, 2024
3caa2b6
flavorol
dvir001 Feb 4, 2024
1337ebe
Missing more FTL
dvir001 Feb 4, 2024
16bcac9
More FTL
dvir001 Feb 4, 2024
9a2b2d3
RSI
dvir001 Feb 4, 2024
dac0a82
flavor
dvir001 Feb 4, 2024
73b2914
FTL, Again
dvir001 Feb 4, 2024
a4c2ae1
Fixed SCI kit
dvir001 Feb 4, 2024
92dde3a
Tall trait tweak (#977)
Mnemotechnician Feb 4, 2024
237c25a
Automatic Changelog (#977)
FrontierATC Feb 4, 2024
4c1e8a7
Lobby art (#978)
IData-RedactedI Feb 4, 2024
bc02774
Automatic Changelog (#978)
FrontierATC Feb 4, 2024
74fe55e
Temp Food Price Fix
dvir001 Feb 5, 2024
3541370
Cargo Cleanup 1
dvir001 Feb 5, 2024
3963e45
Revert "Remove "uncloneable" trait (#23229)"
dvir001 Feb 5, 2024
f7a5dd7
Cleanup, declaw felinids (Later add the new Delta buff PR)
dvir001 Feb 5, 2024
58530f8
Mapping
dvir001 Feb 6, 2024
d5a4115
Fixing
dvir001 Feb 6, 2024
680e1d7
_Nyano to Nyanotrasen so we can fork DeltaV code later without pain
dvir001 Feb 6, 2024
62d4b94
Merge branch 'master' of https://github.com/dvir001/frontier-station-…
dvir001 Feb 6, 2024
fef49f4
OnToolsUseSystem added
dvir001 Feb 6, 2024
63833bf
Emotional Fix
dvir001 Feb 6, 2024
a8a45ee
More stuff that need changes
dvir001 Feb 6, 2024
3d00eba
No more fuckrules (#705)
DebugOk Jan 22, 2024
eb29c99
Increase barber scissors' doafter time (#627)
DebugOk Dec 31, 2023
2c38cf7
Update pride.yml (#733)
TadJohnson00 Jan 30, 2024
bdaf268
Old disposels
dvir001 Feb 6, 2024
85519a5
No more "HONK mimimimimi" for the clown (#574)
leonardo-dabepis Dec 20, 2023
e0f37d5
Boots (With the Fur)
IamVelcroboy Dec 21, 2023
2e3025b
checkraze wanted the "HONK mimimimimi" back
dvir001 Feb 7, 2024
84050e7
Distro Sprite Revert Part 1
dvir001 Feb 7, 2024
05d37b3
Revert "Disposal Unit Tweak (#23067)"
dvir001 Feb 7, 2024
8afdad7
FTL On top issue uncommented till a fix.
dvir001 Feb 7, 2024
a7cb48b
Bbgun (#580)
IamVelcroboy Jan 2, 2024
49aa50b
fix smimsh
Cheackraze Feb 7, 2024
271d9d9
enable shadow biome
Cheackraze Feb 7, 2024
2578821
nerf crusher back to reasonable values
Cheackraze Feb 7, 2024
a7d0ec4
General Fixing
dvir001 Feb 7, 2024
7c3b0b0
Kestrel sell price no longer higher than buy
MagnusCrowe Feb 8, 2024
83a047f
sci tech tree
dvir001 Feb 8, 2024
2361068
whitelist ghost roles and speed up atmos a touch
Cheackraze Feb 8, 2024
67e513f
Merge remote-tracking branch 'origin/january-vanilla-upstream-merge' …
Cheackraze Feb 8, 2024
93391b1
Artifact Effects Tweaks
dvir001 Feb 8, 2024
11a406c
Merge branch 'january-vanilla-upstream-merge' of https://github.com/n…
MagnusCrowe Feb 8, 2024
f1bbf8c
BB Fix
dvir001 Feb 8, 2024
7dcdbd6
Merge branch 'january-vanilla-upstream-merge' of https://github.com/n…
dvir001 Feb 8, 2024
385eadb
Clean generators yml and lower fuel start.
dvir001 Feb 8, 2024
73493d3
NoEmag Comp fix
dvir001 Feb 8, 2024
9fcf48f
BBPrice Up balance, prizeticket cleanup
dvir001 Feb 8, 2024
09eee81
Scottish Trait (#608)
ps3moira Dec 29, 2023
ca45c53
Updates ships with new chem devices
MagnusCrowe Feb 8, 2024
e6e83be
Merge branch 'january-vanilla-upstream-merge' of https://github.com/n…
MagnusCrowe Feb 8, 2024
c27c33d
Fix readme link to SS14 repo
dvir001 Feb 8, 2024
fe65c35
Pet carrier only for pets
dvir001 Feb 8, 2024
16e0090
crispy
dvir001 Feb 8, 2024
bac45ed
ship fixing
dvir001 Feb 8, 2024
0e171c9
yml error
dvir001 Feb 8, 2024
2b9f874
Merge pull request #863 from new-frontiers-14/january-vanilla-upstrea…
Cheackraze Feb 8, 2024
6c4e410
Automatic Changelog (#863)
FrontierATC Feb 8, 2024
f56fbce
fix fax machine copy button duplicate (#981)
Cheackraze Feb 8, 2024
ef4e5bf
Automatic Changelog (#981)
FrontierATC Feb 8, 2024
8712c5a
fix bluespace events deleting people (#982)
Cheackraze Feb 8, 2024
3bbaea4
Automatic Changelog (#982)
FrontierATC Feb 8, 2024
ace6d39
All ships with issues (Update) (#980)
dvir001 Feb 8, 2024
9f4c115
Fixing spawn and errors (#983)
dvir001 Feb 9, 2024
79e489e
Messenger Bags (ported from tgstation) (#962)
ErhardSteinhauer Feb 9, 2024
83b54f4
Automatic Changelog (#962)
FrontierATC Feb 9, 2024
7424c06
Update toy_projectiles.yml (#984)
dvir001 Feb 9, 2024
264f8a3
Update spider_web.yml (#992)
dvir001 Feb 9, 2024
751340c
NFAshtray (#990)
dvir001 Feb 9, 2024
b4ab6d5
Update ResearchSystem.Console.cs (#987)
dvir001 Feb 9, 2024
7da0369
Update cargo_engineering.yml (#986)
dvir001 Feb 9, 2024
fb086e7
Unrat (#991)
dvir001 Feb 9, 2024
deda6cd
Fix mail bag max item size being too small to recieve mails (#995)
Menshin Feb 10, 2024
975b8dd
Mail Handheld Rapid Parcel Delivery System (#974)
ErhardSteinhauer Feb 10, 2024
e356c38
Automatic Changelog (#974)
FrontierATC Feb 10, 2024
f1d8141
feat(ui): Change shipyard ui labels for consistency with `BankATMMenu…
exincore Feb 11, 2024
6b09a2d
fix(ui): Fix dock labels misbehave with UI scaling (#1005)
exincore Feb 12, 2024
0c95e7d
refactor: Improve Shipyard Menu internal consistency (#1004)
exincore Feb 12, 2024
3fde7f8
Buff (#1003)
dvir001 Feb 12, 2024
d542ed4
BB Error Fix (#1000)
dvir001 Feb 12, 2024
c803215
Opportunity (Update) (#994)
MagnusCrowe Feb 12, 2024
2919a13
Automatic Changelog (#994)
FrontierATC Feb 12, 2024
8edb715
Merge pull request #757
ErhardSteinhauer Feb 12, 2024
c687c3b
Automatic Changelog (#757)
FrontierATC Feb 12, 2024
b1e9547
The DEMAG (#824)
dvir001 Feb 12, 2024
34c9511
Automatic Changelog (#824)
FrontierATC Feb 12, 2024
fc64adc
Update hardsuits.yml (#996)
dvir001 Feb 12, 2024
0b768b0
Automatic Changelog (#996)
FrontierATC Feb 12, 2024
2bde5f9
SR Office machines movable (#985)
dvir001 Feb 12, 2024
7e414c4
"Art" (#957)
dvir001 Feb 12, 2024
ac899d8
Removes syndicate turret box (#1011)
MagnusCrowe Feb 13, 2024
c16c9cf
Automatic Changelog (#1011)
FrontierATC Feb 13, 2024
377e782
Diagonal Windows Retexture (#1019)
ErhardSteinhauer Feb 14, 2024
7c32531
Automatic Changelog (#1019)
FrontierATC Feb 14, 2024
4e651a0
Shuttle Secret Door Recipe (#1017)
ErhardSteinhauer Feb 15, 2024
ff16959
Automatic Changelog (#1017)
FrontierATC Feb 15, 2024
245e129
Mayflower Update (#1002)
VividPups Feb 15, 2024
6e1339d
Honker (Update) (#1006)
ErhardSteinhauer Feb 15, 2024
51d83b1
Automatic Changelog (#1006)
FrontierATC Feb 15, 2024
4a3c62a
Phoenix (Update) (#1007)
ErhardSteinhauer Feb 15, 2024
476fa3a
Automatic Changelog (#1007)
FrontierATC Feb 15, 2024
de79a7e
Comet (Update) (#1008)
ErhardSteinhauer Feb 15, 2024
1da13ac
Automatic Changelog (#1008)
FrontierATC Feb 15, 2024
365c864
Was missing from shipyard directory. (#1018)
ThatOneGoblin25 Feb 15, 2024
d3926dd
Automatic Changelog (#1018)
FrontierATC Feb 15, 2024
30c950d
Loader (Update) (#1010)
ErhardSteinhauer Feb 15, 2024
99e699f
Automatic Changelog (#1010)
FrontierATC Feb 15, 2024
f9e7dde
Weapon Racks (Update) (#1015)
ErhardSteinhauer Feb 15, 2024
911d306
Automatic Changelog (#1015)
FrontierATC Feb 15, 2024
ba67c34
Gasbender, Legman and Pioneer (Minor Updates) (#1009)
ErhardSteinhauer Feb 15, 2024
f143d67
Automatic Changelog (#1009)
FrontierATC Feb 15, 2024
2f08293
CODEOWNERS (#883)
dvir001 Feb 15, 2024
3074b2b
Carrying/escape-inventory tweaks (#834)
Mnemotechnician Feb 15, 2024
f034c42
Automatic Changelog (#834)
FrontierATC Feb 15, 2024
5243f59
The Data Carrier (New) - The Grand Arcadia (#906)
AjexRose Feb 15, 2024
9abae69
Automatic Changelog (#906)
FrontierATC Feb 15, 2024
f0bed45
Generators Spawner (#975)
dvir001 Feb 15, 2024
0525ca5
fix spider blood to copperblood (#1021)
Cheackraze Feb 15, 2024
1b4d689
Automatic Changelog (#1021)
FrontierATC Feb 15, 2024
ef4036b
Dungeon - remove the broken tilesets (#1025)
dvir001 Feb 16, 2024
367bc22
Automatic Changelog (#1025)
FrontierATC Feb 16, 2024
1a7a9da
Merge branch 'master' of https://github.com/GreaseMonk/frontier-stati…
GreaseMonk Feb 20, 2024
c726bde
Fix all compilation errors
GreaseMonk Feb 21, 2024
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 spider blood to copperblood (new-frontiers-14#1021)
Cheackraze authored Feb 15, 2024
commit 0525ca52db9466c8d7372d1ea3ea980981379f8f
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
templateId: arachnid
# Damage (Self)
- type: Bloodstream
bloodReagent: SpiderBlood # would be cool if they had to drink copper instead of iron but that might just be more bloat to deal with.
bloodReagent: CopperBlood
- type: ArachnidChaos
- type: Spider
- type: IgnoreSpiderWeb