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

Commit

Permalink
Cyberpunk themed clothes and armor (new-frontiers-14#1262)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
4 people authored Jun 16, 2024
1 parent 05d196b commit 4883e44
Show file tree
Hide file tree
Showing 351 changed files with 5,996 additions and 48 deletions.
7 changes: 0 additions & 7 deletions Content.Server/Speech/Components/GoblinAccentComponent.cs

This file was deleted.

8 changes: 8 additions & 0 deletions Content.Server/_NF/Speech/Components/GoblinAccentComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Content.Server._NF.Speech.EntitySystems;

namespace Content.Server._NF.Speech.Components;

[RegisterComponent]
[Access(typeof(GoblinAccentSystem))]
public sealed partial class GoblinAccentComponent : Component
{ }
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Content.Server._NF.Speech.Components
{
[RegisterComponent]
public sealed partial class StreetpunkAccentComponent : Component
{
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Content.Server.Speech.Components;
using Robust.Shared.Random;
using System.Text.RegularExpressions;
using Content.Server._NF.Speech.Components;
using Content.Server.Speech;
using Content.Server.Speech.EntitySystems;

namespace Content.Server.Speech.EntitySystems;
namespace Content.Server._NF.Speech.EntitySystems;

public sealed class GoblinAccentSystem : EntitySystem
{
Expand Down
42 changes: 42 additions & 0 deletions Content.Server/_NF/Speech/EntitySystems/StreetpunkAccentSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
using Content.Server._NF.Speech.Components;
using Content.Server.Speech;
using Content.Server.Speech.EntitySystems;
using System.Text.RegularExpressions;

namespace Content.Server._NF.Speech.EntitySystems;

public sealed class StreetpunkAccentSystem : EntitySystem
{
[Dependency] private readonly ReplacementAccentSystem _replacement = default!;
private static readonly Regex RegexIng = new(@"ing\b");
private static readonly Regex RegexAnd = new(@"\band\b");
private static readonly Regex RegexDve = new("d've");

public override void Initialize()
{
base.Initialize();

SubscribeLocalEvent<StreetpunkAccentComponent, AccentGetEvent>(OnAccentGet);
}

// converts left word when typed into the right word. For example typing you becomes ye.
public string Accentuate(string message, StreetpunkAccentComponent component)
{
var msg = message;

//They shoulda started runnin' an' hidin' from me! <- bit from SouthernDrawl Accent
msg = RegexIng.Replace(msg, "in'");
msg = RegexAnd.Replace(msg, "an'");
msg = RegexDve.Replace(msg, "da");

msg = _replacement.ApplyReplacements(msg, "streetpunk");


return msg;
}

private void OnAccentGet(EntityUid uid, StreetpunkAccentComponent component, AccentGetEvent args)
{
args.Message = Accentuate(args.Message, component);
}
}
Loading

0 comments on commit 4883e44

Please sign in to comment.