Upstream sync #1454
Merged
Upstream sync #1454
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
Co-authored-by: deltanedas <@deltanedas:kde.org>
* basic station event commands * ouagh
* Solutions on thrown spears/shot arrows Spears inject their solution on thrown hit. Arrows now have 5u solution storage that is injected when it hits target. * Whoops, wrong arrow. Instead of base arrow, I accidentally modified the 'regular arrow' * spear and arrow solution graphics Spears and arrows now show what they are doped with when they are on ground. (just like beakers)
* Allow picking up items in combat mode * dont hardcode that
Co-authored-by: DrSmugleaf <[email protected]>
* bones, gladiators, milk, spear and tears *my copy/paste python script did the funny * forgor * fixed * mat.yml fixed * bones * bone armor * gladiator uniform now in clothesmate like ss13 * bone armor craft * pieces * i was dumb in the past, now im dumb too * that was dumb... * fixing stuff * i hate git * Revert "i hate git" This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f. * Revert "fixing stuff" This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3. * this will work? * i fucking merged it
…of instant round end (#19850) * ☢️🕵️💀🚫📄🚀 * 🚀📢❌📥📜 * 🔧🐛📢🚹🚉➡👑👑 * 😪 * 🧱 * 🚀🛬🕔➡️🕙 * ☢️⚙️🔵🔚🔨➡️🔵🔚⚙️ these commit names are literally evil who tf does this
* tagless fields * put embedded projectile in hand when picked up --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
This reverts commit 74901b0.
# Conflicts: # Content.Server/RoundEnd/RoundEndSystem.cs
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit f7ee847 merging into ba5d0cf Resources/Textures/Clothing/Head/Hats/gladiator.rsi
Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi
Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi
Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi
Resources/Textures/Objects/Materials/materials.rsi
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi
Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi
Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi
Resources/Textures/Objects/Weapons/Melee/spear.rsi
Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi
|
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
Медиа
Проверки
Изменения