Upstream sync #1559
Merged
Upstream sync #1559
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* microwave can be turned on with signal * update prototype * mapinit * init for storage --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
People using soap spears and darts too often as weapon. It shouldnt have better vomit chance than ipecac
* add * fix
…es and belt (#21456)
* Update chemistry-bottles.yml **
* fix unfilled susbox slots * small susbox cleanup --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* chemistry bag better storage * large beaker and drink bottles are normal size *
Co-authored-by: deltanedas <@deltanedas:kde.org>
* license.txt to attributions.yml * update
* convert main folder file * convert items/medical * convert items/handcuffs * change items/attributions.yml * fix items/handcuffs/attributions.yml
* Added a crack overlay for directional windows. Added directional window crack components to windows, reinforced windows, plasma windows and reinforced plasma windows. * Changed the copyright information with the files I actually used. * Updated the copyright further.
* Shield * minor sprite changes and buffs * structure buff * Crafting stuff * tweaks * 88-88 * Better web pocket sprites. * yeah it's fine now.
* DB texture on back changed * cheese * test * CR20 Syndie Sling * NT slings implemented * finished SMGS, starting on Laser Weapons * added more laser slings * laser weapons done * small changes to laser weapons and pie cannon slings * added chinalake and l6 slings * finished launcher catagory, almost finished rifle catagory * almost done, just missing the heavy sniper * Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af * all slings done * added copyright to the .meta files * Revert "cheese" This reverts commit a1f7ac7b70709a6789a7b6fc0dc00a2c0734b83a. * fixed sln file, in theory at least
# Conflicts: # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/equipped-HAND.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/icon.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png # Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json # Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png # Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-BACKPACK.png # Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-BACKPACK.png
Morb0
pushed a commit
that referenced
this pull request
Nov 14, 2023
Co-authored-by: lzk <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Медиа
Проверки
Изменения