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 merge 9 #207

Merged
merged 45 commits into from
Aug 13, 2023
Merged

Upstream merge 9 #207

merged 45 commits into from
Aug 13, 2023

Conversation

TheArturZh
Copy link
Member

Описание PR

мерж обнов от оффов
фиксы боргов, починены и включены колясочники

Медиа

Проверки

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

Изменения

🆑 TheArturZh

  • add: Добавлены обновы от оффов

SpaceRox1244 and others added 30 commits August 13, 2023 00:50
@SpaceRox1244
PKA resprite (space-wizards#19024)
7de1ced 
* Changed all PKA sprites, added wield sprites, modified meta.json

* Added animation assets for future yaml'ing. Made changes to existing textures.

* meta.json changes

* Corrected arsenal.yml missing sprite

* Removed unused animation assets.

* Put back the one animation asset I was suppose to keep.
@PJBot
Automatic changelog update
82180fd
@TaralGit @metalgearsloth
(Re)Adds open bolt animations for gun sprites (space-wizards#17219)
8acac89 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <[email protected]>
@PJBot
Automatic changelog update
551de79
@Partmedia
Remove atmos device dependency on game timer (space-wizards#18847)
d7fa5b7
@Emisse
box update (space-wizards#19055)
2a5387f
@Emisse
bagel update (space-wizards#19058)
3cea7f2
@metalgearsloth
Add whitelist check to hand gathering (space-wizards#19053)
9bd47c0
@metalgearsloth
Nerf pickaxe + drill slightly (space-wizards#19056)
8fb38b7 
I already nerfed its damage from before (at least non-structural) but this nerfs it slightly more.
@metalgearsloth
Fix bolt-less gun cycling (space-wizards#19051)
3fc81bc 
Oop.
@metalgearsloth
Fix bolt-open for debug swep (space-wizards#19057)
8d0d09b 
Me when I don't run tests on the final commit.
@LightVillet
Fixing spilling empty containers (space-wizards#19048)
6edd731 
Co-authored-by: LightVillet <dev@null>
@EmoGarbage404
Borg tweaks (space-wizards#19046)
812ccea 
* borg tweaks

* wahoo
add spare men + adjust up one row (space-wizards#19047)
22ece21
@Doru991
Botany tweaks vol. 2.5 (space-wizards#19039)
3af1cc0 
* Buff nutriment on plants

* Super composting buff

* 1984 pt. 2

* Use standard function
@Nimfar11
Secret door (space-wizards#19023)
998c6f3 
* secret door

* oops
@Errant-4
bola buff (space-wizards#18998)
1ff125a
@PJBot
Automatic changelog update
ef74060
@Doru991
Vehicle stun/sleep immunity fix (space-wizards#18962)
a554ad2 
* Fix stuns on vehicles

* Unicycle 1984

* Fix sleeping and driving

* Discard that too
@PJBot
Automatic changelog update
16336d1
@potato1234x
Fix inconsistent vending machine sprites (space-wizards#18953)
2b6cbda 
* fixe

* updatery
@PJBot
Automatic changelog update
e38d000
@Errant-4
Light laser (space-wizards#18950)
bfa6b3b 
* Light laser

* Migration
@Ilya246
bloodred magboots buff (space-wizards#18948)
642d9b0 
* bloodred jetboots

* fix actionbar
@brainfood1183
Holoclown (clown only) syndicate uplink item. (space-wizards#18966)
ae5dcba 
* Holoclown (clown only) syndicate uplink item.

* added clumsy to holoclown

* holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting.

* gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.
@PJBot
Automatic changelog update
ca9b632
@Errant-4
Laser namechange and some buffs (space-wizards#18951)
7527036 
* Laser naming

* More laser changes
@chromiumboy
Add guidebook entries for the access configurator and installing airl…
0c8973d 
…ock security upgrades (space-wizards#18983)

* Adds guidebook entries for the access configurator and installing airlock security upgrades

* Moved the guidebook entry on airlock security to be under engineering
@PJBot
Automatic changelog update
3028e0e
@CrigCrag
pyrotechnic metabolism updates (space-wizards#18947)
88f7ba0 
* Update pyrotechnic.yml

* Update chemicals.yml

* Update cleaning.yml bleach

* bleach makes you SCREAM

* decrease phlogiston poison damage to 1
PJBot and others added 15 commits August 13, 2023 03:23
@PJBot
Automatic changelog update
3ab6e99
@CrigCrag
Make jugs printable and bigger (space-wizards#18941)
e6b8d18 
* Update medfab recipes

add jug

* Update chemical-containers.yml

* Update chemical-containers.yml again

what if it was 25

* Update medical.yml yet again

reduce cost

* Update chemical-containers.yml again

* Update medical.yml

remove name for recipe since it seems redundant as its ID is jug anyways
@CrigCrag
chemical elements metabolism updates (space-wizards#18949)
2c4ca38 
* Update elements.yml

* Update gases.yml

niteogen is an element

* Update elements.yml

just make chlorine 2u

* fix le dumb mistake

i added another metabolisms:

* copper, mercury, lithium changes 

copper: very budget lead, does poison damage very slowly over time, not good enough to kill effectively but drinking a lot of it will poison you slowly over time, just like real copper poisoning!

mercury: halved damage

lithium: now vaguely simulates brain damage by very weakly poisoning you slowly and making you laugh and scream randomly while metabolizing. slower metab rates
@CrigCrag
make acids hurt more (space-wizards#18938)
ade5cac 
* Update toxins.yml

* Update toxins.yml

rework how acids do damage. they now metabolize at a rate of 3.0, but deal a lot of damage.

* make polytrinic require plasma

polytrinic acid now requires plasma to make

* add comments to indicate acid design
@Vordenburg
Support weighted tile variantize (space-wizards#18940)
1df6508 
* Support weighted tile variantize

* Remove unused using

* Use an array
@PJBot
Automatic changelog update
18c8d81
@Doru991
Fix stamina indicator on rejuvenate (space-wizards#18914)
c90de7c
@Vordenburg
Specify drawdepth layers for some objects (space-wizards#18917)
cd80ba3 
* Specify drawdepth layers for some objects

TV, buttons, timers, levers.

* Fix line placement
@Morb0
Wheelchair fixes (space-wizards#18901)
fb5f8da 
* Remove netsync

* Replace OnStartup with OnMapInit

* Dont remove component

* Remove component ensure

* Remove using

* Cancel all moving or stand events

* Fix description

* Revert "Replace OnStartup with OnMapInit"

This reverts commit 5b7470d.

* Remove stand events cancel
@Emisse
Revert "Disable wheelchair trait (space-wizards#18896)" (space-wizard…
f1af1ba 
…s#19062)

This reverts commit 68018ee.
@PixelTheKermit
Arachnid rework (space-wizards#18631)
f189b73 
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
@PJBot
Automatic changelog update
b8aea4c
@Emisse
Update migration.yml (space-wizards#19063)
6fd3d3a
@Emisse
fix bagel cringe (space-wizards#19064)
2a042b2
@TheArturZh
Merge branch 'master' of https://github.com/space-wizards/space-stati…
b9b38e9 
…on-14 into upstream-merge-9
@github-actions github-actions bot added Changes: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml" labels Aug 13, 2023
@github-actions
Copy link

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

Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi

State Old New Status
inhand-left Modified
inhand-right Modified
empty Removed
gun Removed
animation-icon Added
equipped-BELT Added
icon Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Structures/Machines/VendingMachines/atmosdrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/chefdrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/chemdrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/engidrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/genedrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/hydrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/janidrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/medidrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/robodrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/scidrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/secdrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/syndiedrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Structures/Machines/VendingMachines/virodrobe.rsi

State Old New Status
broken Modified
off Modified

Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi

State Old New Status
holoclown Added
holoclown_base Added
holoclown_flare Added

Resources/Textures/Objects/Fun/figurines.rsi

State Old New Status
holoclown Added

Resources/Textures/Objects/Materials/silk.rsi

State Old New Status
icon Added

Resources/Textures/Objects/Tiles/web.rsi

State Old New Status
icon Added

Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi

State Old New Status
bolt-open Added

Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

State Old New Status
bolt-open Added

Resources/Textures/Structures/Doors/secret_door.rsi

State Old New Status
assembly Added
closed Added
closing Added
open Added
opening Added

Resources/Textures/Structures/Furniture/Web/bed.rsi

State Old New Status
icon Added

Resources/Textures/Structures/Furniture/Web/chair.rsi

State Old New Status
icon Added

Resources/Textures/Structures/Furniture/Web/table.rsi

State Old New Status
full Added
state_0 Added
state_1 Added
state_2 Added
state_3 Added
state_4 Added
state_5 Added
state_6 Added
state_7 Added

Resources/Textures/Structures/Walls/web.rsi

State Old New Status
full Added
wall0 Added
wall1 Added
wall2 Added
wall3 Added
wall4 Added
wall5 Added
wall6 Added
wall7 Added

@TheArturZh
Copy link
Member Author

Оффы опять уронили тесты

@TheArturZh TheArturZh merged commit 551f1c5 into SerbiaStrong-220:master Aug 13, 2023
11 of 13 checks passed
@TheArturZh TheArturZh deleted the upstream-merge-9 branch October 4, 2023 22:08
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: Localization Изменение затронуло файлы ".ftl" Changes: Map Изменение затронуло файлы ".yml" в неймспейсе "maps" Changes: Sprites Изменение затронуло файлы ".rsu / .png" Changes: UI Изменение затронуло файлы ".xaml"
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.