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

Merged
merged 1,155 commits into from
Jan 17, 2024
Merged

Upstream Sync #33

merged 1,155 commits into from
Jan 17, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

No description provided.

jzburda and others added 30 commits December 20, 2023 20:15
@jzburda
Fix unlocalized name deep-fried-burnt-item (#535)
9c62da3 
Fix unlocalized name

WHEW.
Automatic Changelog Update (#535)
5154bd4
@Adrian16199 @Colin-Tel
HoP gets back his armored coat (#570)
e5141b7 
* HoP gets back his amoured coat.

My beloved.

* Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

Signed-off-by: Colin-Tel <[email protected]>

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
Automatic Changelog Update (#570)
6ecfa78
@deltanedas
nerf loneop and ninja spawn rate (#586)
f8273b5 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@deltanedas
deep frier slice fix (#581)
1d5c59f 
* move SliceFoodEvent into a deltav file, move raising into Slice()

* import deltav event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@Guess-My-Name
Ectoplasm fix for normality crystals (#538)
4e8390a 
adds reagent to ectoplasm and fixes ectoplasm reagent locale
@deltanedas @DebugOk
add power sensor (#20400)
7477166 
* clean up logic gate / edge detector components

* logic gate usedelay support

* new codersprite

* PowerSensor component and system

* add power sensor

* port locale

* fix

* minecraft

* fixy

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
@PJBot @DebugOk
Automatic changelog update
7224100
@Flareguy @DebugOk
Standardizes / nerfs material sheets to 10u, no more lead in steel sh…
2ed0dce 
…eets (#22569)

* standardizes / nerfs material sheets to 10u, no more lead in steel sheets, also radium in uranium i guess

* plastic into oil

* adds phosphurous to plastic too

* OIL

* fix tests now? maybe? emo you better not be LYING... or else...
@PJBot @DebugOk
Automatic changelog update
ffc7965
@SlamBamActionman @DebugOk
Include URL in Discord bot changelog to link to the Github PR page
e070ac2 
LGTM!
@brainfood1183 @DebugOk
crystals drop shards and ore crab tweaks. (#20930)
268d9cc 
* crystals drop shards and ore crab tweaks

* crystals drop shards, shards can be crafted into colored light tubes and silver ore crab.

* crystals can now be unanchored.

* added silver crab to rock anom spawn

* fixes

* sorted out the parenting for crystal light tubes.
@lzk228 @DebugOk
fix some pdas (#22617)
42b835c
@deltanedas @DebugOk
medibot toctou gaming (#22608)
29977c7 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@deltanedas @DebugOk
fix ninja draining in no grav (#22610)
3c326f4 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@Ilya246 @DebugOk
evil pen (#22598)
18a66de
@UbaserB @DebugOk
Update the emergency shuttle Rod (#22592)
9b23dbd 
* add

* i forgor something
@UbaserB @DebugOk
add (#22597)
ee2087f
@themias @DebugOk
Fix spray nozzle (#22624)
10e71dd 
* Fix spray nozzle

* what

* no
@Bobtron @DebugOk
Add description in lathe recipe mouseover tooltip (#22621)
b3425db 
* Add description in lathe recipe mouseover tooltip

* Remove old tooltip
@Mirino97 @DebugOk
Fixes Clown Recorder causing client freeze (#22629)
13718c9
@EmoGarbage404 @DebugOk
mild reagent prototype cleanup + other misc garbage (#22630)
d4ef5be
@github-actions @PJBot @DebugOk
Update Credits (#22626)
2552b01 
Co-authored-by: PJBot <[email protected]>
@Ilya246 @DebugOk
the boxening (#22643)
eae37fd
@Blackern5000 @DebugOk
Engineering Chunk Salvage (#22529)
0e31c6b 
* Engineering Chunk

* lessmob

* shavedasteroid

* wronglockerlol
@Emisse @DebugOk
cull engineering-chunk size (#22664)
14f3500 
* cull engineering chunk size

* more
@Mirino97 @DebugOk
Replaces the broken hallelujah.ogg file with a new one (#22670)
05df25a
@TheShuEd @DebugOk
decrease hypodart cost from 3 to 2 (#22671)
edd3766
@chromiumboy @DebugOk
Adds construction effect to RCD (#22633)
098c53e
DeltaV-Bot and others added 16 commits January 11, 2024 06:14
Automatic Changelog Update (#662)
273a142
@Adrian16199 @IamVelcroboy
Shoukou update, the reckoning. (#657)
0dfd86d 
* Shoukou update, the reckoning.

Lets see if this will work.

* Deletes INVALID

I swear to god.

* A quick update.

---------

Co-authored-by: Velcroboy <[email protected]>
Automatic Changelog Update (#657)
893e025
@deltanedas
prevent shock collar clock (#665)
a4dd72a 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@DebugOk
Nerf borg AA (#672)
3fe758a 
* Nerf borg AA

* Update mics.yml
@DebugOk @TadJohnson00 @DEATHB4DEFEAT
Spare ID safe (#671)
ec51232 
* Initial commit

* Unused access level

* Update meta.json

* Update SharedBiscuitComponent.cs

* Unneeded DataField and VVAccess

Editing it in VV does nothing anyways, it wont magically unlock the item slot

* Big smart

* Add safe sprite

Thanks @TadJohnson00

Co-Authored-By: Tad "Taddy" Johnson <[email protected]>

* Prevent faxing slips

* Custom background for corperate slip

* Localize crack verb

* Update paperslips.yml

* Update paperslips.yml

* Remove default comments

* Update paperslips.yml

* Pro

* Remove default id card

* Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: Debug <[email protected]>

---------

Signed-off-by: Debug <[email protected]>
Co-authored-by: Tad "Taddy" Johnson <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Automatic Changelog Update (#671)
9f4dc00
@IamVelcroboy
Map Edits (#674)
09b05c1 
Co-authored-by: IamVelcroboy <>
@Bribrooo
Added Drain on Pebble (#669)
c7660e2
@IamVelcroboy
Map Edits- Pebble (#675)
6b9ce2e 
Co-authored-by: IamVelcroboy<>
@IamVelcroboy
Pebble Hotfix (#676)
d53b971 
Co-authored-by: IamVelcroboy<>
@DebugOk
Seperate migrations into multiple files (#673)
9c0520f 
* Allow for multiple migration files

* Split delta migrations

* Update migration.yml
@BasedPugilist @DebugOk
Update README.md
f9dd0de 
Fixed broken link to the Delta V discord

Signed-off-by: BasedPugilist <[email protected]>

Update README.md (again)

floof pointed out second missing link

Signed-off-by: BasedPugilist <[email protected]>
@DebugOk
Oh no, tracking links! (#684)
66bca14
@DEATHB4DEFEAT
Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v in…
76345d5 
…to upstream-sync-1
@DEATHB4DEFEAT
fix weird duplicates of things
eaebc7b
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Jan 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 16, 2024 •
edited
Loading

RSI Diff Bot; head commit 4f81387 merging into 3a57bb9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 4f81387

@DEATHB4DEFEAT DEATHB4DEFEAT changed the title Upstream sync 1 Upstream Sync Jan 16, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review January 17, 2024 03:28
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jan 17, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 26dc45c into master Jan 17, 2024
21 of 22 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the upstream-sync-1 branch January 17, 2024 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.