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

Недельный апстрим #89

Merged
merged 734 commits into from
Dec 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
734 commits
Select commit Hold shift + click to select a range
3972a25
HOTFIX latejoin traitor activations (#33180)
Errant-4 Nov 5, 2024
da19abd
Don't show Reinforcement codewords on round end (#33181)
Errant-4 Nov 5, 2024
2382162
Automatic changelog update
PJBot Nov 5, 2024
1ded8e7
fix artifact debug assert (#33171)
slarticodefast Nov 5, 2024
bcfacec
Fix AI in Intelicard can see through walls (#33177)
Baptr0b0t Nov 6, 2024
d18dba9
Automatic changelog update
PJBot Nov 6, 2024
8ddc543
remove wanted list cartridge from captain PDA (#33084)
slarticodefast Nov 6, 2024
24e6b9f
Automatic changelog update
PJBot Nov 6, 2024
ed865ae
make admeme mouse eternally hungry and thirsty by increasing decay ra…
Plykiya Nov 6, 2024
d588409
Rework the Flare Gun & add a Security Shell Gun. (#32829)
BramvanZijp Nov 6, 2024
e72d63e
Automatic changelog update
PJBot Nov 6, 2024
b15d5a7
Changes to "Burst" firemode; Drozd, WT550 and C20-r (#31292)
SlamBamActionman Nov 6, 2024
5b0761d
Automatic changelog update
PJBot Nov 6, 2024
18971f2
Reverted #31978
cohanna Nov 7, 2024
6c7336b
oops reverted too much
cohanna Nov 7, 2024
379fb4c
AI can now speak once more. (#33196)
ScarKy0 Nov 7, 2024
fc0d85b
Cog update (fixes) (#33202)
Spessmann Nov 7, 2024
8257dc8
Meta map: remove arrivals chair, changed maints shotgun to beanbag ro…
K-Dynamic Nov 7, 2024
d13765f
Fixes Lambordeere bolt buttons not being connected (#33065)
PopGamer45 Nov 7, 2024
03723af
Automatic changelog update
PJBot Nov 7, 2024
9ee47b9
Core Station: Telecoms air alarm connection to atmos devices (#33214)
scrivoy Nov 7, 2024
6a1d631
fix invalids core (#33215)
Emisse Nov 7, 2024
261c18f
Fix research disk crash (#33205)
ewokswagger Nov 8, 2024
0128554
Fix cursed mask bug (#33014)
FireNameFN Nov 8, 2024
667daa1
pass Actor to cartridge messages (#33210)
deltanedas Nov 8, 2024
80e148c
cham projector fixes/rewrite (#27111)
deltanedas Nov 8, 2024
8433868
Stable Merge (#33218)
Jezithyr Nov 8, 2024
63f2c84
Merge remote-tracking branch 'upstream/staging' into stable-test
VasilisThePikachu Nov 10, 2024
197d9e6
HOTFIX: Fix Security Shell Gun being uncraftable. (#33247)
BramvanZijp Nov 11, 2024
e9f6a02
un-reverted fixes
cohanna Nov 13, 2024
21074bd
oops
cohanna Nov 13, 2024
f2b7743
Half Revert #31978 (#33160)
keronshb Nov 14, 2024
530a741
Rule amendment - Remove role abandonment aHelp requirement. (#33287)
Titian3 Nov 15, 2024
84371b8
POI Code cleanup (#2406)
dvir001 Nov 16, 2024
6b1578d
Crossbow bolt cleanup, trigger fixes (#2416)
whatston3 Nov 16, 2024
ff99a99
Automatic Changelog (#2416)
FrontierATC Nov 16, 2024
91b9c8e
Fix pull vs. virtual item order (#2417)
whatston3 Nov 16, 2024
fb7772c
Automatic Changelog (#2417)
FrontierATC Nov 16, 2024
16a7094
Adds missing Bulker cable terminal. (#2414)
dustylens Nov 16, 2024
780369e
Automatic Changelog (#2414)
FrontierATC Nov 16, 2024
814dc2b
Test fail (#2413)
dvir001 Nov 16, 2024
20500c6
Hotfix: Dead drop warp point visibility (#2420)
whatston3 Nov 16, 2024
3efcb5d
Automatic Changelog (#2420)
FrontierATC Nov 16, 2024
e280b12
Ya Yeet (#2422)
dvir001 Nov 16, 2024
b82b0c5
Big bug fixing part 3 (#2263)
dvir001 Nov 17, 2024
42da30e
Update crescent.yml (#2424)
dustylens Nov 17, 2024
1e2447a
Automatic Changelog (#2424)
FrontierATC Nov 17, 2024
aeb9441
Restore some integration tests (#2425)
dvir001 Nov 18, 2024
b155c11
Canisters update (#2412)
dvir001 Nov 18, 2024
63fb8e8
Automatic Changelog (#2412)
FrontierATC Nov 18, 2024
0bd913c
Separate Frontier and NFSD banks, sector-wide bank access, revamp the…
whatston3 Nov 18, 2024
268f5aa
Automatic Changelog (#2346)
FrontierATC Nov 18, 2024
04b9dc3
Big bug fixing part 4 (#2423)
dvir001 Nov 18, 2024
36c1b5c
Update gases price (#2421)
dvir001 Nov 18, 2024
27f87b2
Automatic Changelog (#2421)
FrontierATC Nov 18, 2024
895648a
Increase softcap back to 80 (#33400)
nikthechampiongr Nov 19, 2024
84d4426
Update camper.yml (#2431)
dustylens Nov 19, 2024
0bcb21d
Automatic Changelog (#2431)
FrontierATC Nov 19, 2024
beacd92
Add OnUiOpened function for RadarConsole (#2432)
whatston3 Nov 19, 2024
ad37f19
Automatic Changelog (#2432)
FrontierATC Nov 19, 2024
3ed040f
Update HumanoidCharacterProfile.cs (#2330)
dvir001 Nov 19, 2024
5950514
Automatic Changelog (#2330)
FrontierATC Nov 19, 2024
9f13eff
Remove arti disintegrate probability (#2419)
dvir001 Nov 19, 2024
d732f99
fix lathe diamond (#2434)
MisterMecky Nov 20, 2024
c93c6fc
Automatic Changelog (#2434)
FrontierATC Nov 20, 2024
3a7d49b
Mix up atmos on planets (#2430)
dvir001 Nov 20, 2024
ac75556
Automatic Changelog (#2430)
FrontierATC Nov 20, 2024
34b9c4a
Remove rewards from expeditions (#2385)
GreaseMonk Nov 20, 2024
6a052b7
Automatic Changelog (#2385)
FrontierATC Nov 20, 2024
b395529
Revert expedition time cooldown (#2386)
GreaseMonk Nov 20, 2024
1c46422
Automatic Changelog (#2386)
FrontierATC Nov 20, 2024
0b04efb
Disable insane Christmas gifts (#2435)
arimah Nov 20, 2024
cab229e
Automatic Changelog (#2435)
FrontierATC Nov 20, 2024
3ac49bc
New artifact effects (#2318)
dvir001 Nov 20, 2024
a0044b7
Automatic Changelog (#2318)
FrontierATC Nov 20, 2024
3089bc3
Update pda.yml (#2438)
dvir001 Nov 21, 2024
bb7ea44
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
whatston3 Nov 22, 2024
6f8cd0e
Merge branch 'stable' of https://github.com/space-wizards/space-stati…
whatston3 Nov 22, 2024
1e7ea04
Missed merge conflict markers
whatston3 Nov 22, 2024
7a69828
YAML fixes
whatston3 Nov 22, 2024
62136ad
Reduce syndie medical duffel fill (medkits big)
whatston3 Nov 22, 2024
463a996
Fix SR PDA loadout entry (#2447)
whatston3 Nov 22, 2024
a62beaa
Update gun.ftl (#2445)
dvir001 Nov 22, 2024
6930234
Updates (#2443)
dvir001 Nov 22, 2024
eb75978
Automatic Changelog (#2443)
FrontierATC Nov 22, 2024
f2bdef8
Merge branch 'master' into oct24-upstream-merge
dvir001 Nov 22, 2024
2731408
Update cannons.yml (#2439)
dvir001 Nov 22, 2024
23af825
Update lathe.yml (#2437)
dustylens Nov 22, 2024
211255c
Automatic Changelog (#2437)
FrontierATC Nov 22, 2024
1dd33de
Scraproid (#2408)
ErhardSteinhauer Nov 22, 2024
46e7566
Automatic Changelog (#2408)
FrontierATC Nov 22, 2024
47b4754
fix (#2448)
ErhardSteinhauer Nov 22, 2024
3f0b275
Salvage events pool v1 (#2433)
dvir001 Nov 22, 2024
7860d0b
Automatic Changelog (#2433)
FrontierATC Nov 22, 2024
9041478
Merge branch 'master' into oct24-upstream-merge
dvir001 Nov 23, 2024
3bc9fbb
cartridges to 12, no special masks
whatston3 Nov 23, 2024
36849c1
maxcap to 5
whatston3 Nov 23, 2024
7121aec
Address FRONTIER MERGE comments
whatston3 Nov 23, 2024
f7851a6
Frezon to 0.4 (still profitable vs. T), spooky
whatston3 Nov 23, 2024
cdfa165
Port TheShuEd's changes from space-wizards#33110
whatston3 Nov 23, 2024
00fd641
Add AstroNav cartridge to admin PDA, cart order
whatston3 Nov 23, 2024
62ecbf6
syndie biz card: destroy on send, skip tests
whatston3 Nov 23, 2024
ed6e946
service lathe: undupe recipes
whatston3 Nov 23, 2024
6e902fe
service lathe recipes
whatston3 Nov 23, 2024
288f6f3
Wristwatch loadouts, show shift time, 24h, mail
whatston3 Nov 23, 2024
cd91346
Merge branch 'master' into 2024-11-22-clock-reference
whatston3 Nov 23, 2024
97b28ed
Caveman smite consistency
whatston3 Nov 23, 2024
df2270f
ContrabandSystem.CopyDetails: add Frontier fields
whatston3 Nov 23, 2024
71c18bb
Fix rifle3.ogg attribution to rifle.ogg
whatston3 Nov 23, 2024
afc6547
job-supervisors.ftl: capitalization
whatston3 Nov 23, 2024
1a8a76e
voice mask: remove suffix (not accurate)
whatston3 Nov 23, 2024
8367b9e
Give ERT mail metrics
whatston3 Nov 23, 2024
fe4499a
syndie business card deletion and messages
whatston3 Nov 23, 2024
83774dc
Update Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/trinkets.yml
whatston3 Nov 23, 2024
cb06e10
red circuit tiles, trade depot pallets, votekick 0
whatston3 Nov 23, 2024
92b07d3
pin
whatston3 Nov 23, 2024
40a1ab4
New baked recipes use the oven
whatston3 Nov 23, 2024
b589ed2
freezer graph: upstrm consistency, freezer elects
whatston3 Nov 23, 2024
d069a96
Remove duped hydroponics tool recipes
whatston3 Nov 23, 2024
b539677
Vim: contractor access
whatston3 Nov 23, 2024
cd2a1f0
Wall Freeeza
dvir001 Nov 23, 2024
b169f25
Merge branch 'oct24-upstream-merge' of https://github.com/whatston3/f…
dvir001 Nov 23, 2024
bef1365
Update masks.yml
dvir001 Nov 23, 2024
28b611c
Ensure upstream jobs have GeneralAccess for PDA
whatston3 Nov 23, 2024
e1131f7
Merge branch 'oct24-upstream-merge' of https://github.com/whatston3/f…
dvir001 Nov 23, 2024
ca7fad9
Dungeon chefvend
dvir001 Nov 23, 2024
ef3e8e4
BB Gun fix to vend
dvir001 Nov 23, 2024
5e3ad18
Hide the Bananium fuel in the fuel vending machine
dvir001 Nov 23, 2024
3d18be6
Moved the last 3 animals off cargo (cow, pig, goat) to cubes for chefs
dvir001 Nov 23, 2024
b8c1e9a
Added the missing wood for materials lockers that I forgot about fixing
dvir001 Nov 23, 2024
53c5490
accessGroup to accessGroups
whatston3 Nov 23, 2024
840b6aa
Remove scheduling on update-credits
whatston3 Nov 23, 2024
96ad919
Remove ame jar from cargo, they are in fuel vend
dvir001 Nov 23, 2024
0ce3be4
Merge branch 'oct24-upstream-merge' of https://github.com/whatston3/f…
dvir001 Nov 23, 2024
85160bd
manual update credits job, creates a PR on run
whatston3 Nov 23, 2024
99d6d12
Remove all posters
dvir001 Nov 23, 2024
04ce1c2
Merge branch 'oct24-upstream-merge' of https://github.com/whatston3/f…
dvir001 Nov 23, 2024
f2c6923
Update migration.yml
dvir001 Nov 23, 2024
7b7d443
Update BiomeSystem.cs
dvir001 Nov 23, 2024
8426c3c
Show docking labels, order labelled docks (#2426)
whatston3 Nov 23, 2024
35adf6b
Automatic Changelog (#2426)
FrontierATC Nov 23, 2024
9df28ea
Merge branch 'master' into oct24-upstream-merge
dvir001 Nov 23, 2024
401da73
Hide non-Frontier Admin PDA
whatston3 Nov 23, 2024
752f2b0
Web poncho, cloak butcher into 5 silk
whatston3 Nov 23, 2024
244e6f8
Fixup for radio servers to NF
dvir001 Nov 23, 2024
5038acb
ChatSystem: fix IC sanitize function
whatston3 Nov 23, 2024
adc8410
Merge branch 'oct24-upstream-merge' of https://github.com/whatston3/f…
whatston3 Nov 23, 2024
0e2da25
Frontier rework (cryo sign, maints doors, o2light)
whatston3 Nov 23, 2024
7eb5d0f
Update dev_map.yml
dvir001 Nov 23, 2024
faecacc
Merge branch 'oct24-upstream-merge' of https://github.com/whatston3/f…
dvir001 Nov 23, 2024
03986db
mail refactor (#2067)
MilonPL Oct 28, 2024
108d605
Mail cleanup, return reward strings
whatston3 Nov 23, 2024
8ecfed6
Update material_reclaimer.yml
dvir001 Nov 23, 2024
e18fcdc
Merge pull request #2353 from whatston3/oct24-upstream-merge
dvir001 Nov 24, 2024
9a79075
Automatic Changelog (#2353)
FrontierATC Nov 24, 2024
49c159d
DeltaV #2263 (#2442)
dvir001 Nov 24, 2024
2936c42
conflicts
Zekins3366 Nov 25, 2024
d96add7
Fix mop, petting effect hints
whatston3 Nov 25, 2024
de93491
Merge pull request #2461 from whatston3/2024-11-25-fix-artimop
dvir001 Nov 25, 2024
d32de95
Automatic Changelog (#2461)
FrontierATC Nov 25, 2024
8dfc9e5
Merge pull request #2450 from whatston3/2024-11-22-clock-reference
dvir001 Nov 25, 2024
4922993
Automatic Changelog (#2450)
FrontierATC Nov 25, 2024
c7a854b
Deep fryer recipes, fried chicken, nuggets, doughnuts, Nyano drinks (…
whatston3 Nov 25, 2024
9080ee9
Automatic Changelog (#2441)
FrontierATC Nov 25, 2024
2dda0f1
Adds an ATM to the Loader (#2427)
dustylens Nov 25, 2024
5a77486
Automatic Changelog (#2427)
FrontierATC Nov 25, 2024
7cf1a9c
Plushed With Greatness (#2454)
dustylens Nov 25, 2024
1815b23
Automatic Changelog (#2454)
FrontierATC Nov 25, 2024
207fbf4
Scrap Processor (#2456)
ErhardSteinhauer Nov 26, 2024
2909617
Automatic Changelog (#2456)
FrontierATC Nov 26, 2024
ced5161
Add support for bosses in VGRoid (#2449)
dvir001 Nov 26, 2024
28e6e0d
Add a new admin command, spawnrefund (#2359)
arimah Nov 26, 2024
d5414b2
Automatic Changelog (#2359)
FrontierATC Nov 26, 2024
10ca953
Discord Ahelp Reply System (#2283)
Myzumi Nov 26, 2024
52fb3e0
Directional fans rebase (#2366)
PeccNeck Nov 26, 2024
57732de
Automatic Changelog (#2366)
FrontierATC Nov 26, 2024
2e22dd1
Directional fans (#2367)
PeccNeck Nov 26, 2024
9c5b76e
Automatic Changelog (#2367)
FrontierATC Nov 26, 2024
e9b41b9
Paladin (New Shuttle) (#2195)
Leander-0 Nov 27, 2024
f71a646
Automatic Changelog (#2195)
FrontierATC Nov 27, 2024
415ba26
Fix integration tests (#2470)
PeccNeck Nov 27, 2024
17604d0
Automatic Changelog (#2470)
FrontierATC Nov 27, 2024
52ddc8d
Trade Mall (Trade Outpost Alternate) (#2365)
Cheackraze Nov 27, 2024
424e2a5
Automatic Changelog (#2365)
FrontierATC Nov 27, 2024
cdae6d2
Add empty barsign to _NF barsign folder (#2472)
whatston3 Nov 28, 2024
476bb8f
Display GPS coordinates on their own line (#2473)
arimah Nov 28, 2024
fc07131
Automatic Changelog (#2473)
FrontierATC Nov 28, 2024
8b6c666
Restore auto-publish (#2475)
whatston3 Nov 28, 2024
eedc991
Revert "DeltaV #2263 (#2442)" (#2478)
dvir001 Nov 29, 2024
5736d0b
Fixed (#2479)
dvir001 Nov 29, 2024
1aa611e
Fix ships (#2481)
dvir001 Nov 29, 2024
2fea00b
Fixing whitelist code issues. (#2484)
dvir001 Nov 29, 2024
3f39205
ShuttleMapControl: check ent exists before xform (#2483)
whatston3 Nov 29, 2024
12e7557
Automatic Changelog (#2483)
FrontierATC Nov 29, 2024
f3fdccb
Ambition compliance pass (#2372)
blackknight954 Nov 30, 2024
6a33b89
Automatic Changelog (#2372)
FrontierATC Nov 30, 2024
d798a0e
Directional fans (#2468)
PeccNeck Nov 30, 2024
befb4c6
Update salvage_mods.yml (#2485)
dvir001 Nov 30, 2024
7bf5a4d
Localize docks (#2467)
whatston3 Nov 30, 2024
049585e
Automatic Changelog (#2467)
FrontierATC Nov 30, 2024
9777f0b
Removed blood restoration from cryoxadone (#2459)
whatston3 Dec 1, 2024
26d5c50
Automatic Changelog (#2459)
FrontierATC Dec 1, 2024
6ff3ac8
breaded chicken cuts to breaded cutlets (#2493)
whatston3 Dec 1, 2024
898e567
Scrap Asteroids (#2491)
ErhardSteinhauer Dec 1, 2024
f30cbc2
Automatic Changelog (#2491)
FrontierATC Dec 1, 2024
1f4f7ad
Revert "Update animals.yml (#2312)" (#2487)
dvir001 Dec 2, 2024
991687f
Automatic Changelog (#2487)
FrontierATC Dec 2, 2024
c87e4a6
Add two new posters: "Bahama Mama's" and "Winner Winner" (#2497)
whatston3 Dec 2, 2024
cb3e104
Add sprites for the ruminant box, wrapped pig, goat and cow cubes. (#…
whatston3 Dec 3, 2024
8255be6
Made ChemMaster Sorted (#2498)
DmitriTheDemon Dec 3, 2024
09ffe1b
Automatic Changelog (#2498)
FrontierATC Dec 3, 2024
180f2ca
Adds medtek cartridges to Nano/Civimed (#2501)
dustylens Dec 3, 2024
78373ba
Cryosleep Fallbacks (#2482)
whatston3 Dec 3, 2024
0d33ffc
Automatic Changelog (#2482)
FrontierATC Dec 3, 2024
8ecd550
Update atm.yml (#2502)
Houtblokje Dec 4, 2024
ae6fcc1
Update CarryingSystem And ContestsSystem (#2074)
VMSolidus Dec 5, 2024
89cee40
Automatic Changelog (#2074)
FrontierATC Dec 5, 2024
4e84c1c
conflicts
Zekins3366 Dec 5, 2024
55ff039
Kimonos (#2509)
immortalartisan Dec 5, 2024
209f3d9
Automatic Changelog (#2509)
FrontierATC Dec 5, 2024
6989795
Fix pilot mask base (#2511)
dvir001 Dec 6, 2024
128c0a2
Fix market console range; add computer screens (#2506)
whatston3 Dec 6, 2024
99b9c13
Automatic Changelog (#2506)
FrontierATC Dec 6, 2024
cecaf80
Carpet graphs (#2507)
whatston3 Dec 6, 2024
50857f8
Cleared contraband from Emotional support RPG (#2510)
DmitriTheDemon Dec 6, 2024
5bb6108
Automatic Changelog (#2507)
FrontierATC Dec 6, 2024
9dd6560
Automatic Changelog (#2510)
FrontierATC Dec 6, 2024
a7e54b8
Medipens II (#2452)
dustylens Dec 6, 2024
cd3484e
Automatic Changelog (#2452)
FrontierATC Dec 6, 2024
d34d374
Guidebook open depth to 1 (#2519)
whatston3 Dec 6, 2024
c3e2beb
Update lockers.yml (#2517)
dvir001 Dec 6, 2024
c60ca69
Fix wristwatch mail, better mailto command (#2496)
whatston3 Dec 6, 2024
f1255fb
Automatic Changelog (#2496)
FrontierATC Dec 6, 2024
9f33e7a
Change event announcement text "station" --> "shuttle" (#2465)
Mygnol Dec 6, 2024
a265f3c
Moth food for moths (#2488)
whatston3 Dec 6, 2024
c3d2702
Automatic Changelog (#2488)
FrontierATC Dec 6, 2024
2a92cee
Added rubber ammo to NFSD TechFab (#2518)
DmitriTheDemon Dec 6, 2024
43e0254
Automatic Changelog (#2518)
FrontierATC Dec 6, 2024
14916da
EMP: examine UI on items with EMP effects (#2520)
whatston3 Dec 6, 2024
26d7939
Automatic Changelog (#2520)
FrontierATC Dec 6, 2024
36f60e0
Fixed disposals issue (#2505)
southbridge-fur Dec 6, 2024
31d1aea
Adds fuel and real shipyards to Trade Outpost (#2494)
MagnusCrowe Dec 6, 2024
6cafb02
Added Empess cryosleep (#2476)
DmitriTheDemon Dec 6, 2024
e7a688e
Automatic Changelog (#2476)
FrontierATC Dec 6, 2024
fcf38e6
Adds fryer to piecrust (#2495)
dustylens Dec 7, 2024
759ad66
update
Zekins3366 Dec 8, 2024
498aed3
conflicts
Zekins3366 Dec 8, 2024
90b490c
Merge branch 'master' into up251124
Zekins3366 Dec 8, 2024
3c200e5
Fix's and end
mersen-tyn Dec 8, 2024
540e5cb
fix
Zekins3366 Dec 8, 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 mop, petting effect hints
whatston3 committed Nov 25, 2024
commit d96add7259535a5fe4ac2a4893ca615d0e7f1bad
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/XenoArch/Effects/utility_effects.yml
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
- type: artifactEffect
id: EffectInteractionPopup
targetDepth: 2
effectHint: artifact-trigger-hint-petting
effectHint: artifact-effect-hint-petting
blacklist:
components:
- Item
@@ -68,7 +68,7 @@
- type: artifactEffect
id: EffectAdvMop
targetDepth: 3
effectHint: artifact-trigger-hint-mop
effectHint: artifact-effect-hint-mop
whitelist:
components:
- Item