diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index 63c2ac86901..8e6a5bb57ca 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -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(); UpdateSpecialRequirements(); @@ -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; @@ -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)); diff --git a/Content.Shared/Nuclear14/CCVar/SpecialCCVars.cs b/Content.Shared/Nuclear14/CCVar/SpecialCCVars.cs index 048eed971d0..7307e00e177 100644 --- a/Content.Shared/Nuclear14/CCVar/SpecialCCVars.cs +++ b/Content.Shared/Nuclear14/CCVar/SpecialCCVars.cs @@ -6,12 +6,6 @@ namespace Content.Shared.Nuclear14.CCVar; public sealed class SpecialCCVars { - #region Human editor - - public static readonly CVarDef MaxSpecial = - CVarDef.Create("special.max", 40); - - #endregion #region Strength diff --git a/Content.Shared/Nuclear14/Special/ClothingSpecialModifierSystem.cs b/Content.Shared/Nuclear14/Special/ClothingSpecialModifierSystem.cs index fd354e370b6..30f47285c2f 100644 --- a/Content.Shared/Nuclear14/Special/ClothingSpecialModifierSystem.cs +++ b/Content.Shared/Nuclear14/Special/ClothingSpecialModifierSystem.cs @@ -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") ); } diff --git a/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen-description.ftl b/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen-description.ftl index 30b2fad3757..754e917a857 100644 --- a/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen-description.ftl +++ b/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen-description.ftl @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen.ftl b/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen.ftl index 60138f1fcf4..1579704873d 100644 --- a/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen.ftl +++ b/Resources/Locale/en-US/_Nuclear14/Special/special-character-screen.ftl @@ -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 \ No newline at end of file +humanoid-profile-editor-special-points-label = {$points} left of {$max} SPECIAL points \ No newline at end of file diff --git a/Resources/Maps/N14/sunnyvale2.yml b/Resources/Maps/N14/sunnyvale2.yml index f113c5b182b..d96cf23203c 100644 --- a/Resources/Maps/N14/sunnyvale2.yml +++ b/Resources/Maps/N14/sunnyvale2.yml @@ -184698,7 +184698,7 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: N14ClosetCabinetWoodRefilling +- proto: N14LootClosetCabinetWood entities: - uid: 7334 components: @@ -185085,7 +185085,7 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: N14ClosetDoubleRefilling +- proto: N14LootClosetDouble entities: - uid: 7354 components: @@ -185770,7 +185770,7 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: N14ClosetGrey1Refilling +- proto: N14LootClosetGrey1 entities: - uid: 7393 components: @@ -186018,7 +186018,7 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: N14ClosetGunCabinetRefilling +- proto: N14LootClosetGunCabinet entities: - uid: 7414 components: @@ -186136,7 +186136,7 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: N14ClosetRustyRefilling +- proto: N14LootClosetRusty entities: - uid: 44266 components: @@ -189045,7 +189045,7 @@ entities: - type: Transform pos: 49.5,-64.5 parent: 1 -- proto: N14CrateMilitaryRefilling +- proto: N14LootCrateMilitary entities: - uid: 7646 components: @@ -189267,7 +189267,7 @@ entities: showEnts: False occludes: True ent: null -- proto: N14CrateWastelandBotanyRefilling +- proto: N14LootCrateWastelandBotany entities: - uid: 7662 components: @@ -196337,7 +196337,7 @@ entities: - type: Transform pos: -153.5,62.5 parent: 1 -- proto: N14FilingCabinetRefilling +- proto: N14LootFilingCabinet entities: - uid: 8131 components: diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml index e73364854cc..f778925b5ca 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml @@ -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 diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml index 6a6a66241ef..f295e9e63d6 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml @@ -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 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml index 0b2ab011b62..2699aa6b426 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Conditional/timed.yml @@ -13,9 +13,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobMoleratDespawning + - N14MobMolerat chance: 0.65 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 @@ -33,9 +33,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobDogFeralDespawning + - N14MobDogFeral chance: 0.65 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 @@ -53,9 +53,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobGeckoDespawning + - N14MobGecko chance: 0.65 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 @@ -73,9 +73,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobNightstalkerCubDespawning + - N14MobNightstalkerCub chance: 0.65 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -93,9 +93,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobNightstalkerDespawning + - N14MobNightstalker chance: 0.65 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -113,9 +113,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobYaoguaiDespawning + - N14MobYaoguai chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 1 @@ -133,9 +133,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobDeathclawDespawning + - N14MobDeathclaw chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 1 @@ -153,9 +153,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobDeathclawAlbinoDespawning + - N14MobDeathclawAlbino chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 1 @@ -173,9 +173,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobDeathclawMetalDespawning + - N14MobDeathclawMetal chance: 0.65 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 1 @@ -195,9 +195,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobBloatflyDespawning + - N14MobBloatfly chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 4 @@ -215,9 +215,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobCazadorDespawning + - N14MobCazador chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -235,9 +235,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobGiantAntDespawning + - N14MobGiantAnt chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -255,9 +255,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobGiantFireAntDespawning + - N14MobGiantFireAnt chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -275,9 +275,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobRadroachDespawning + - N14MobRadroach chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 4 @@ -295,9 +295,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobRadscorpionDespawning + - N14MobRadscorpion chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -315,9 +315,9 @@ - type: Timer - type: TimedSpawner prototypes: - - N14MobRadscorpionBarkDespawning + - N14MobRadscorpionBark chance: 0.75 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 2 @@ -338,7 +338,7 @@ prototypes: - N14MobBrahmin chance: 0.95 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 @@ -358,7 +358,7 @@ prototypes: - N14MobBighorner chance: 0.95 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 @@ -378,7 +378,7 @@ prototypes: - N14MobRadstag chance: 0.95 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 @@ -398,6 +398,6 @@ prototypes: - N14MobChicken chance: 0.95 - intervalSeconds: 1200 + intervalSeconds: 2400 minimumEntitiesSpawned: 1 maximumEntitiesSpawned: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml index 840a115f69c..9a52e63911f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml @@ -251,6 +251,10 @@ - map: [ "enum.PowerCellVisualLayers.Unshaded" ] state: o2 shader: unshaded + - type: Tag + tags: + - N14PlasmaShell + - N14AmmoCell - type: Battery maxCharge: 2000 startingCharge: 2000 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml index ffcda3b259b..29805c57b10 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/50.yml @@ -2,9 +2,10 @@ noSpawn: true parent: BaseBullet id: N14Bullet50 - name: bullet (.50 anti-materiel) + name: bullet (.50 HEIAP anti-materiel) components: - type: Projectile damage: types: - Piercing: 75 + Piercing: 60 # 20% decrease in power for AP + ignoreResistances: true diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 08df22d5123..999fa9e21b4 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -233,7 +233,7 @@ # MARK: Fullauto - type: entity - name: Modified AER9 laser rifle + name: Modified AER-9 laser rifle parent: N14BaseWeaponPowerCellMedium id: N14WeaponLaserAutoRifle description: A sturdy pre-war laser rifle. Emits beams of concentrated light to kill targets. This one has been jury-rigged against common sense with a rotating barrel to fire in full auto. @@ -323,7 +323,7 @@ - FullAuto - type: entity - name: prototype AER14 laser rifle + name: prototype AER-14 laser rifle parent: N14BaseWeaponPowerCellMedium id: N14WeaponLaserProtoRifle description: A bleeding-edge, pre-war laser rifle. Extremely powerful, but eats ECPs like nothing else. diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Storage/closets.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Storage/closets.yml index 2cf5f8f463d..6e500fead47 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Storage/closets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Storage/closets.yml @@ -65,6 +65,16 @@ id: N14LootClosetGrey1 suffix: Loot,Domestic,Random +- type: entity + parent: [ N14ClosetGrey1, N14BaseLockerTimedStorageFill ] + id: N14ClosetGrey1RefillingGeneric + suffix: Refilling,Generic,Random + +- type: entity + parent: [ N14ClosetGrey1, N14BaseLockerStorageFill ] + id: N14LootGenericClosetGrey1 + suffix: Loot,Generic,Random + - type: entity id: N14ClosetGrey2 parent: N14ClosetBaseW @@ -82,6 +92,16 @@ id: N14LootClosetGrey2 suffix: Loot,Domestic,Random +- type: entity + parent: [ N14ClosetGrey2, N14BaseLockerTimedStorageFill ] + id: N14ClosetGrey2RefillingGeneric + suffix: Refilling,Generic,Random + +- type: entity + parent: [ N14ClosetGrey2, N14BaseLockerStorageFill ] + id: N14LootGenericClosetGrey2 + suffix: Loot,Generic,Random + - type: entity parent: N14ClosetBaseW id: N14ClosetRusty @@ -101,6 +121,16 @@ id: N14LootClosetRusty suffix: Loot,Domestic,Random +- type: entity + parent: [ N14ClosetRusty, N14BaseLockerTimedStorageFill ] + id: N14ClosetRustyRefillingGeneric + suffix: Refilling,Generic,Random + +- type: entity + parent: [ N14ClosetRusty, N14BaseLockerStorageFill ] + id: N14LootGenericClosetRusty + suffix: Loot,Generic,Random + - type: entity parent: N14ClosetBaseW id: N14ClosetGunCabinet @@ -116,9 +146,9 @@ suffix: Refilling,Military,Random - type: entity - parent: [ N14ClosetGunCabinet, N14StorageFillDomestic ] + parent: [ N14ClosetGunCabinet, N14BaseMilitaryStorageFill ] id: N14LootClosetGunCabinet - suffix: Loot,Domestic,Random + suffix: Loot,Military,Random - type: entity parent: N14ClosetBaseW @@ -167,6 +197,16 @@ id: N14LootClosetDouble suffix: Loot,Domestic,Random +- type: entity + parent: [ N14ClosetDouble, N14BaseLockerTimedStorageFill ] + id: N14ClosetDoubleRefillingGeneric + suffix: Refilling,Generic,Random + +- type: entity + parent: [ N14ClosetDouble, N14BaseLockerStorageFill ] + id: N14LootGenericClosetDouble + suffix: Loot,Generic,Random + # Wooden Closets - type: entity @@ -226,6 +266,21 @@ - type: Sprite sprite: _Nuclear14/Structures/Storage/Closets/closetgeneric.rsi +- type: entity + parent: [ N14ClosetGeneric, N14BaseLockerStorageFill ] + id: N14LootClosetGeneric + suffix: Loot,Generic,Random + +- type: entity + parent: [ N14ClosetGeneric, N14BaseMilitaryStorageFill ] + id: N14LootMilitaryClosetGeneric + suffix: Loot,Military,Random + +- type: entity + parent: [ N14ClosetGeneric, N14BaseMilitaryTimedStorageFill ] + id: N14ClosetGenericRefillingMilitary + suffix: Refilling,Military,Random + # Wallmounted Closets - type: entity id: N14ClosetWallMedicabinet diff --git a/Resources/Prototypes/_Nuclear14/Special/specials.yml b/Resources/Prototypes/_Nuclear14/Special/specials.yml index 54a1b3c0924..5bfbcc1ddcf 100644 --- a/Resources/Prototypes/_Nuclear14/Special/specials.yml +++ b/Resources/Prototypes/_Nuclear14/Special/specials.yml @@ -1,49 +1,49 @@ # Special prototypes used in Character creation screen - type: special id: Strength - name: Strength + name: special-character-creation-strength description: special-character-creation-description-strength icon: "SpecialIconStrength" order: 0 - type: special id: Perception - name: Perception - description: special-character-creation-description-perception + name: special-character-creation-perception + description: special-character-creation-perception icon: "SpecialIconPerception" order: 1 - type: special id: Endurance - name: Endurance + name: special-character-creation-endurance description: special-character-creation-description-endurance icon: "SpecialIconEndurance" order: 2 - type: special id: Charisma - name: Charisma + name: special-character-creation-charisma description: special-character-creation-description-charisma icon: "SpecialIconCharisma" order: 3 - type: special id: Intelligence - name: Intelligence + name: special-character-creation-intelligence description: special-character-creation-description-intelligence icon: "SpecialIconIntelligence" order: 4 - type: special id: Agility - name: Agility + name: special-character-creation-agility description: special-character-creation-description-agility icon: "SpecialIconAgility" order: 5 - type: special id: Luck - name: Luck + name: special-character-creation-luck description: special-character-creation-description-luck icon: "SpecialIconLuck" order: 6 diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi/equipped-OUTERCLOTHING.png index 8f05b3bb209..6bd91331848 100644 Binary files a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi/equipped-OUTERCLOTHING.png index 344d24ef64c..56f0a3aaed7 100644 Binary files a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-1.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-1.png index dd46f742545..b7fe8583b62 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-1.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-2.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-2.png index 682ca1e88ce..cddd8b5b58f 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-2.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-3.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-3.png index 4de0daa4f72..0c1f2ce9ff5 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-3.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-4.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-4.png index 0c86de2afe4..b9240a4d83b 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-4.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-1.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-1.png index dd46f742545..b7fe8583b62 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-1.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-2.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-2.png index 682ca1e88ce..cddd8b5b58f 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-2.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-3.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-3.png index 4de0daa4f72..0c1f2ce9ff5 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-3.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-4.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-4.png index 0c86de2afe4..b9240a4d83b 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-4.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/base.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/base.png index 9e9f52205c2..65d86cf1ea8 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/base.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/base.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/icon.png index 793e6d187ff..ccaf4fcf6aa 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/icon.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/mag-0.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/mag-0.png index 931fd8aadf9..d4defe939ca 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/mag-0.png and b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi/mag-0.png differ