search

DeltaV-Station / Delta-v

A fork of Space Station 14, embracing a mixture of classic SS13 chaos and experimentation only possible with the new engine
https://delta-v.org
GNU Affero General Public License v3.0
46 stars 203 forks source link

Add premade mercenery loadouts take 2 #1421

Open Tryded opened 1 week ago

Tryded commented 1 week ago

About the PR

merc PR 2.0, the old one got nuked

Why / Balance

Technical details

Media

Breaking changes

Changelog

github-actions[bot] commented 1 week ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 1 week ago

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

Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi

| State | Old | New | Status | --- | --- | --- | --- | | icon-flash | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/icon-flash.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/icon.png) | Added | off-equipped-HELMET-vulpkanin | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/off-equipped-HELMET-vulpkanin.png) | Added | off-equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/off-equipped-HELMET.png) | Added | off-inhand-left | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/off-inhand-left.png) | Added | off-inhand-right | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/off-inhand-right.png) | Added | on-equipped-HELMET-vulpkanin | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/on-equipped-HELMET-vulpkanin.png) | Added | on-equipped-HELMET | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/on-equipped-HELMET.png) | Added | on-inhand-left | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/on-inhand-left.png) | Added | on-inhand-right | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/Head/Hardsuits/mercenary.rsi/on-inhand-right.png) | Added

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi

| State | Old | New | Status | --- | --- | --- | --- | | equipped-OUTERCLOTHING | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png) | Added | icon | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/icon.png) | Added | inhand-left | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/inhand-left.png) | Added | inhand-right | ![]() | ![](https://raw.githubusercontent.com/Tryded/Delta-v-rebase/a46413fe29f1a818e810eced1c01efd7e6eb7869/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/inhand-right.png) | Added

Edit: diff updated after a46413fe29f1a818e810eced1c01efd7e6eb7869