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 11/01/2025 #21

Merged
merged 50 commits into from
Jan 12, 2025
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
46d1bbe
Apply forensics when loading with an ammo box (#32280)
themias Jan 4, 2025
92d21bb
Automatic changelog update
PJBot Jan 4, 2025
a25128b
Update Credits (#34220)
github-actions[bot] Jan 5, 2025
bc6dc9e
Fix rainbow lizard plushie inhands (#34128)
ArtisticRoomba Jan 5, 2025
ad504e2
wielding refactor/fixes (#32188)
deltanedas Jan 5, 2025
1730efc
Automatic changelog update
PJBot Jan 5, 2025
520ddb4
Lobby chat width and custom lobby titles (#33783)
Errant-4 Jan 5, 2025
79ce4fd
Automatic changelog update
PJBot Jan 5, 2025
7b9966d
Adds bullet collision to station lights (#34070)
SpaceRox1244 Jan 5, 2025
42b6ec7
Automatic changelog update
PJBot Jan 5, 2025
7c0a40a
Make station anchor hitbox less insufferable (#34217)
ArtisticRoomba Jan 6, 2025
1d2eb40
Automatic changelog update
PJBot Jan 6, 2025
4103b93
Remove kessler and zombeteors gamemodes from the secret pool (#34051)
ArtisticRoomba Jan 7, 2025
c21639a
Automatic changelog update
PJBot Jan 7, 2025
74b4ff4
Added distinct ad and bye chatter to Dr. Gibb vending (#34182)
Alpaccalypse Jan 7, 2025
fe317df
Implement approved rule changes (#34233)
nikthechampiongr Jan 7, 2025
4fecf1b
Special reagents now appear in the guidebook (#34265)
Alpaccalypse Jan 7, 2025
aedd616
Automatic changelog update
PJBot Jan 7, 2025
78778f3
Fix compilation errors in tests from update (#34272)
PJB3005 Jan 7, 2025
e326e41
Fix portable scrubber appearing powered on spawn (#34274)
Tayrtahn Jan 7, 2025
5454554
[HOTFIX] Fix chameleon PDAs renaming IDs (#34249)
SlamBamActionman Jan 7, 2025
031c568
Update vessel_warning.ogg (#34263)
Pangogie Jan 8, 2025
7b69a28
Add bleating accent to goats (#34273)
Tayrtahn Jan 8, 2025
c6afeeb
Automatic changelog update
PJBot Jan 8, 2025
660ecc6
Happy New Year (#34288)
Piras314 Jan 8, 2025
39b0616
Fix empty lines in adminwho with stealthmins. (#34122)
c4llv07e Jan 8, 2025
2984847
Automatic changelog update
PJBot Jan 8, 2025
1e4d502
Automatic changelog update
PJBot Jan 9, 2025
59b2b9a
change locking to use ComplexInteraction (#34326)
deltanedas Jan 9, 2025
81c628e
Automatic changelog update
PJBot Jan 9, 2025
e0b076d
Drink titles and soda vendor consistency (#34178)
Alpaccalypse Jan 9, 2025
30ddd76
Automatic changelog update
PJBot Jan 9, 2025
153a4ee
Fix access configurator debug assert (#34330)
ScarKy0 Jan 10, 2025
f3c5321
Renamed water melon juice to watermelon juice (#34341)
Alpaccalypse Jan 10, 2025
c2cbd9a
Fix battery charging stopping just short of being full (#34028)
Errant-4 Jan 10, 2025
b6d5417
Add copy threshold button to air alarms (#34346)
southbridge-fur Jan 10, 2025
9c54193
Automatic changelog update
PJBot Jan 10, 2025
62a164e
Replace some sound PlayEntity with PlayPvs (#34317)
ElectroJr Jan 10, 2025
a784209
Fixed Forensic Gloves to be Security Contraband (#34193)
Coolsurf6 Jan 10, 2025
c9afc37
Automatic changelog update
PJBot Jan 10, 2025
a2fdc95
add large instruments to the cargo request computer (#34240)
TeenSarlacc Jan 10, 2025
daaf5c7
Automatic changelog update
PJBot Jan 10, 2025
e9c6cbe
Fix crayon losing durability on stamped paper (#34202)
themias Jan 10, 2025
979d86f
Automatic changelog update
PJBot Jan 10, 2025
192ec93
Adds a border to Oppenhopper poster (#34219)
Spessmann Jan 10, 2025
f9f2a0a
Trim trailing newlines from examine messages (#33381)
SpaceManiac Jan 10, 2025
9bd08a1
Add a popup message when ghost Boo action does nothing (#34369)
Tayrtahn Jan 10, 2025
6208d6c
fix ghost_component.ftl locale grammar (#34372)
ArtisticRoomba Jan 11, 2025
eb77deb
Let ghosts sometimes make certain devices say creepy things (#34368)
Tayrtahn Jan 11, 2025
57e38bc
Automatic changelog update
PJBot Jan 11, 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
Automatic changelog update
(cherry picked from commit fa720a05ce31467a62233d09240346120de2d335)
PJBot authored and MilonPL committed Jan 11, 2025
commit c9afc370606b574913951c1e9896365539a980a0
14 changes: 7 additions & 7 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
Entries:
- author: Ekkosangen
changes:
- message: Pizza crates and parties can now sometimes contain cotton pizza
type: Tweak
id: 7293
time: '2024-09-06T06:04:28.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/31883
- author: TheShuEd, Jaraten
changes:
- message: New Tech anomaly added to the game! it can bind devices ports, activate
@@ -3940,3 +3933,10 @@
id: 7792
time: '2025-01-10T06:55:05.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/34346
- author: Coolsurf6
changes:
- message: Made Forensic Gloves security contraband.
type: Tweak
id: 7793
time: '2025-01-10T15:01:00.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/34193