Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into Nearsighted_trait
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian16199 authored Oct 18, 2023
2 parents a876f10 + bc21367 commit 079e9b7
Show file tree
Hide file tree
Showing 30 changed files with 24,440 additions and 21,891 deletions.
26 changes: 19 additions & 7 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
"Changes: Sprites":
- '**/*.rsi/*.png'
"Changes: C#":
- "**/*.cs"

"Changes: Documentation":
- "**/*.xml"
- "**/*.md"

"Changes: Localization":
- 'Resources/Locale/**/*.ftl'

"Changes: Map":
- 'Resources/Maps/*.yml'
- 'Resources/Prototypes/Maps/*.yml'
- "Resources/Maps/**/*.yml"
- "Resources/Prototypes/Maps/**/*.yml"

"Changes: Sprite":
- "**/*.rsi/*.png"
- "**/*.rsi/*.json"

"Changes: UI":
- '**/*.xaml*'
- "**/*.xaml*"

"No C#":
- all: ["!**/*.cs"]
"Changes: YML":
- any: ["**/*.yml"]
all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
2 changes: 1 addition & 1 deletion .github/workflows/conflict-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
- name: Check for Merge Conflicts
uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
with:
dirtyLabel: "Merge Conflict"
dirtyLabel: "Status: Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
2 changes: 1 addition & 1 deletion Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private void OnShareButtonPressed()
var stringName = _menu.NameInput.Text;
var name = (stringName.Length <= 25 ? stringName.Trim() : $"{stringName.Trim().Substring(0, 25)}...");
article.Name = name;
article.Content = stringContent;
article.Content = stringContent.Substring(0, Math.Min(stringContent.Length, 32768));
article.ShareTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);

_menu.ContentInput.TextRope = new Rope.Leaf(string.Empty);
Expand Down
223 changes: 223 additions & 0 deletions Content.Server/DeltaV/NPC/Roboisseur/RoboisseurComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
using Robust.Shared.Prototypes;

