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 #2677

Merged
merged 89 commits into from
Oct 15, 2024
Merged

Upstream sync #2677

merged 89 commits into from
Oct 15, 2024

Conversation

Morb0
Copy link
Member

@Morb0 Morb0 commented Oct 15, 2024

Описание PR

Почему / Баланс

Технические детали

Медиа

Требования

Критические изменения

Список изменений

BackeTako and others added 30 commits October 4, 2024 17:18
@BackeTako
Marathon Removed double walls and a wrong cable (#32603)
db64ad9 
removed double walls and cable fucks
@Spessmann
Cog engineering DIY update (#32651)
2287df1 
engineers forced to do work, sobbing
@slarticodefast
fix light bulbs not fitting into the trash bag (#32452)
eb4e422 
fix trash
@PJBot
Automatic changelog update
386e59b
@Spessmann
Cog update fix (#32657)
126c178 
* fixes for cog

* ok fixed that
@JustArt1m
Add flowers to loadout (#32097)
867efe8 
* Add_Poppy&Lily

* Add_FlowerWreath

* Add_Headflowers

Sprites, meta, prototype

* Id_Changes

* Changes

* Update_Sprite

* Desc_Change

* Scale_Change

* Sprite_Scaling
@PJBot
Automatic changelog update
35fc1b4
@Golinth
Fully Revert Clown Waddling (#32652)
46a2eb5 
Fully revert Clown Waddling (revival of #29161)

A sad day, see #29156 for discussion
@PJBot
Automatic changelog update
a6c468b
@Scribbles0
oasis update (#32679)
6b10e00 
sec apcs and ai core wiring
@PJB3005
Move client dumpentities command to "DEBUG" (#32687)
eecbfb6
@SaphireLattice
Change minibomb to be explosion resistant and start timer on damage (…
f22f9e3 
…#32429)

* Make minibomb explosion resistant and trigger timer on damage

* Tune damage behaviour and threshold for minibomb
@PJBot
Automatic changelog update
34df781
@UbaserB
Update Core (#32665)
38fd54a 
* add

* remove invalids

* fix

* yes
@lzk228
Fix cryo locale again (#32654)
33042b0 
* Fix cryo locale again

* yeep
@shampunj
Fix cloth dupe (#32685)
922dd0b 
Update curtains.yml
@PJBot
Automatic changelog update
1f04117
@azloserbits
Added proper capitalisation for supervisors when entering the game (#…
0e0887b 
…32683)

changed punctuation for jobs, added proper capitalization and comma usa
@Plykiya
Replace the Librarian's round-start D10 with a D20 (#32648)
1366f6b 
Replace D10 with a D20
@PJBot
Automatic changelog update
28f576d
@K-Dynamic
CHIMP and APE particle speed increase (#32690)
6f9b4f4 
* swap omega and delta particle colours

* remove upgrade doafter

* explicit syndicate chip description

* Syndicate CHIMP stealth

* fast projectile speed

* 10 to 12 shots

* buff heat dmg

* upgrade chip mentions omega particle

* Revert "remove upgrade doafter"

This reverts commit 8a321980b7a384daca06215656494e0c116e7333.

* Revert "explicit syndicate chip description"

This reverts commit c803c773739a61fc5b3a6cb90810622a6d5846c9.

* Revert "Syndicate CHIMP stealth"

This reverts commit 698a108580892addabf8d51494a72e1ee651b8e6.

* Revert "10 to 12 shots"

This reverts commit 858ac0392be0549eb0a288648413d1020cabae1a.

* Revert "swap omega and delta particle colours"

This reverts commit 4c000b2f110a5d35f317cb61cb5b03ea32841ad5.

* Revert "buff heat dmg"

This reverts commit 02a8690dafbd41631b098e51ef9afba5b6ee6ac4.
@PJBot
Automatic changelog update
dc2899c
@beck-thompson
Add pumpkin pie! (#32623)
384ff7e 
* first commit

* Licence fix

* rosysyntax licence change (permission granted!)

* simplify

* Better wording
@PJBot
Automatic changelog update
357e998
@PJB3005
Update submodule to v236.1.0 (#32704)
1dbbf31
@SlamBamActionman
Add admin log for codewords (#32531)
ddaa0e8 
* initial commit

* Delta review
@PJBot
Automatic changelog update
b657aba
@lzk228
fix typo (#32712)
d450b61
@beck-thompson
Decrease price of radio jammer from 4 tc -> 3 tc (#32472)
5a41cc8 
* First commit

* increase price by one tc
@PJBot
Automatic changelog update
fc1c709
metalgearsloth and others added 20 commits October 14, 2024 14:54
@metalgearsloth @irismessage
Jobreq format (#32806)
71c9894 
* Format job requirements as hours and minutes

* Use TimeSpan.ToString for playtime instead of custom method

* wehflicts

---------

Co-authored-by: jmcb <[email protected]>
@PJBot
Automatic changelog update
dd6433c
@ElectroJr
Remove inaccurate admin log when moving a held item (#32525)
30ada26 
Remove inaccurate admin log when switching held item
@ElectroJr
Add IsQueuedForDeletion checks to interaction system (#32526)
97f6097
@notquitehadouken @metalgearsloth
cleanup melee (#32486)
9b71757 
* it removes warns ig

* Quick fix

---------

Co-authored-by: metalgearsloth <[email protected]>
@Gamer3107 @metalgearsloth
Fixed portal artifacts targeting the Ai (#32677)
9069135 
* Added checks to not target AIs and people in containers

* made the change to use IsEntityInContainer. Much Better!

* returned old Mindquerry and removed wrong use of admin logger

* guard statment

* removed unnecessery refs and fixed position swap

* Minor change

---------

Co-authored-by: metalgearsloth <[email protected]>
@PJBot
Automatic changelog update
a7339a5
@ScarKy0
Cyborg module action icons (#32505)
5be82d2 
* Init

* added jani and medical

* + sci and service modules

* + syndi modules

* fixing up

* geiger counter stuff
@metalgearsloth
Fix tech anomaly nexttimer (#32805)
573f490
@PJBot
Automatic changelog update
f5ab4f5
@scrivoy
Marathon: Add EVA Helmets to Perma and add Disposal Unit front of Atm…
8c17624 
…os (#32799)

add: EVA helmets to perma, disposals bin atmos
@muburu
organ sprite touch-ups (#32762)
6654e00 
* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands
@ada-please
Arcade Prize Additions (#32309)
a7741fe 
* rearranged existing arcade rewards for clarity and added more

* removed tesla toy

* removed plushie throngler

* removed singularity toy, readded tesla toy

* removed tesla toy again :(

* Readded accidentally removed PlushieRainbowLizard
@PJBot
Automatic changelog update
7532d6f
@K-Dynamic
Adds nitrogen to engi tank dispenser (#32565)
7e2c6ea 
nitrogen to engi tank dispenser
@PJBot
Automatic changelog update
d871313
@Morb0
Merge remote-tracking branch 'wizards/master' into upstream-sync
0eba25c 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
@Morb0
Fix upstream
7488560
@Morb0
Merge branch 'master' into upstream-sync
70c93b5
@Morb0
Update locale
807791c
@Morb0 Morb0 requested a review from ficcialfaint as a code owner October 15, 2024 15:50
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Changes: Localization Can be reviewed or fixed by people who are knowledgeable with translation labels Oct 15, 2024
@Morb0 Morb0 merged commit 5c487f1 into master Oct 15, 2024
12 of 13 checks passed
@Morb0 Morb0 deleted the upstream-sync branch October 15, 2024 16:23
lzk228 added a commit to lzk228/space-station-14 that referenced this pull request Oct 16, 2024
@lzk228
Upstream translate space-syndicate#2677
7ea7903
lzk228 added a commit that referenced this pull request Oct 23, 2024
@lzk228 @NotSoDana @lapatison
Upstream translate #2677 (#2685)
5460f41 
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: lapatison <[email protected]>
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.