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 63 #1979

Merged
merged 150 commits into from
Oct 1, 2024
Merged
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
3e1c067
Fland change - Add glasslocks to the Contiguous Fland Hallway Volume …
SaphireLattice Sep 19, 2024
937940b
Automatic changelog update
PJBot Sep 19, 2024
24c412f
Removes cockroach/mothroach melee damage (#32221)
Plykiya Sep 19, 2024
d74d44a
Automatic changelog update
PJBot Sep 19, 2024
1a601c4
Makes the rat king's cheeseEm order more convenient to use (#32181)
PopGamer45 Sep 19, 2024
7aae8c0
Automatic changelog update
PJBot Sep 19, 2024
2d42a6b
Cog update (Mail) (#32315)
Spessmann Sep 20, 2024
fba6797
Modifications to bring Omega up to date. (#32317)
spanky-spanky Sep 20, 2024
b81c7a4
Make small clamp use 2% battery instead of recharging 2% battery. (#3…
JIPDawg Sep 20, 2024
99101f2
Automatic changelog update
PJBot Sep 20, 2024
00002fa
fix issues with proximity beeper (#32322)
Ilya246 Sep 20, 2024
a9b5e39
Disable resizing of lobby character editor (#32313)
eoineoineoin Sep 20, 2024
1567af6
Rolebanlist command UI (#30827)
sativaleanne Sep 20, 2024
6d5ac1e
Fix disposal units flushing too soon after power-on (#32314)
eoineoineoin Sep 20, 2024
e964e9c
Psychologist's Stamp (#31881)
cohanna Sep 20, 2024
c4d12df
Automatic changelog update
PJBot Sep 20, 2024
2955dd5
Security Clown Mask is now security restricted. (#32335)
GoldenCan Sep 20, 2024
3e92eb1
Soda water and Vodka recipes (#32252)
saga3152 Sep 20, 2024
c5d62ce
Automatic changelog update
PJBot Sep 20, 2024
24ed1f7
Fix medical PDA/health analyzer long range intel bug (#31879)
goet Sep 21, 2024
29e56be
Automatic changelog update
PJBot Sep 21, 2024
d32c42f
Added a directory to station maps (#31156)
TGRCdev Sep 21, 2024
3501d49
Automatic changelog update
PJBot Sep 21, 2024
5f5bed8
Add skirt of life in contraband medidrobe (#32214)
lzk228 Sep 21, 2024
3cc7fd4
Fix a spelling mistake in the DonutVend's advertisments (#32348)
voidnull000 Sep 21, 2024
2ea54b1
Flora anomaly seeds (#31987)
TheShuEd Sep 21, 2024
6a11dd0
Automatic changelog update
PJBot Sep 21, 2024
cd761ea
fix cargo order scams, fix internals crate desc (#32350)
Ilya246 Sep 21, 2024
1b81ce4
Rat kings can butcher things (#32232)
Plykiya Sep 21, 2024
49f1772
Automatic changelog update
PJBot Sep 21, 2024
4f5255b
Update Credits (#32362)
github-actions[bot] Sep 22, 2024
72acce5
AI now "can" use media console (#32334)
AsnDen Sep 22, 2024
8f06155
Make buckle mint (#32370)
metalgearsloth Sep 22, 2024
8ed779b
Automatic changelog update
PJBot Sep 22, 2024
1aea1ae
Adding a holy watermelon helmet (#32272)
ravage123321 Sep 22, 2024
b78156a
Automatic changelog update
PJBot Sep 22, 2024
932af69
added the ability for pigs to feed themselves (#32358)
Soydium Sep 22, 2024
1e46657
Lemons, limes, and oranges can now be mutated into each other (#32306)
saga3152 Sep 22, 2024
f8514e7
Automatic changelog update
PJBot Sep 22, 2024
d3ff4d5
Makes it possible to disable the vent pressure lockout temporarily wi…
PotentiallyTom Sep 22, 2024
ee393a1
Automatic changelog update
PJBot Sep 22, 2024
8a2c69d
reach update :3 (#32387)
Killerqu00 Sep 22, 2024
5e162e7
Add the Syndicate Instigator Shuttle (#32083)
IProduceWidgets Sep 23, 2024
dd7884e
Predict vending machine BUI (#32376)
metalgearsloth Sep 23, 2024
b2cb813
Include container ents in examine (#32267)
metalgearsloth Sep 23, 2024
ad6c5a1
Automatic changelog update
PJBot Sep 23, 2024
3d2aadd
L6 Fits in the Suit Storage Slot (#30525)
Cojoke-dot Sep 23, 2024
c4b8260
Automatic changelog update
PJBot Sep 23, 2024
caf34be
Entity menu lookup changes (#32395)
ElectroJr Sep 23, 2024
b6845de
Automatic changelog update
PJBot Sep 23, 2024
a7e29f2
Computer wirepanel (#32273)
Errant-4 Sep 23, 2024
0a3273a
Automatic changelog update
PJBot Sep 23, 2024
aab4236
Fix guidebook books don't have damage (#32403)
lzk228 Sep 23, 2024
16c46af
Automatic changelog update
PJBot Sep 23, 2024
24140d8
VIM have Passenger Access. (#32302)
Jophire Sep 23, 2024
31db37e
Automatic changelog update
PJBot Sep 23, 2024
5e9a0c9
Omega Minor Sec Update (#32410)
spanky-spanky Sep 23, 2024
20bb9ed
fix(contraband): Make contraband work with chameleon items (#30986)
Brandon-Huu Sep 23, 2024
95104de
Fix cadet pda (#32399)
lzk228 Sep 23, 2024
d0bb408
Automatic changelog update
PJBot Sep 23, 2024
594aad0
Paper QOL improvements (#32418)
eoineoineoin Sep 23, 2024
1450d76
Fix OOC not re-enabling if restartroundnow is used (#32401)
PJB3005 Sep 23, 2024
f1bd0be
Remove all command age requirements (#32340)
VasilisThePikachu Sep 24, 2024
dc4d638
Automatic changelog update
PJBot Sep 24, 2024
9d75a22
Add missing LV cables in Omega atmos (#32417)
spanky-spanky Sep 24, 2024
50395e2
Allow AreaInsert pickups for one item (#32153)
dvir001 Sep 24, 2024
49d4e4c
Automatic changelog update
PJBot Sep 24, 2024
efd9894
Antimov in both Traitor & Nukie Uplinks (#31916)
LordEclipse Sep 24, 2024
b883f79
Automatic changelog update
PJBot Sep 24, 2024
87932bc
craftable freezers (#32277)
lzk228 Sep 24, 2024
057de0c
Automatic changelog update
PJBot Sep 24, 2024
042f0d3
fix paper staying on fire forever (#32412)
MilonPL Sep 24, 2024
f3e185c
Automatic changelog update
PJBot Sep 24, 2024
241be37
AstroNav GPS Cartridge (#32194)
ArchRBX Sep 24, 2024
4bca634
Automatic changelog update
PJBot Sep 24, 2024
e36d735
Fix cartesian explosion in pref loading (#32434)
PJB3005 Sep 24, 2024
89dbef7
Automatic changelog update
PJBot Sep 24, 2024
95a159f
fix(BatterySelfRecharger): Fully charge BatterySelfRechargers (#30627)
Brandon-Huu Sep 24, 2024
55366dc
Most papers are no longer trash (#32343)
Moomoobeef Sep 24, 2024
52e85fe
Automatic changelog update
PJBot Sep 24, 2024
d1812c1
Fix contraband never getting added to vend inventory (#32431)
goet Sep 25, 2024
31c45d6
Automatic changelog update
PJBot Sep 25, 2024
0dedc9d
Skull Helm Hand Sprite now turns (#32442)
Zylofan Sep 25, 2024
7168959
Adds real-time charge & disabled action information to Actions (#31821)
keronshb Sep 25, 2024
e0a3d3d
Fix agent ID card unlimited range (#32445)
themias Sep 25, 2024
d2ed93e
Automatic changelog update
PJBot Sep 25, 2024
6459f71
Remove binary channel access to silicons without laws. (#32385)
VasilisThePikachu Sep 25, 2024
92c5c87
Automatic changelog update
PJBot Sep 25, 2024
b2dad9f
Makes the rolling pin craftable (#32285)
august-sun Sep 25, 2024
5a585f7
Automatic changelog update
PJBot Sep 25, 2024
548973b
Fix Doctors Delight metabolism Rate (#32297)
BramvanZijp Sep 25, 2024
9c2fe85
Automatic changelog update
PJBot Sep 25, 2024
0f729bc
Makes `BaseAdvancedPen` abstract (#32454)
IamVelcroboy Sep 26, 2024
fd1f4a3
lower frezon/n2o sale prices, make frezon take more trit (#32407)
Ilya246 Sep 26, 2024
4491550
Automatic changelog update
PJBot Sep 26, 2024
eeadc75
Add Votekick functionality (#32005)
SlamBamActionman Sep 26, 2024
c2bc821
Automatic changelog update
PJBot Sep 26, 2024
fe2145d
Voice Mask refactor (#30798)
beck-thompson Sep 26, 2024
bf80f3a
Automatic changelog update
PJBot Sep 26, 2024
af3ea52
Cog update (power fix/grav) (#32475)
Spessmann Sep 27, 2024
b9b0c10
Fixed collision for gas and volumetric pumps (#32471)
august-sun Sep 27, 2024
b8d7733
Automatic changelog update
PJBot Sep 27, 2024
b1e69ee
Fix airlock autoclose mispredict (#32477)
metalgearsloth Sep 27, 2024
bee66ed
Automatic changelog update
PJBot Sep 27, 2024
f46f5e2
Fix storage area pickup sound playing multiple times (#32397)
metalgearsloth Sep 27, 2024
2e03787
Automatic changelog update
PJBot Sep 27, 2024
bc461b9
Predict stripping (#32478)
metalgearsloth Sep 27, 2024
0d26bb0
Automatic changelog update
PJBot Sep 27, 2024
4bcf3c3
Station AI ability to electricute doors (#32012)
Fildrance Sep 27, 2024
88ccc19
Automatic changelog update
PJBot Sep 27, 2024
bbf84d0
Feature/grey trenchcoat for detective loadout (#32380)
LittleNorthStar Sep 27, 2024
4e86095
Automatic changelog update
PJBot Sep 27, 2024
7d4ea96
remove thief figurine objective (#32413)
deltanedas Sep 27, 2024
b5a7326
Automatic changelog update
PJBot Sep 27, 2024
7485411
Predict appraisal tool verb! (#32496)
beck-thompson Sep 28, 2024
caac678
Automatic changelog update
PJBot Sep 28, 2024
dd376e4
Optimise drains (#32230)
metalgearsloth Sep 28, 2024
a371de1
Some new hairstyles! (#31010)
Futuristic-OK Sep 28, 2024
9f5b6af
Automatic changelog update
PJBot Sep 28, 2024
bed9684
Fix multiple door issues (#32483)
metalgearsloth Sep 28, 2024
8b692d1
Automatic changelog update
PJBot Sep 28, 2024
0a7b23c
Update submodule to 236.0.0 (#32500)
metalgearsloth Sep 28, 2024
1b9d77a
Replace obsolete Tile Access methods (#32508)
MilenVolf Sep 28, 2024
a5840b9
Fix RA0032 (#32514)
nikthechampiongr Sep 29, 2024
d806db2
Fix currency duplication bug (#32524)
ElectroJr Sep 29, 2024
6b49a51
Automatic changelog update
PJBot Sep 29, 2024
f1f1fc1
Add interaction rate limits (#32527)
ElectroJr Sep 29, 2024
6bc383c
Automatic changelog update
PJBot Sep 29, 2024
1dc9541
Fixes HoS's energy shotgun not being marked as restricted contraband …
ArtisticRoomba Sep 29, 2024
cc9202b
Automatic changelog update
PJBot Sep 29, 2024
d0c4d5a
Add webhook for votekicks (#32513)
SlamBamActionman Sep 29, 2024
4aed728
make conveyor belt assemblies cheaper (#32444)
Ilya246 Sep 29, 2024
f6ceaa7
Automatic changelog update
PJBot Sep 29, 2024
1632500
Fix mutation system debug assert (#32530)
slarticodefast Sep 29, 2024
5c0b127
Execution System uses the identity of an entity; added "the" to execu…
CuteMoonGod Sep 29, 2024
dd15a68
Automatic changelog update
PJBot Sep 29, 2024
7cf04dc
Use archived gas mixture in gas exchange comparison (#32088)
drakewill-CRL Sep 30, 2024
c419e58
Automatic changelog update
PJBot Sep 30, 2024
bc059f0
AI can use fire alarm (#32467)
qwerltaz Sep 30, 2024
717f82f
Automatic changelog update
PJBot Sep 30, 2024
af508f0
Merge commit 'cd761eae691e47b7502b94808926173e28160649' into upstream…
DexlerXD Sep 30, 2024
503c73e
Merge commit '89dbef7461abe1de886075cc011bc2e0af2bd40a' into upstream…
DexlerXD Sep 30, 2024
3e6a1e8
Merge commit '0a7b23cd4db598e2f0215e582bd840773093d528' into upstream…
DexlerXD Sep 30, 2024
a82a91b
Merge commit '717f82f9da59b9498b505bb059652d7f8b36f574' into upstream…
DexlerXD Sep 30, 2024
bec9350
post-merge fixes
DexlerXD Sep 30, 2024
d6ff27a
delete duplicate stamp
DexlerXD Sep 30, 2024
c2d9a55
return figurines steal group
DexlerXD Sep 30, 2024
a5bf408
Merge branch 'master' of https://github.com/SerbiaStrong-220/space-st…
DexlerXD Oct 1, 2024
e49684f
delete contraband inheritance
DexlerXD Oct 1, 2024
1b0e418
return deleted hat
DexlerXD Oct 1, 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
Automatic changelog update
  • Loading branch information
PJBot committed Sep 27, 2024
commit b5a73261602dd9e8a07e1c6a581e3b20daa7a58f
15 changes: 7 additions & 8 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
Entries:
- author: Blackern5000
changes:
- message: The syndicate agent's cyborg weapons module now uses syndicate weaponry
rather than NT weaponry.
type: Tweak
id: 6949
time: '2024-07-21T07:04:33.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/26947
- author: Winkarst-cpu
changes:
- message: Added ambience to the camera routers and telecommunication servers.
Expand Down Expand Up @@ -3940,3 +3932,10 @@
id: 7448
time: '2024-09-27T10:03:55.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32380
- author: deltanedas
changes:
- message: Removed the thief figurines objective.
type: Remove
id: 7449
time: '2024-09-27T19:04:22.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/32413