namespace Content.Server.Roboisseur.Roboisseur
{
[RegisterComponent]
public sealed class RoboisseurComponent : Component
{
[ViewVariables]
[DataField("accumulator")]
public float Accumulator = 0f;

[ViewVariables(VVAccess.ReadOnly)]
[DataField("impatient")]
public Boolean Impatient { get; set; } = false;

[ViewVariables]
[DataField("resetTime")]
public TimeSpan ResetTime = TimeSpan.FromMinutes(10);

[DataField("barkAccumulator")]
public float BarkAccumulator = 0f;

[DataField("barkTime")]
public TimeSpan BarkTime = TimeSpan.FromMinutes(1);

[ViewVariables(VVAccess.ReadWrite)]
public EntityPrototype DesiredPrototype = default!;

[DataField("demandMessages")]
public IReadOnlyList<string> DemandMessages = new[]
{
"roboisseur-request-1",
"roboisseur-request-2",
"roboisseur-request-3",
"roboisseur-request-4",
"roboisseur-request-5",
"roboisseur-request-6"
};

[DataField("impatientMessages")]
public IReadOnlyList<string> ImpatientMessages = new[]
{
"roboisseur-request-impatient-1",
"roboisseur-request-impatient-2",
"roboisseur-request-impatient-3",
};

[DataField("demandMessagesTier2")]
public IReadOnlyList<string> DemandMessagesTier2 = new[]
{
"roboisseur-request-second-1",
"roboisseur-request-second-2",
"roboisseur-request-second-3"
};

[DataField("rewardMessages")]
public IReadOnlyList<String> RewardMessages = new[]
{
"roboisseur-thanks-1",
"roboisseur-thanks-2",
"roboisseur-thanks-3",
"roboisseur-thanks-4",
"roboisseur-thanks-5"
};

[DataField("rewardMessagesTier2")]
public IReadOnlyList<String> RewardMessagesTier2 = new[]
{
"roboisseur-thanks-second-1",
"roboisseur-thanks-second-2",
"roboisseur-thanks-second-3",
"roboisseur-thanks-second-4",
"roboisseur-thanks-second-5"
};

[DataField("rejectMessages")]
public IReadOnlyList<String> RejectMessages = new[]
{
"roboisseur-deny-1",
"roboisseur-deny-2",
"roboisseur-deny-3"
};

[DataField("tier2Protos")]
public List<String> Tier2Protos = new()
{
"FoodBurgerEmpowered",
"FoodSoupClown",
"FoodSoupChiliClown",
"FoodBurgerSuper",
"FoodNoodlesCopy",
"FoodMothMallow",
"FoodPizzaCorncob",
"FoodPizzDonkpocket",
"FoodSoupMonkey",
"FoodMothSeedSoup",
"FoodTartGrape",
"FoodMealCubancarp",
"FoodMealSashimi",
"FoodBurgerCarp",
"FoodMealTaco",
"FoodMothMacBalls",
"FoodSoupNettle",
"FoodBurgerDuck",
"FoodBurgerBaseball"
};

[DataField("tier3Protos")]
public List<String> Tier3Protos = new()
{
"FoodBurgerGhost",
"FoodSaladWatermelonFruitBowl",
"FoodBakedCannabisBrownieBatch",
"FoodPizzaDank",
"FoodBurgerBear",
"FoodBurgerMime",
"FoodCakeSuppermatter",
"FoodSoupChiliCold",
"FoodSoupBisque",
"FoodCakeSlime",
"FoodBurgerCrazy"
};

[DataField("robossuierRewards")]
public IReadOnlyList<String> RobossuierRewards = new[]
{
"DrinkIceCreamGlass",
"FoodFrozenPopsicleOrange",
"FoodFrozenPopsicleBerry",
"FoodFrozenPopsicleJumbo",
"FoodFrozenSnowconeBerry",
"FoodFrozenSnowconeFruit",
"FoodFrozenSnowconeClown",
"FoodFrozenSnowconeMime",
"FoodFrozenSnowconeRainbow",
"FoodFrozenCornuto",
"FoodFrozenSundae",
"FoodFrozenFreezy",
"FoodFrozenSandwichStrawberry",
"FoodFrozenSandwich",
};

[DataField("blacklistedProtos")]
public IReadOnlyList<String> BlacklistedProtos = new[]
{
"FoodMothPesto",
"FoodBurgerSpell",
"FoodBreadBanana",
"FoodMothSqueakingFry",
"FoodMothFleetSalad",
"FoodBreadMeatSpider",
"FoodBurgerHuman",
"FoodNoodlesBoiled",
"FoodMothOatStew",
"FoodMeatLizardtailKebab",
"FoodSoupTomato",
"FoodDonkpocketGondolaWarm",
"FoodDonkpocketBerryWarm",
"LockboxDecloner",
"FoodBreadButteredToast",
"FoodMothCottonSoup",
"LeavesTobaccoDried",
"FoodSoupEyeball",
"FoodMothKachumbariSalad",
"FoodMeatHumanKebab",
"FoodMeatRatdoubleKebab",
"FoodBurgerCorgi",
"FoodBreadPlain",
"FoodMeatKebab",
"FoodBreadBun",
"FoodBurgerCat",
"FoodSoupTomatoBlood",
"FoodMothSaladBase",
"FoodPieXeno",
"FoodDonkpocketTeriyakiWarm",
"FoodMothBakedCheese",
"FoodMothTomatoSauce",
"FoodMothPizzaCotton",
"AloeCream",
"FoodSnackPopcorn",
"FoodBurgerSoy",
"FoodMothToastedSeeds",
"FoodMothCornmealPorridge",
"FoodMothBakedCorn",
"FoodBreadMoldySlice",
"FoodRiceBoiled",
"FoodMothEyeballSoup",
"FoodMeatRatKebab",
"FoodBreadCreamcheese",
"FoodSoupOnion",
"FoodBurgerAppendix",
"FoodBurgerRat",
"RegenerativeMesh",
"FoodCheeseCurds",
"FoodDonkpocketHonkWarm",
"FoodOatmeal",
"FoodBreadJellySlice",
"FoodMothCottonSalad",
"FoodBreadMoldy",
"FoodDonkpocketSpicyWarm",
"FoodCannabisButter",
"FoodNoodles",
"FoodBreadMeat",
"LeavesCannabisDried",
"FoodBurgerCheese",
"FoodDonkpocketDankWarm",
"FoodSpaceshroomCooked",
"FoodMealFries",
"MedicatedSuture",
"FoodDonkpocketWarm",
"FoodCakePlain",
"DisgustingSweptSoup",
"FoodBurgerPlain",
"FoodBreadGarlicSlice",
"FoodSoupMushroom",
"FoodSoupWingFangChu",
"FoodBreadMeatXeno",
"FoodCakeBrain",
"FoodBurgerBrain",
"FoodSaladCaesar"
};
}
}
Loading

0 comments on commit 079e9b7

Please sign in to comment.