Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Up070624 #275

Merged
merged 11 commits into from
Jun 7, 2024
Merged

Up070624 #275

merged 11 commits into from
Jun 7, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jun 7, 2024

  • Небольшой ребаланс крабиков
  • Добавлен новый скафандр для наёмников
  • Резиновые пули могут быть созданы в Техфабе ДСБФ
  • Посылки теперь обладают гораздо большей ценностью (примерно в 10 раз ценнее обычного), но при этом появляются сильно реже.
  • Резиновые пули добавлены в продажу

Cheackraze and others added 11 commits June 7, 2024 10:50
…-14#1445)

* phase 1

* Suit and extra loadout options for merc

* inhand update

* Update mercenary_loadout_groups.yml

* Update hardsuit-helmets.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
)

* Nonlethal Vending Machine (Practice Rounds & Etc)

* Updated

* Updated

* Added the Restocking

* Update meta.json

* Cleanup

* Update eject-unshaded.png

* Fixup

---------

Co-authored-by: Dvir <[email protected]>
* Brown Flat Cap in Loadouts

## About the PR
This PR adds the brown flat cap to the loadouts for the contractor, pilot, and mercenary.
## Why / Balance
The grey flat cap is available in the loadouts but the brown one was conspicuously absent (and I need a cool hat that matches my outfit).
## Media
![](https://files.catbox.moe/unsvyu.png)
![](https://files.catbox.moe/vi8osp.png)

* Update stationrep_loadout_groups.yml

---------

Co-authored-by: Dvir <[email protected]>
* MailUp

* Update base_mail.yml

* Update base_mail.yml

* Update MailTeleporterComponent.cs

* Update MailComponent.cs

* Update base_mail.yml

* Update base_mail.yml

* Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml

Sure

Co-authored-by: Whatstone <[email protected]>

---------

Co-authored-by: Whatstone <[email protected]>
@Vonsant Vonsant merged commit 203a7ce into master Jun 7, 2024
14 checks passed
@Vonsant Vonsant deleted the up070624 branch June 7, 2024 18:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants