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

Goblin Species #890

Merged
merged 94 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
97800ae
base
ErhardSteinhauer Jan 19, 2024
5729946
more customization options
ErhardSteinhauer Jan 19, 2024
d0af6b4
ability to pilot, animal stomach, ai faction
ErhardSteinhauer Jan 19, 2024
6cb1490
small adjustment to dmg mods
ErhardSteinhauer Jan 19, 2024
45d1451
fix to attributions.yml
ErhardSteinhauer Jan 19, 2024
46858e1
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Jan 19, 2024
037e0f9
restored deleted lines from speech_emote_sounds.yml
ErhardSteinhauer Jan 19, 2024
fbba928
Update goblin.yml
ErhardSteinhauer Jan 19, 2024
60c0a4b
lowered asphyxiation damage taken by gobbos, attempting to make them …
ErhardSteinhauer Jan 19, 2024
e4d3c17
now goblins aren't poisoned from eating rotten meat
ErhardSteinhauer Jan 19, 2024
b6c7e2e
cooked food is poisonous for goblins now
ErhardSteinhauer Jan 19, 2024
ab7c42b
fixed small mistake
ErhardSteinhauer Jan 19, 2024
f276b45
goblinkind banner
ErhardSteinhauer Jan 21, 2024
582c523
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Jan 24, 2024
1c47fdc
fixed food ToxinGoblinSafe, remove thievery and removed some sounds
ErhardSteinhauer Jan 24, 2024
1637785
removed duped names from goblin whamen
ErhardSteinhauer Jan 24, 2024
7f3bb61
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Jan 25, 2024
d91c4bb
raw animal protein and mold is good for goblins now
ErhardSteinhauer Jan 25, 2024
c1e263a
mold is actually ok for goblins now
ErhardSteinhauer Jan 25, 2024
1b0891f
Goblin FoodSystem Part1
dvir001 Jan 25, 2024
1fb209a
Cleanup
dvir001 Jan 25, 2024
97f13f1
Update FoodSystem.cs
dvir001 Jan 25, 2024
6c95814
added Food Quality to select fiew items
ErhardSteinhauer Jan 25, 2024
515ce7f
fixed issues, started implemented Food Quality
ErhardSteinhauer Jan 25, 2024
142b921
Food System
dvir001 Jan 25, 2024
d706037
More edits to food: most cooked food has high quality
ErhardSteinhauer Jan 25, 2024
9d2974d
Reverted changes to Flavorol
ErhardSteinhauer Jan 25, 2024
b815725
Reverted chages to Flavorol even harder
ErhardSteinhauer Jan 25, 2024
7f644b1
snack wrappers are edible now, don't recommend tho
ErhardSteinhauer Jan 26, 2024
a8dd768
Goblin Mod
dvir001 Jan 26, 2024
e0bbfdd
Merge branch 'Goblin-Species' of https://github.com/ErhardSteinhauer/…
dvir001 Jan 26, 2024
e8b0e19
Food System
dvir001 Jan 26, 2024
ae82900
Food System
dvir001 Jan 27, 2024
4d52e65
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Jan 28, 2024
3374fc9
trash juices
ErhardSteinhauer Jan 28, 2024
8129d2a
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Jan 29, 2024
35183bc
trash juice fix
ErhardSteinhauer Jan 29, 2024
4c2f693
removed nutrients from the trash juice
ErhardSteinhauer Jan 30, 2024
c6d733e
Eat Trash Get Strong
dvir001 Jan 30, 2024
435d27b
raw organs are edible
ErhardSteinhauer Jan 30, 2024
01d2c02
Merge branch 'Goblin-Species' of https://github.com/ErhardSteinhauer/…
dvir001 Jan 30, 2024
3d1fd09
Tag Support
dvir001 Jan 30, 2024
2393b98
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Jan 31, 2024
ad11381
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Feb 3, 2024
39c7df6
Merge remote-tracking branch 'origin/master' into pr/890
dvir001 Feb 9, 2024
649995c
fix
dvir001 Feb 9, 2024
340d1a2
regent fix
dvir001 Feb 10, 2024
1e2c6d8
blood
dvir001 Feb 10, 2024
ca70f9a
Blood fix, again
dvir001 Feb 10, 2024
61ca9dc
Goblin trash be good
dvir001 Feb 10, 2024
6f034cd
Update Resources/Locale/en-US/_NF/reagents/physical-desc.ftl
ErhardSteinhauer Mar 5, 2024
09ef1cf
Merge branch 'master' into Goblin-Species
ErhardSteinhauer Mar 5, 2024
86938ce
Merge branch 'master' into Goblin-Species
dvir001 Mar 27, 2024
ae63687
Cleanup
dvir001 Mar 27, 2024
0a32a49
revert changes to food stuff
ErhardSteinhauer Mar 27, 2024
10f3009
ai faction fix
ErhardSteinhauer Mar 27, 2024
b0ce5df
reversed changes to mail
ErhardSteinhauer Mar 27, 2024
f05585d
Merge branch 'master' into Goblin-Species
ErhardSteinhauer Mar 30, 2024
2ef7af2
Merge branch 'master' into Goblin-Species
dvir001 Mar 31, 2024
ce78beb
Update ai_factions.yml
dvir001 Apr 2, 2024
c822a7e
doubled the word counts in goblin accent
ErhardSteinhauer Apr 2, 2024
cf74b19
Merge branch 'Goblin-Species' of https://github.com/ErhardSteinhauer/…
ErhardSteinhauer Apr 2, 2024
6f579ff
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 8, 2024
43007dd
small accent tweak
ErhardSteinhauer Apr 8, 2024
953a885
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 8, 2024
a6e55af
crafting recipe for goblinkind banner o7
ErhardSteinhauer Apr 8, 2024
2cceef7
Update goblin_organs.yml
ErhardSteinhauer Apr 8, 2024
c273cce
Merge branch 'master' into Goblin-Species
ErhardSteinhauer Apr 8, 2024
084558d
fixing things
ErhardSteinhauer Apr 8, 2024
dfb1b17
Update animal.yml
ErhardSteinhauer Apr 8, 2024
7e6693f
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 12, 2024
793cf62
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 18, 2024
3db6b98
Merge branch 'master' into Goblin-Species
ErhardSteinhauer Apr 20, 2024
8638a8d
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 21, 2024
16499cd
nfsd at it again, fixed though
ErhardSteinhauer Apr 21, 2024
703f747
fixes-fixes-fixes
ErhardSteinhauer Apr 21, 2024
2ef14e2
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 22, 2024
673afb6
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 23, 2024
df1848d
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 23, 2024
8bc4f1d
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 24, 2024
b4a9120
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 25, 2024
dd8570f
Update speech_verbs.yml
dvir001 Apr 27, 2024
d9ed5cc
Update chat_manager.ftl
dvir001 Apr 27, 2024
71f5ec7
Gabbl Gabble
dvir001 Apr 27, 2024
0829846
Sounds issues
dvir001 Apr 27, 2024
aea9260
Match DeltaV
Mar 8, 2024
42a0c1a
Makes Vulpkanin able to howl + adds some growling noises (#884)
Mar 8, 2024
fa0ff7f
We did not have license for any of this files
dvir001 Apr 27, 2024
10d5852
More fixing
dvir001 Apr 27, 2024
b2afbc8
Update ChatSystem.cs
dvir001 Apr 27, 2024
d8eaa85
Merge branch 'new-frontiers-14:master' into Goblin-Species
ErhardSteinhauer Apr 27, 2024
0567e62
Update toys.yml
dvir001 Apr 27, 2024
73536ec
Fixed a single missing disposal pipe
dvir001 Apr 27, 2024
c0f7d90
Fixed folder name
dvir001 Apr 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/Chat/Systems/ChatSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public void TrySendInGameICMessage(
}

bool shouldCapitalize = (desiredType != InGameICChatType.Emote);
bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation) && (desiredType != InGameICChatType.Emote);
bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation);
// Capitalizing the word I only happens in English, so we check language here
bool shouldCapitalizeTheWordI = (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en")
|| (CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Name == "en");
Expand Down
7 changes: 7 additions & 0 deletions Content.Server/Speech/Components/GoblinAccentComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using Content.Server.Speech.EntitySystems;

namespace Content.Server.Speech.Components;

[RegisterComponent]
[Access(typeof(GoblinAccentSystem))]
public sealed partial class GoblinAccentComponent : Component {}
31 changes: 31 additions & 0 deletions Content.Server/Speech/EntitySystems/GoblinAccentSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using Content.Server.Speech.Components;
using Robust.Shared.Random;
using System.Text.RegularExpressions;

namespace Content.Server.Speech.EntitySystems;

public sealed class GoblinAccentSystem : EntitySystem
{
[Dependency] private readonly ReplacementAccentSystem _replacement = default!;

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

SubscribeLocalEvent<GoblinAccentComponent, AccentGetEvent>(OnAccentGet);
}

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

msg = _replacement.ApplyReplacements(msg, "goblin");
return msg;
}

private void OnAccentGet(EntityUid uid, GoblinAccentComponent component, AccentGetEvent args)
{
args.Message = Accentuate(args.Message, component);
}
}
7 changes: 7 additions & 0 deletions Content.Server/_NF/Goblin/Components/GoblinComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Content.Server._NF.Goblin.Components;

[RegisterComponent]
public sealed partial class GoblinComponent : Component
{

}
32 changes: 32 additions & 0 deletions Resources/Audio/_NF/Voice/Goblin/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
license: "CC0-1.0"
copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
- files: ["goblin-cackle-04.ogg"]
license: "CC0-1.0"
copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/spookymodem/sounds/202096/"
- files: ["goblin-cackle-05.ogg"]
license: "CC-BY-4.0"
copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
source: "https://freesound.org/people/Nanakisan/sounds/253532/"
- files: ["goblin-scream-01.ogg"]
license: "CC0-1.0"
copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
license: "CC0-1.0"
copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/Duisterwho/sounds/643497/"
- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
license: "CC0-1.0"
copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
source: https://freesound.org/people/SnowFightStudios/sounds/643657/
- files: ["goblin-chatter-01.ogg"]
license: "CC0-1.0"
copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
source: https://freesound.org/people/Fenodyrie/sounds/565923/
- files: ["goblin-hiss-01.ogg"]
license: "CC-BY-4.0"
copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
32 changes: 32 additions & 0 deletions Resources/Audio/_NF/Voice/Goblin/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
- files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"]
license: "CC0-1.0"
copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/SnowFightStudios/sounds/643664/"
- files: ["goblin-cackle-04.ogg"]
license: "CC0-1.0"
copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/spookymodem/sounds/202096/"
- files: ["goblin-cackle-05.ogg"]
license: "CC BY 4.0"
copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)"
source: "https://freesound.org/people/Nanakisan/sounds/253532/"
- files: ["goblin-scream-01.ogg"]
license: "CC0-1.0"
copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/SnowFightStudios/sounds/643655/"
- files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"]
license: "CC0-1.0"
copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)"
source: "https://freesound.org/people/Duisterwho/sounds/643497/"
- files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"]
license: "CC0-1.0"
copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)"
source: https://freesound.org/people/SnowFightStudios/sounds/643657/
- files: ["goblin-chatter-01.ogg"]
license: "CC0-1.0"
copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)"
source: https://freesound.org/people/Fenodyrie/sounds/565923/
- files: ["goblin-hiss-01.ogg"]
license: "CC BY 4.0"
copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)"
source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/
Binary file removed Resources/Audio/_NF/Vulpikanin/bark.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Vulpikanin/growl1.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Vulpikanin/growl2.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Vulpikanin/growl3.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Vulpikanin/howl.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Vulpikanin/scream1.ogg
Binary file not shown.
Binary file removed Resources/Audio/_NF/Vulpikanin/scream2.ogg
Binary file not shown.
Loading
Loading