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.

Sign up for GitHub

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

Upstream #19

Merged
merged 6 commits into from
Jul 27, 2024
Merged

Upstream #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9593be7
Special follow up (#404)
SpaceCowboyServer Jul 26, 2024
22c061a
Adds basic guns to domestic / Adds loot variety lockers (#405)
BlueHNT Jul 26, 2024
7bd2339
Minor fixes (#407)
BlueHNT Jul 26, 2024
fa88dce
some sprite fixes (#406)
PatoGrone Jul 26, 2024
d90565a
removed despawning mobs and changed spawn time to 40 minutes.
Peptide90 Jul 26, 2024
20322b7
Merge remote-tracking branch 'origin/master'
Peptide90 Jul 26, 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
8 changes: 4 additions & 4 deletions Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
// Nuclear14 Special
#region Specials

_tabContainer.SetTabTitle(5, Loc.GetString("humanoid-profile-editor-specials-tab"));
_tabContainer.SetTabTitle(6, Loc.GetString("humanoid-profile-editor-specials-tab"));
_specialPriorities = new List<SpecialPrioritySelector>();
UpdateSpecialRequirements();

Expand Down Expand Up @@ -807,8 +807,8 @@ private void UpdateSpecialRequirements()
_specialList.DisposeAllChildren();
_specialPriorities.Clear();

var points = _configurationManager.GetCVar(SpecialCCVars.MaxSpecial);
_specialPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label", ("points", points), ("max", points));
var points = 40;
_specialPointsLabel.Text = Loc.GetString("humanoid-profile-editor-special-points-label", ("points", points), ("max", points));
_specialPointsBar.MaxValue = points;
_specialPointsBar.Value = points;

Expand Down Expand Up @@ -1416,7 +1416,7 @@ private void UpdateJobPriorities()
// Nuclear14 Special
private void UpdateSpecialPriorities()
{
var points = _configurationManager.GetCVar(SpecialCCVars.MaxSpecial);
var points = 40;
_specialPointsBar.Value = points;
_specialPointsLabel.Text = Loc.GetString("humanoid-profile-editor-special-points-label", ("points", _specialPointsBar.Value), ("max", _specialPointsBar.MaxValue));

Expand Down
6 changes: 0 additions & 6 deletions Content.Shared/Nuclear14/CCVar/SpecialCCVars.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ namespace Content.Shared.Nuclear14.CCVar;
public sealed class SpecialCCVars
{

#region Human editor

public static readonly CVarDef<int> MaxSpecial =
CVarDef.Create("special.max", 40);

#endregion

#region Strength

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Nuclear14/Special/ClothingSpecialModifierSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private void OnClothingVerbExamine(EntityUid uid, ClothingSpecialModifierCompone
component,
msg,
Loc.GetString("clothing-special-examinable-verb-text"),
"/Textures/Interface/VerbIcons/outfit.svg.192dpi.png",
"/Textures/Interface/examine-star.png",
Loc.GetString("clothing-special-examinable-verb-message")
);
}
Expand Down
11 changes: 10 additions & 1 deletion Resources/Locale/en-US/_Nuclear14/Special/special-character-screen-description.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,13 @@ special-character-creation-description-endurance = Modifies your HP
special-character-creation-description-charisma = Gives you accent if below 3
special-character-creation-description-intelligence = Modifies medicine
special-character-creation-description-agility = Agility
special-character-creation-description-luck = Gives you 1% chance to pass bullet
special-character-creation-description-luck = Gives you 1% chance to pass bullet

# Title of Special labels in character creation screen
special-character-creation-strength = Strength
special-character-creation-perception = Perception
special-character-creation-endurance = Endurance
special-character-creation-charisma = Charisma
special-character-creation-intelligence = Intelligence
special-character-creation-agility = Agility
special-character-creation-luck = Luck
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_Nuclear14/Special/special-character-screen.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ humanoid-profile-editor-special-priority-ten-button = 10

humanoid-profile-editor-specials-tab = Special

humanoid-profile-editor-special-points-label = {$points} left of {$max} points
humanoid-profile-editor-special-points-label = {$points} left of {$max} SPECIAL points
16 changes: 8 additions & 8 deletions Resources/Maps/N14/sunnyvale2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184698,7 +184698,7 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: N14ClosetCabinetWoodRefilling
- proto: N14LootClosetCabinetWood
entities:
- uid: 7334
components:
Expand Down Expand Up @@ -185085,7 +185085,7 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: N14ClosetDoubleRefilling
- proto: N14LootClosetDouble
entities:
- uid: 7354
components:
Expand Down Expand Up @@ -185770,7 +185770,7 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: N14ClosetGrey1Refilling
- proto: N14LootClosetGrey1
entities:
- uid: 7393
components:
Expand Down Expand Up @@ -186018,7 +186018,7 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: N14ClosetGunCabinetRefilling
- proto: N14LootClosetGunCabinet
entities:
- uid: 7414
components:
Expand Down Expand Up @@ -186136,7 +186136,7 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: N14ClosetRustyRefilling
- proto: N14LootClosetRusty
entities:
- uid: 44266
components:
Expand Down Expand Up @@ -189045,7 +189045,7 @@ entities:
- type: Transform
pos: 49.5,-64.5
parent: 1
- proto: N14CrateMilitaryRefilling
- proto: N14LootCrateMilitary
entities:
- uid: 7646
components:
Expand Down Expand Up @@ -189267,7 +189267,7 @@ entities:
showEnts: False
occludes: True
ent: null
- proto: N14CrateWastelandBotanyRefilling
- proto: N14LootCrateWastelandBotany
entities:
- uid: 7662
components:
Expand Down Expand Up @@ -196337,7 +196337,7 @@ entities:
- type: Transform
pos: -153.5,62.5
parent: 1
- proto: N14FilingCabinetRefilling
- proto: N14LootFilingCabinet
entities:
- uid: 8131
components:
Expand Down
117 changes: 117 additions & 0 deletions Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,123 @@
prob: 0.1
- id: N14JunkWonderglue
prob: 0.1
- id: N14WeaponLeverCarbine
prob: 0.05
orGroup: Weapon
- id: N14WeaponSniperHunting
prob: 0.05
orGroup: Weapon
- id: N14WeaponLeverRifle
prob: 0.05
orGroup: Weapon
- id: N14WeaponPipeRifle
prob: 0.1
orGroup: Weapon
- id: N14weapon12mmpipe
prob: 0.05
orGroup: Weapon
- id: N14weapon10mmpipe
prob: 0.05
orGroup: Weapon
- id: N14WeaponSniperVarmint
prob: 0.3
orGroup: Weapon
- id: N14WeaponDoubleBarrelShotgun
prob: 0.5
orGroup: Weapon
- id: N14WeaponShotgun
prob: 0.01
orGroup: Weapon
- id: N14WeaponCaravanShotgun
prob: 0.4
orGroup: Weapon
- id: N14WeaponLeverShotgun
prob: 0.1
orGroup: Weapon
- id: N14WeaponRevolver9mm
prob: 0.6
orGroup: Weapon
- id: N14WeaponRevolver10mm
prob: 0.01
orGroup: Weapon
- id: N14WeaponRevolverMagnun
prob: 0.05
orGroup: Weapon
- id: N14WeaponPistol9mm
prob: 0.05
orGroup: Weapon
- id: N14WeaponPistol10mm
prob: 0.05
orGroup: Weapon
- id: N14WeaponPistolColt
prob: 0.05
orGroup: Weapon
- id: N14WeaponPipe10mm
prob: 0.1
orGroup: Weapon
- id: N14WeaponPistol22lr
prob: 0.3
orGroup: Weapon
- id: N14WeaponLaserPistol
prob: 0.01
orGroup: Weapon
- id: N14MagazinePistol9mm
prob: 0.4
orGroup: Ammunition
- id: MagazineBox9mm
prob: 0.2
orGroup: Ammunition
- id: N14MagazinePistol10mm
prob: 0.4
orGroup: Ammunition
- id: N14MagazineSMG10mm
prob: 0.2
orGroup: Ammunition
- id: MagazineBox10mm
prob: 0.1
orGroup: Ammunition
- id: N14MagazinePistol12mm
prob: 0.2
orGroup: Ammunition
- id: N14MagazineSMG12mm
prob: 0.2
orGroup: Ammunition
- id: MagazineBox12
prob: 0.1
orGroup: Ammunition
- id: N14MagazineShotgun12
prob: 0.2
orGroup: Ammunition
- id: MagazineBox12gauge
prob: 0.1
orGroup: Ammunition
- id: N14MagazineShotgun20
prob: 0.2
orGroup: Ammunition
- id: MagazineBox20gauge
prob: 0.1
orGroup: Ammunition
- id: N14MagazinePistol22lr
prob: 0.2
orGroup: Ammunition
- id: MagazineBox22
prob: 0.1
orGroup: Ammunition
- id: N14MagazinePistol45
prob: 0.2
orGroup: Ammunition
- id: MagazineBox45
prob: 0.1
orGroup: Ammunition
- id: MagazineBox44
prob: 0.1
orGroup: Ammunition
- id: MagazineBox45
prob: 0.1
orGroup: Ammunition
- id: MagazineBox308
prob: 0.1
orGroup: Ammunition
- id: N14CurrencyCap
prob: 0.9
orGroup: Currency
Expand Down
117 changes: 117 additions & 0 deletions Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,123 @@
prob: 0.1
- id: N14JunkWonderglue
prob: 0.1
- id: N14WeaponLeverCarbine
prob: 0.05
orGroup: Weapon
- id: N14WeaponSniperHunting
prob: 0.05
orGroup: Weapon
- id: N14WeaponLeverRifle
prob: 0.05
orGroup: Weapon
- id: N14WeaponPipeRifle
prob: 0.1
orGroup: Weapon
- id: N14weapon12mmpipe
prob: 0.05
orGroup: Weapon
- id: N14weapon10mmpipe
prob: 0.05
orGroup: Weapon
- id: N14WeaponSniperVarmint
prob: 0.3
orGroup: Weapon
- id: N14WeaponDoubleBarrelShotgun
prob: 0.5
orGroup: Weapon
- id: N14WeaponShotgun
prob: 0.01
orGroup: Weapon
- id: N14WeaponCaravanShotgun
prob: 0.4
orGroup: Weapon
- id: N14WeaponLeverShotgun
prob: 0.1
orGroup: Weapon
- id: N14WeaponRevolver9mm
prob: 0.6
orGroup: Weapon
- id: N14WeaponRevolver10mm
prob: 0.01
orGroup: Weapon
- id: N14WeaponRevolverMagnun
prob: 0.05
orGroup: Weapon
- id: N14WeaponPistol9mm
prob: 0.05
orGroup: Weapon
- id: N14WeaponPistol10mm
prob: 0.05
orGroup: Weapon
- id: N14WeaponPistolColt
prob: 0.05
orGroup: Weapon
- id: N14WeaponPipe10mm
prob: 0.1
orGroup: Weapon
- id: N14WeaponPistol22lr
prob: 0.3
orGroup: Weapon
- id: N14WeaponLaserPistol
prob: 0.01
orGroup: Weapon
- id: N14MagazinePistol9mm
prob: 0.4
orGroup: Ammunition
- id: MagazineBox9mm
prob: 0.2
orGroup: Ammunition
- id: N14MagazinePistol10mm
prob: 0.4
orGroup: Ammunition
- id: N14MagazineSMG10mm
prob: 0.2
orGroup: Ammunition
- id: MagazineBox10mm
prob: 0.1
orGroup: Ammunition
- id: N14MagazinePistol12mm
prob: 0.2
orGroup: Ammunition
- id: N14MagazineSMG12mm
prob: 0.2
orGroup: Ammunition
- id: MagazineBox12
prob: 0.1
orGroup: Ammunition
- id: N14MagazineShotgun12
prob: 0.2
orGroup: Ammunition
- id: MagazineBox12gauge
prob: 0.1
orGroup: Ammunition
- id: N14MagazineShotgun20
prob: 0.2
orGroup: Ammunition
- id: MagazineBox20gauge
prob: 0.1
orGroup: Ammunition
- id: N14MagazinePistol22lr
prob: 0.2
orGroup: Ammunition
- id: MagazineBox22
prob: 0.1
orGroup: Ammunition
- id: N14MagazinePistol45
prob: 0.2
orGroup: Ammunition
- id: MagazineBox45
prob: 0.1
orGroup: Ammunition
- id: MagazineBox44
prob: 0.1
orGroup: Ammunition
- id: MagazineBox45
prob: 0.1
orGroup: Ammunition
- id: MagazineBox308
prob: 0.1
orGroup: Ammunition
- id: N14CurrencyCap
prob: 0.9
orGroup: Currency
Expand Down
Loading
Loading