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.

Sign up for GitHub

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

Jump to bottom

Upstream sync #1626

Merged
merged 81 commits into from
Dec 11, 2023
Merged

Upstream sync #1626

merged 81 commits into from
Dec 11, 2023

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Dec 11, 2023

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

metalgearsloth and others added 30 commits December 11, 2023 01:11
@metalgearsloth
Remove gas tank throwing damage (#22296)
75580db
@PJBot
Automatic changelog update
b457ce7
@PJB3005
High-latency DB testing stuff (#22282)
46e3693
@Errant-4
Don't allow disarm on incapacitated targets (#22298)
664d2b1
@deltanedas
small food slicing cleanup (#22291)
90786a5 
* component cleanup

* slice system cleanup

* thank you entprotoid

* webedit 1

* webedit 2

* bruh this shitcode has sliceable food with no slice

* ok no persistence

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@Dutch-VanDerLinde
fix monkey pull (#22280)
aaad3bc
@Nairodian
Welder Blindness Effect Increase (#22304)
3589ad9
@PJBot
Automatic changelog update
b4f0a77
@EmoGarbage404
Make items' default rotation orient them correctly (#22258)
09dbb24
@KittenColony
Medical Gauze Markings (#22245)
94d81d1
@PJBot
Automatic changelog update
add5236
@DanSAussieITS
Add PercussionInstrument tag to Woodblock (#21874)
4eb7a8c
@EmoGarbage404
Fix hand order (#22306)
e1c9358
@Simyon264
Cooler zombie moths (#21744)
bd3bea1
@PJBot
Automatic changelog update
6b7f1d2
@TheKilk
Added 7 textures of winter boots for each department. (#21810)
4dc0927
@PJBot
Automatic changelog update
07d8b14
@Sirionaut
Animals obey conservation of matter unless they are undead (#21922)
c095b7c
@PJBot
Automatic changelog update
76d64ac
@Partmedia
Make pipes leak when destroyed (#20928)
6444f7b 
This plugs a meta where atmos techs were fireaxing pipes to remove them without leaking their contents.
@PJBot
Automatic changelog update
dceb9fe
@UbaserB
Janitorial Bomb Suit (#22244)
923bbfb 
* add

* add cargo purchase

* fix

* it works

* do not map
@PJBot
Automatic changelog update
94c31d7
@Emisse
technical storage board spawner (#22314)
5cf38a6
@metalgearsloth
Fix planet command being ran on existing maps (#21775)
342b084
@nok-ko
Fix Glorfcode (#22271)
1b5e503
@PJBot
Automatic changelog update
aca2859
@metalgearsloth
Update submodule to 190.1.0 (#22317)
ddec7a1
@UbaserB
Two variations of human scars (#21895)
423c9fa 
* add

* fix
@PJBot
Automatic changelog update
bfee259
Emisse and others added 17 commits December 11, 2023 04:33
@Emisse
saltern update (#22337)
93760bc
@QuietlyWhisper
give beer goggles solution scanning (#22321)
c34ede3
@QuietlyWhisper
Add Emergency Shotgun Cabinet (#21419) (#22327)
2fa023a 
* add emergency shotgun

* yml parent cleanup
@MACMAN2003
Add jensen glasses (#22323)
7232a94 
* jensen glasses

* added to maint pool

* removed hamster variants
@PJBot
Automatic changelog update
0b43ca0
@PJBot
Automatic changelog update
cf3a5fe
@EmoGarbage404
Even spaced hotbar (#22252)
b37b988 
* Fix spacing on hotbar

* more tweaksies
@Emisse
delete kettle files (#22338)
000c776 
* delete kettle file

* Delete Resources/Prototypes/Maps/kettle.yml

* bitch
@metalgearsloth
Revert "Shuffle body container subs slightly (#21084)" (#22339)
1cea524 
This reverts commit eb49ad1.
@metalgearsloth
Remove gas prices temporarily (#22285)
8b2579d 
Until
1. Atmos gets actual content parity to ss13.
2. Exploits are fixed.
3. Prices are nerfed.
@PJBot
Automatic changelog update
12dc894
@asperger-sind
the petahning (#22343)
29f3f2a
@Errant-4
Add missing changelog entry (#22344)
96e8e2f
@PJBot
Automatic changelog update
e45e862
@willicassi
Update guidebook botany entry (#22351)
45b12cd 
* update botany guidebook entry; now includes basics of job, hydroponics tray, and seed extractor.

* fixed spacing issue

* update text colors to match referenced light colors
@PJBot
Automatic changelog update
2b5fd0e
@Morb0
Merge remote-tracking branch 'upstream/master' into upstream-sync
29a7082 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/military.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
@Morb0 Morb0 requested a review from ficcialfaint as a code owner December 11, 2023 18:57
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design labels Dec 11, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 11, 2023 •
edited
Loading

RSI Diff Bot; head commit f74957c merging into e771d8e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Head/Helmets/janitor_bombsuit.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/OuterClothing/Suits/janitor_bombsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after f74957c

@Morb0 Morb0 merged commit 5e1f077 into master Dec 11, 2023
12 checks passed
@Morb0 Morb0 deleted the upstream-sync branch December 11, 2023 20:26
Morb0 pushed a commit that referenced this pull request Dec 13, 2023
@lzk228
Translate Upstream #1626 #1629 (#1638)
40ca6fb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ficcialfaint ficcialfaint Awaiting requested review from ficcialfaint ficcialfaint is a code owner

Assignees
No one assigned
Labels
Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.