Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cyberpunk themed clothes and armor #1262

Merged
merged 123 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from 122 commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
5fcca0d
accent, acid res coat
ErhardSteinhauer Apr 2, 2024
a43da10
bugfixes
ErhardSteinhauer Apr 2, 2024
963fcda
raincoat color variants
ErhardSteinhauer Apr 3, 2024
6ba82b4
more jackets
ErhardSteinhauer Apr 3, 2024
504e9d0
accent fix
ErhardSteinhauer Apr 3, 2024
ffe76da
Merge branch 'master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 23, 2024
c033606
Merge branch 'master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 23, 2024
ec4e2be
armor and more jackets
ErhardSteinhauer Apr 23, 2024
c4e82f0
umbrella
ErhardSteinhauer Apr 24, 2024
a0b3bab
procedural punk croptop lol
ErhardSteinhauer Apr 24, 2024
356dc88
palette
ErhardSteinhauer Apr 24, 2024
f68758e
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 25, 2024
eb95ff9
Merge branch 'master' into 2024-04-03-Punk-Stuff
dvir001 Apr 27, 2024
e5c956b
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 27, 2024
8b55ade
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 29, 2024
1c1f24e
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 29, 2024
0e79da8
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Apr 29, 2024
3c7fea0
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 4, 2024
5cb2252
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 7, 2024
4a71cfa
colored baseball bat test
ErhardSteinhauer May 7, 2024
8c83073
more jumpsuits, some fixes
ErhardSteinhauer May 7, 2024
1103c6a
graffiti holoprojector
ErhardSteinhauer May 7, 2024
914b7e2
graffiti
ErhardSteinhauer May 7, 2024
7af50dc
graffiti2
ErhardSteinhauer May 7, 2024
acb35fb
graffiti rework
ErhardSteinhauer May 7, 2024
d31ba61
air alarm graffiti, drawdepth
ErhardSteinhauer May 7, 2024
0196783
procedural jackets, vendomats
ErhardSteinhauer May 7, 2024
8474cf3
procedural armor vests
ErhardSteinhauer May 7, 2024
c4b9f67
procedural boots and belt
ErhardSteinhauer May 7, 2024
4a39abe
fixes, gang faction
ErhardSteinhauer May 7, 2024
bf2071d
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 8, 2024
6aa5006
fix attempt
ErhardSteinhauer May 8, 2024
59a064e
fixed clothes and mobs
ErhardSteinhauer May 8, 2024
21266a6
more jacket pieces
ErhardSteinhauer May 8, 2024
c3c0148
more graffiti
ErhardSteinhauer May 8, 2024
437393a
more graffiti
ErhardSteinhauer May 8, 2024
1681964
punk mob chatter, vandalized vendomats ads
ErhardSteinhauer May 8, 2024
8639fcd
split palette, gas mask, goggles, fixes
ErhardSteinhauer May 9, 2024
ee6ace2
more jacket visuals
ErhardSteinhauer May 9, 2024
2d1bf2d
small fix for jackets
ErhardSteinhauer May 9, 2024
dfb9a87
armor visuals update
ErhardSteinhauer May 10, 2024
bcf93bc
belt resprite
ErhardSteinhauer May 10, 2024
6318946
exped faction, heavy armor, accent adjustments
ErhardSteinhauer May 10, 2024
53851db
loot randomization - now mobs feel like looters
ErhardSteinhauer May 11, 2024
4d51f73
reverted baseball bat
ErhardSteinhauer May 12, 2024
f8549ae
huh?
ErhardSteinhauer May 15, 2024
aae4652
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 15, 2024
3b68b77
test loadout for contractor
ErhardSteinhauer May 15, 2024
961980f
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 15, 2024
b2cf354
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 15, 2024
0e8e03a
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 16, 2024
11a89fb
more drip to loadouts
ErhardSteinhauer May 16, 2024
cc24409
accent update
ErhardSteinhauer May 16, 2024
97db294
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 17, 2024
1d5d0c8
Merge branch 'master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 18, 2024
b98d6bd
Merge branch 'master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer May 20, 2024
2d98e4e
jumpsuits with shorts
ErhardSteinhauer May 21, 2024
cb61efa
Merge branch '2024-04-03-Punk-Stuff' of https://github.com/ErhardStei…
ErhardSteinhauer May 21, 2024
fc752b1
Merge branch 'master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 1, 2024
32a52a7
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 2, 2024
dc025f8
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 5, 2024
addbe21
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 6, 2024
51d9096
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 10, 2024
f5de40d
procedural armor sprites expanded
ErhardSteinhauer Jun 10, 2024
fa93bcf
resolving conflicts part one
ErhardSteinhauer Jun 14, 2024
684a0ba
Merge branch 'master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 14, 2024
1cf9eb4
fixes
ErhardSteinhauer Jun 14, 2024
f12fab1
loadouts name update, infoshades buff
ErhardSteinhauer Jun 14, 2024
92d2859
fixes
ErhardSteinhauer Jun 14, 2024
3f9d01b
fixes
ErhardSteinhauer Jun 14, 2024
aa25c23
renamed loadouts option
ErhardSteinhauer Jun 14, 2024
3fb14b0
more fixes
ErhardSteinhauer Jun 14, 2024
2496d2c
tweaks
ErhardSteinhauer Jun 14, 2024
57f899e
small fix
ErhardSteinhauer Jun 14, 2024
cb03b43
a bit of cleanup
ErhardSteinhauer Jun 14, 2024
f08d59b
bundled: exped guns spawn change
ErhardSteinhauer Jun 14, 2024
a26571f
umbrella to loadouts
ErhardSteinhauer Jun 14, 2024
c9962f5
dummy inhadn sprites
ErhardSteinhauer Jun 14, 2024
c5a8529
fixing exped gangers
ErhardSteinhauer Jun 14, 2024
607ac0d
fixed weapon pool for gangers
ErhardSteinhauer Jun 14, 2024
3817397
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 15, 2024
d4ba7a9
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
6bc741b
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
1f8a001
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
d18abd7
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
5d738cf
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
f392a4a
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
5494c27
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
a95132f
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
575e43b
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 15, 2024
e560f95
Update Resources/Locale/en-US/_NF/advertisements/mobchatter/spacepunk…
ErhardSteinhauer Jun 16, 2024
5d62e8d
Update Resources/Locale/en-US/_NF/advertisements/vending/vandalizedbo…
ErhardSteinhauer Jun 16, 2024
2d1e177
Update Resources/Locale/en-US/_NF/advertisements/vending/vandalizedcl…
ErhardSteinhauer Jun 16, 2024
cdbe8ac
Update Resources/Prototypes/_NF/Entities/Objects/Tools/umbrella.yml
ErhardSteinhauer Jun 16, 2024
30d5868
Update Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojecto…
ErhardSteinhauer Jun 16, 2024
6c71506
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 16, 2024
00316aa
Update Resources/Locale/en-US/_NF/accent/streetpunk_accent.ftl
ErhardSteinhauer Jun 16, 2024
87e0ddc
Update Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots_punk.yml
ErhardSteinhauer Jun 16, 2024
7007ce3
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
6151695
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
1677d4d
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
586945c
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
4d29aef
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
afdf105
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
4fb88b0
fixes
ErhardSteinhauer Jun 16, 2024
c90bc40
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
b598f93
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
13f6db8
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
a72b7b5
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
97ec532
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
84d7fcf
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
eceadd7
Update Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats…
ErhardSteinhauer Jun 16, 2024
fa4a533
icon scaling for some clothes
ErhardSteinhauer Jun 16, 2024
0a23e83
Merge branch '2024-04-03-Punk-Stuff' of https://github.com/ErhardStei…
ErhardSteinhauer Jun 16, 2024
5d34829
Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff
ErhardSteinhauer Jun 16, 2024
0153b37
small fix
ErhardSteinhauer Jun 16, 2024
b7214e9
Merge branch '2024-04-03-Punk-Stuff' of https://github.com/ErhardStei…
ErhardSteinhauer Jun 16, 2024
87c5656
Update Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml
ErhardSteinhauer Jun 16, 2024
0e368cd
Update Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml
ErhardSteinhauer Jun 16, 2024
5b1a169
factions relationship
ErhardSteinhauer Jun 16, 2024
e8f1d15
Merge branch '2024-04-03-Punk-Stuff' of https://github.com/ErhardStei…
ErhardSteinhauer Jun 16, 2024
be89ef3
Merge branch 'master' of https://github.com/dvir001/frontier-station-…
dvir001 Jun 16, 2024
f5d3e1a
Move
dvir001 Jun 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions Content.Server/Speech/Components/StreetpunkAccentComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Content.Server.Speech.Components
{
[RegisterComponent]
public sealed partial class StreetpunkAccentComponent : Component
{
}
}
41 changes: 41 additions & 0 deletions Content.Server/Speech/EntitySystems/StreetpunkAccentSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
using Content.Server.Speech.Components;
using Robust.Shared.Random;
using System.Text.RegularExpressions;

namespace Content.Server.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
Loading