Blueshield role #253
Merged
Blueshield role #253
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
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 1cd7404 merging into 6cb779d Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi
Resources/Textures/Clothing/Back/Duffels/blueshield.rsi
Resources/Textures/Clothing/Back/Satchels/blueshield.rsi
Resources/Textures/Clothing/Ears/Headsets/blueshield.rsi
Resources/Textures/Clothing/Eyes/Glasses/blueshieldglasses.rsi
Resources/Textures/Clothing/Hands/Gloves/blueshield.rsi
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertblueshield.rsi
Resources/Textures/Clothing/Head/Hoods/Coat/hoodblueshield.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertblueshield.rsi
Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbs.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/bearbase.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/bearfbifast.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/bearg99.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi
Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Objects/Devices/pda.rsi
Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/Objects/Storage/Briefcases/blueshield_case.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/universal_rifle_mag.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/universal_rifle_mag_short.rsi
Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/saiga.rsi
Resources/Textures/Objects/Weapons/Guns/Revolvers/rsh18.rsi
Resources/Textures/Objects/Weapons/Guns/Rifles/ash9.rsi
Resources/Textures/Objects/Weapons/Guns/Shotguns/saiga.rsi
Resources/Textures/Objects/Weapons/Guns/Snipers/vssk.rsi
Resources/Textures/Structures/Storage/closet.rsi
|
MilenVolf
merged commit 5c742f8
into
Workbench-Team:arumoon-server
14 of 16 checks passed
This comment was marked as off-topic.
This comment was marked as off-topic.
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.
О запросе слияния
Был добавлен офицер синего щита, как и его снаряжение соответственно.
Почему / Баланс
Главы, чаще всего умирают в техах без вести об этом. Блющилд будет должен выполнять роль ЗАЩИТНИКА глав. Случаи противодействия антаганистам будут возникать только тогда, когда они вредят главам или самому офицеру непосредственно.
Чейнджлог
🆑 Wizord