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

Рыжий ап #314

Merged
merged 3 commits into from
Jun 16, 2024
Merged

Рыжий ап #314

merged 3 commits into from
Jun 16, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Jun 16, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

Leander-0 and others added 3 commits June 17, 2024 00:42
* accent, acid res coat

* bugfixes

* raincoat color variants

* more jackets

* accent fix

* armor and more jackets

* umbrella

* procedural punk croptop lol

* palette

* colored baseball bat test

* more jumpsuits, some fixes

* graffiti holoprojector

* graffiti

* graffiti2

* graffiti rework

* air alarm graffiti, drawdepth

* procedural jackets, vendomats

* procedural armor vests

* procedural boots and belt

* fixes, gang faction

* fix attempt

* fixed clothes and mobs

* more jacket pieces

* more graffiti

* more graffiti

* punk mob chatter, vandalized vendomats ads

* split palette, gas mask, goggles, fixes

* more jacket visuals

* small fix for jackets

* armor visuals update

* belt resprite

* exped faction, heavy armor, accent adjustments

* loot randomization - now mobs feel like looters

* reverted baseball bat

* huh?

* test loadout for contractor

* more drip to loadouts

* accent update

* jumpsuits with shorts

* procedural armor sprites expanded

* resolving conflicts part one

* fixes

* loadouts name update, infoshades buff

* fixes

* fixes

* renamed loadouts option

* more fixes

* tweaks

* small fix

* a bit of cleanup

* bundled: exped guns spawn change

* umbrella to loadouts

* dummy inhadn sprites

* fixing exped gangers

* fixed weapon pool for gangers

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/advertisements/mobchatter/spacepunkhumanoidmob.ftl

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

* Update Resources/Locale/en-US/_NF/advertisements/vending/vandalizedbountyvend.ftl

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

* Update Resources/Locale/en-US/_NF/advertisements/vending/vandalizedclothesmate.ftl

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

* Update Resources/Prototypes/_NF/Entities/Objects/Tools/umbrella.yml

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

* Update Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl

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

* Update Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* fixes

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats_punk.yml

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

* icon scaling for some clothes

* small fix

* Update Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml

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

* Update Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml

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

* factions relationship

* Move

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
@Vonsant Vonsant closed this Jun 16, 2024
@Vonsant Vonsant reopened this Jun 16, 2024
@Vonsant Vonsant merged commit 6bc49c7 into Corvax-Frontier:master Jun 16, 2024
25 of 28 checks passed
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.

4 participants