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

Merged
merged 1,029 commits into from
May 26, 2023
Merged

Upstream #41

merged 1,029 commits into from
May 26, 2023

Conversation

rhailrake
Copy link
Collaborator

No description provided.

metalgearsloth and others added 27 commits May 16, 2023 22:55
@metalgearsloth
Remove some client IEnumerables (space-wizards#16501)
64bb57c
@metalgearsloth
Fix salvage deletion (space-wizards#16502)
e468017
@PJBot
Automatic changelog update
e5d072f
@metalgearsloth
Allow early salvage launches (space-wizards#16503)
699b581
@PJBot
Automatic changelog update
a136ed0
@PixelTheKermit
[Addition & Tweak] Arachnid sprite update and 3 new markings (space-w…
3a7416a 
…izards#16470)
@PJBot
Automatic changelog update
d064824
@Zumorica
Specify shell.nix dependencies using "packages", not "inputsFrom" (sp…
9b955c0 
…ace-wizards#16514)
@Nimfar11
Resprite the mask sexyclown (space-wizards#16512)
473c571
@PJBot
Automatic changelog update
a07f208
@EEASAS
[map] saltern update (space-wizards#16481)
c4b1547 
* Update Saltern

* Fixed chaplain not having a spawn(sorry)
@PJBot
Automatic changelog update
aa399da
@ElectroJr
Make SlotControl textures nullable (space-wizards#16519)
6269548
@nukashimika
CBURNs now actually set people on fire again (space-wizards#16518)
aec49be
@PJBot
Automatic changelog update
b61dac6
@ElectroJr
Update engine (space-wizards#16523)
0ff787c
@PJBot
Automatic changelog update
10c128d
@EmoGarbage404
Fix anomaly exceptions (Use QueueDel) (space-wizards#16524)
a1799de
@EmoGarbage404
remove passive point source from omega (space-wizards#16515)
ae926b0
@tom-leys
Firelocks only open on click (not close) (space-wizards#16516)
9fce417
@PJBot
Automatic changelog update
9ef5bd3
@DrSmugleaf
Fix "Next" never sending admin logs for rounds outside the cache, sho…
b5fe408 
…w a round's total logs on the UI (space-wizards#16531)

* Fix next never sending logs for rounds outside the cache

* Show round's total log count on the ui

* Disable next button when waiting for a next response

* Cleanup AdminLogsEui.CurrentRoundId

* Fix popout window width
@PJBot
Automatic changelog update
37977f5
@deltanedas
space glue recipe (space-wizards#16534)
fc556c6 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@PJBot
Automatic changelog update
e84728e
@Nairodian
Return Hardsuits To Lockers (space-wizards#16490)
f1cd3ef
@metalgearsloth
Proximity beeper optimisation (space-wizards#16507)
befb090
PJBot and others added 27 commits May 25, 2023 00:05
@PJBot
Automatic changelog update
d49baf1
@deltanedas
make salvage belts guaranteed instead of rng (space-wizards#16803)
4338941 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@Nairodian
Autolathe Price Adjustments (space-wizards#16798)
152034c
@potato1234x
TG Smartfrige Sprite (space-wizards#16801)
56f33bb
@McFck
Fixed target container overflow (Infinite beaker fill from mop) (spac…
daa47ff 
…e-wizards#16804)
@PJBot
Automatic changelog update
5875d5f
@deltanedas
fix nuke when arming off station (space-wizards#16702)
ab4dd10 
Co-authored-by: deltanedas <@deltanedas:kde.org>
@PJBot
Automatic changelog update
4aca798
@deltanedas
megafauna elimination mission and fish salv faction (space-wizards#16720
5c98b35 
)

Co-authored-by: deltanedas <@deltanedas:kde.org>
@PJBot
Automatic changelog update
507df81
@EmoGarbage404
fix rotting not pausing sometimes (space-wizards#16818)
b7da56d
@Kit0vras
Broken wood tiles (space-wizards#16776)
b3ac3c0 
* broken wood tiles decals

* deleting decals

* broken wood tile
@PJBot
Automatic changelog update
f4bd9d2
@Kit0vras
animals spawners (space-wizards#16771)
bf2417d
@EmoGarbage404
Tech disk 4891 (space-wizards#16752)
e62c11d 
* Tech disk gacha

* customtypeserializer
@Kit0vras
mech spawners (space-wizards#16773)
a027535
@juliangiebel
Remove devices from device lists when they get deleted (space-wizards…
2bb1fde 
…#16783)

* Implement device network device shutdown subscribtion
Implement removing devices from device lists when they get deleted

* Improve name and doc comment for DeviceShutDownEvent

* Change ShutdownSubscriber data field tag

* Change UpdateRemovalSubscription name to UpdateShutdownSubscription
@PJBot
Automatic changelog update
6960978
@Geekyhobo
Added More description to light replacer (space-wizards#16815)
e19b5c6
@PJBot
Automatic changelog update
a647b30
@juliangiebel
Remove checking for SpriteComponent on the server (space-wizards#16821)
9f3f3b4
@DrSmugleaf
Fix map renderer error when painting decals with paths that start wit…
ca8adf1 
…h /Textures (space-wizards#16822)
@QuietlyWhisper
fixes crit people being seen as dead for bleed purposes (space-wizard…
0e8ac9c 
…s#16827)
@PJBot
Automatic changelog update
30a7045
@rhailrake
Merge branch 'master' of https://github.com/space-wizards/space-stati…
d0257f5 
…on-14 into upstream

# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@rhailrake
oh, delta is removed. This why all failed...
622c851
@rhailrake
dummy commit
c20ee4b
@rhailrake
Copy link
Collaborator Author

image
LESGOOO BOYS, LETS BRING THIS SHIT ALIVE AGAIN

@rhailrake rhailrake merged commit fd9c661 into master May 26, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Map Changes: Sprites Changes: UI
Projects
None yet
Milestone
No milestone