diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs index 09fc85be484..547716389ef 100644 --- a/Content.Server/Body/Systems/MetabolizerSystem.cs +++ b/Content.Server/Body/Systems/MetabolizerSystem.cs @@ -43,7 +43,7 @@ public override void Initialize() private void OnMapInit(Entity ent, ref MapInitEvent args) { - ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval; + ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval * (1+_random.NextFloat()); } private void OnUnpaused(Entity ent, ref EntityUnpausedEvent args) diff --git a/Content.Server/Body/Systems/StomachSystem.cs b/Content.Server/Body/Systems/StomachSystem.cs index a4c2e8292dd..3ad43e8b2a1 100644 --- a/Content.Server/Body/Systems/StomachSystem.cs +++ b/Content.Server/Body/Systems/StomachSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry.Components.SolutionManager; using Robust.Shared.Timing; using Robust.Shared.Utility; +using Robust.Shared.Random; namespace Content.Server.Body.Systems { @@ -12,6 +13,7 @@ public sealed class StomachSystem : EntitySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; public const string DefaultSolutionName = "stomach"; @@ -24,7 +26,7 @@ public override void Initialize() private void OnMapInit(Entity ent, ref MapInitEvent args) { - ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval; + ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval * (1+_random.NextFloat()); } private void OnUnpaused(Entity ent, ref EntityUnpausedEvent args) diff --git a/Content.Server/Fluids/EntitySystems/DrainSystem.cs b/Content.Server/Fluids/EntitySystems/DrainSystem.cs index a1ffd866d51..1683a650b68 100644 --- a/Content.Server/Fluids/EntitySystems/DrainSystem.cs +++ b/Content.Server/Fluids/EntitySystems/DrainSystem.cs @@ -34,9 +34,6 @@ public sealed class DrainSystem : SharedDrainSystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - private float DrainRunPeriod = 1f; // 1 second to make multiplying by DrainFrequency correct - private float Accumulator; - public override void Initialize() { base.Initialize(); @@ -44,6 +41,13 @@ public override void Initialize() SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnInteract); SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnComponentInit); + } + + private void OnComponentInit(EntityUid uid, DrainComponent component, ComponentInit args) + { + // Randomize accumulator on init to try to spread out all drain updates as much as possible. + component.Accumulator = _random.NextFloat() * component.DrainFrequency; } private void AddEmptyVerb(Entity entity, ref GetVerbsEvent args) @@ -111,14 +115,7 @@ private void Empty(EntityUid container, SpillableComponent spillable, EntityUid public override void Update(float frameTime) { - Accumulator += frameTime; - if (Accumulator < DrainRunPeriod) - { - return; - } - Accumulator -= DrainRunPeriod; - - base.Update(DrainRunPeriod); + base.Update(frameTime); var managerQuery = GetEntityQuery(); var xformQuery = GetEntityQuery(); var puddleQuery = GetEntityQuery(); @@ -127,6 +124,13 @@ public override void Update(float frameTime) var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var drain)) { + drain.Accumulator += frameTime; + if (drain.Accumulator < drain.DrainFrequency) + { + continue; + } + drain.Accumulator -= drain.DrainFrequency; + // Disable ambient sound from emptying manually if (!drain.AutoDrain) { diff --git a/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl b/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl index e5508b90e09..4c21dbc7557 100644 --- a/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl +++ b/Resources/Locale/en-US/_Nuclear14/Special/character-examine.ftl @@ -2,7 +2,7 @@ special-appearance-component-examine-charisma-very-low = { CAPITALIZE(SUBJECT($user)) } seems repulsive. special-appearance-component-examine-charisma-low = { CAPITALIZE(SUBJECT($user)) } seems awkward. special-appearance-component-examine-charisma-medium = { CAPITALIZE(SUBJECT($user)) } seems normal. -special-appearance-component-examine-charisma-high = { CAPITALIZE(SUBJECT($user)) } seem approachable. +special-appearance-component-examine-charisma-high = { CAPITALIZE(SUBJECT($user)) } seems approachable. special-appearance-component-examine-charisma-very-high = { CAPITALIZE(SUBJECT($user)) } seems suave. # Examine all special modifiers diff --git a/Resources/Locale/en-US/_Nuclear14/job-names.ftl b/Resources/Locale/en-US/_Nuclear14/job-names.ftl index 2c1b11d4f47..28219a1594f 100644 --- a/Resources/Locale/en-US/_Nuclear14/job-names.ftl +++ b/Resources/Locale/en-US/_Nuclear14/job-names.ftl @@ -28,17 +28,17 @@ job-description-caravan-leader = Coordinate the caravan company in the area and job-name-caravan-trader = Caravan Trader job-description-caravan-trader = Conduct trade missions and travel caravan routes to generate profit for the company. job-name-caravan-guard = Caravan Guard -job-description-caravan-guard = Protect the caravan company traders, their livestock and their inventory. +job-description-caravan-guard = Protect the caravan company traders, their livestock, and their inventory. # NCR job-name-ncr-cadet = NCR Cadet -job-description-ncr-cadet = Show your officers that youre ready to become a private of the NCR army. +job-description-ncr-cadet = Prove to the officers that you're ready to become a soldier of the NCR army. job-name-ncr-medic = NCR Medic -job-description-ncr-medic = Treat the troopers and offer services to the wasteland people. +job-description-ncr-medic = Treat the troops and offer services to the wasteland people. job-name-ncr-sgt = NCR Sergeant -job-description-ncr-sgt = A non-commissioned officer in the NCR military. Lead a squad to protect the NCRs interests in the region. +job-description-ncr-sgt = A non-commissioned officer in the NCR military. Lead a squad to protect the NCR interests in the region. job-name-ncr-lt = NCR Lieutenant -job-description-ncr-lt = The local leader of the NCR military. Fulfil your missions by coordinating your military forces in the area. Organise your Sergeants. +job-description-ncr-lt = The local leader of the NCR military. Fulfill your mission by coordinating your military forces in the area. Organise your Sergeants. job-name-ncr-soldier = NCR Soldier job-description-ncr-soldier = The backbone of any military. Soldiers get stuff done and follow a Sergeant on missions. job-name-ncr-engineer = NCR Engineer @@ -72,13 +72,13 @@ job-description-tribal-healer = Produce medicines and compounds for the tribe, a # Vault job-name-overseer = Vault Overseer -job-description-overseer = Follow Vault Tec's objectives in managing your Vault and ensure everything goes to plan... +job-description-overseer = Follow Vault-Tec's objectives in managing your Vault and ensure everything goes to plan... job-name-vault-doctor = Vault Doctor job-description-vault-doctor = Maintain the health and well-being of your fellow Vault Dwellers. Conduct research where necessary. job-name-vault-dweller = Vault Dweller -job-description-vault-dweller = The general populous of the Vault. Live a comfortable life and pull your own weight where necessary. +job-description-vault-dweller = The general populace of the Vault. Live a comfortable life and pull your own weight where necessary. job-name-vault-engineer = Vault Engineer -job-description-vault-engineer = Maintain the Vault and all it's vital systems to ensure a comfortable and safe life. +job-description-vault-engineer = Maintain the Vault and all its vital systems to ensure a comfortable and safe life. job-name-vault-security = Vault Security job-description-vault-security = Keep order within the Vault and report to the Overseer. For the good of the Vault! @@ -94,13 +94,13 @@ job-description-wastelander = Survive in the wasteland and carve out your own pa # Town job-name-townsperson = Townsperson -job-description-townsperson = A member of the new world society. Follow the town rules or try run for Mayor to change them. +job-description-townsperson = A member of the post-war society. Follow the town rules or try run for Mayor to change them. job-name-towndoctor = Town Doctor job-description-towndoctor = Sell your medical knowledge as a service. Treat the injured for money and manage a doctors practice in town. job-name-townmechanic = Town Mechanic job-description-townmechanic = Maintain the towns services and infrastructure and do what you can on the side for others for money. job-name-townshopkeeper = Town Shopkeeper -job-description-townshopkeeper = Setup shop in town, organise trade partnerships and sell your wares to the wanderes of the wastes. Beware the tax man. +job-description-townshopkeeper = Setup shop in town, organise trade partnerships, and sell your wares to the wanderers of the wastes. Beware the tax man. job-name-towndeputy = Town Deputy job-description-towndeputy = Deputy peacekeeper for the town. Keep the peace and provide backup to your Sheriff. job-name-townsheriff = Town Sheriff @@ -108,9 +108,9 @@ job-description-townsheriff = Maintain law and order within the town and support job-name-townmayor = Town Mayor job-description-townmayor = Maintain civilisation in the town. Set taxes and laws and try not to be thrown out or taken over. job-name-townreporter = Town Reporter -job-description-townreporter = Interview people and spread the news across the region, or just have a talk show! +job-description-townreporter = Interview people, spread the news across the region, or just have a talk show! job-name-townbartender = Town Innkeeper -job-description-townbartender = Manage the local bar, kitchen and rooms that are there for renting. Run a business in town! +job-description-townbartender = Manage the local bar, kitchen, and rooms that are there for renting. Run a business in town! # Followers job-name-followers = Followers of the Apocalypse diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index 37529e33638..3f1970f7257 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,4 @@ -# Passive Animals +#MARK: Passive Animals - type: entity name: Brahmin Spawner id: N14SpawnMobBrahmin @@ -59,7 +59,82 @@ prototypes: - N14MobRadstag -# Hostile Animals +- type: entity + name: Nuclear Beaver Spawner + id: N14SpawnMobNuclearBeaver + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/beaver.rsi + state: beaver + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobNuclearBeaver + +- type: entity + name: Nuclear Opossum Spawner + id: N14SpawnMobNuclearOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: opossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobNuclearOpossum + +- type: entity + name: Nuclear Rabbit Spawner + id: N14SpawnMobNuclearRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: rabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobNuclearRabbit + +- type: entity + name: Opossum Spawner + id: N14SpawnMobOpossum + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/opossum.rsi + state: normopossum + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobOpossum + +- type: entity + name: Normal Rabbit Spawner + id: N14SpawnMobNormRabbit + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + state: normrabbit + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRabbit + +#MARK: Hostile Animals - type: entity name: Molerat Spawner id: N14SpawnMobMolerat @@ -210,7 +285,7 @@ prototypes: - N14MobYaoguai -# Scaley Animals +#MARK: Scaley Animals - type: entity name: Deathclaw Spawner id: N14SpawnMobDeathclaw @@ -256,7 +331,7 @@ prototypes: - N14MobDeathclawMetal -# Insects +#MARK: Insects - type: entity name: Bloatfly Spawner id: N14SpawnMobBloatfly @@ -559,7 +634,7 @@ prototypes: - N14MobRaiderEnforcerMelee -# Ghoul +#MARK: Ghoul - type: entity name: Feral Ghoul Spawner id: N14SpawnMobFeralGhoul @@ -620,7 +695,7 @@ prototypes: - N14MobGhoulMaypole -# Robots +#MARK: Robots - type: entity name: Assaultron Spawner id: N14SpawnMobAssaultron diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/GodHoward b/Resources/Prototypes/_Nuclear14/Entities/Mobs/GodHoward deleted file mode 100644 index 39585a64754..00000000000 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/GodHoward +++ /dev/null @@ -1,99 +0,0 @@ -- type: entity - abstract: true - id: N14GodHoward - name: God Howard - description: "The sound echoes in your ears, 'It just works'." - components: - - type: Sprite - sprite: _Nuclear14/Mobs/GodHoward.png - drawdepth: Ghosts - scale: 2.0,2.0 - layers: - - state: narsie - shader: unshaded - -# spawn animation, spawns actual god howard when it ends -- type: entity - parent: N14GodHoward - id: N14GodHowardSpawn - suffix: Spawn - components: - - type: Sprite - layers: - - state: spawn - shader: unshaded - # spawn animation lasts 3.5 seconds - - type: TimedDespawn - lifetime: 3.5 - - type: SpawnOnDespawn - prototype: N14GodHoward - -- type: entity - parent: [MobNarsieBase, BaseMob, N14GodHoward] - id: N14GodHowardAS - components: - - type: AnnounceOnSpawn - message: todd-has-risen - sender: todd-has-risen-sender - sound: - path: Audio/Admin/Smites/you_probably_should_upgrade.ogg - color: red - - type: CargoSellBlacklist - # big todd needs to see the universe - - type: ContentEye - maxZoom: 2.0,2.0 - - type: Fixtures - fixtures: - EventHorizonCollider: - shape: - !type:PhysShapeCircle - radius: 5 - hard: false - restitution: 0.8 - density: 99999 - mask: - - AllMask - layer: - - AllMask - EventHorizonConsumer: - shape: - !type:PhysShapeCircle - radius: 5 - hard: false - mask: - - AllMask - layer: - - AllMask - - type: Input - context: "ghost" - - type: MovementIgnoreGravity - # narnar hears all - - type: IntrinsicRadioReceiver - - type: ActiveRadio - channels: - - Binary - - Common - - Command - - CentCom - - Engineering - - Medical - - Science - - Security - - Service - - Supply - - Syndicate - globalReceive: true - - type: Physics - bodyType: Dynamic - bodyStatus: InAir - - type: CanMoveInAir - # singulose components - - type: EventHorizon - radius: 5 - canBreachContainment: true - - type: GravityWell - baseRadialAcceleration: 6 - maxRange: 8 - - type: WarpPoint - follow: true - location: Nar'Sie diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/GodHoward/GodHoward.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/GodHoward/GodHoward.yml new file mode 100644 index 00000000000..67978be9c81 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/GodHoward/GodHoward.yml @@ -0,0 +1,40 @@ +- type: entity + name: God Howard + id: N14GodHoward + parent: N14MobBaseHostile + description: "'It just works'." + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: howard + sprite: _Nuclear14/Mobs/GodHoward/GodHoward.rsi + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.9 + density: 40 + mask: + - MobMask + layer: + - MobLayer + - type: MobThresholds + thresholds: + 0: alive + 100: dead + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Admin/Smites/you_probably_should_upgrade.ogg + angle: 0 + animation: WeaponArcFist + damage: + types: + Slash: 35 + range: 4 + - type: MovementSpeedModifier + baseWalkSpeed: 8 + baseSprintSpeed: 8 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index 54d673b679e..e83301d53eb 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -1235,3 +1235,141 @@ - type: HTN rootTask: task: MouseCompound + +#MARK: Beaver +- type: entity + parent: N14MobBaseSimple + id: N14MobNuclearBeaver + name: nuclear beaver + description: Wonder what kind of trees its knawed down. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: beaver + sprite: _Nuclear14/Mobs/Animals/beaver.rsi + - type: DamageStateVisuals + states: + Alive: + Base: beaver + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +#MARK: Opossum +- type: entity + parent: N14MobBaseSimple + id: N14MobNuclearOpossum + name: nuclear opossum + description: Play dead! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: opossum + sprite: _Nuclear14/Mobs/Animals/opossum.rsi + - type: DamageStateVisuals + states: + Alive: + Base: opossum + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +- type: entity + parent: N14MobBaseSimple + id: N14MobOpossum + name: opossum + description: Play dead! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: normopossum + sprite: _Nuclear14/Mobs/Animals/opossum.rsi + - type: DamageStateVisuals + states: + Alive: + Base: normopossum + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #At some point need their own meat + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +#MARK: Rabbit +- type: entity + parent: N14MobBaseSimple + id: N14MobNuclearRabbit + name: nuclear rabbit + description: Not a cotton-tail anymore, huh. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: rabbit + sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + - type: DamageStateVisuals + states: + Alive: + Base: rabbit + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal + +- type: entity + parent: N14MobBaseSimple + id: N14MobRabbit + name: rabbit + description: What a sweet little cotton-tail! + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: normrabbit + sprite: _Nuclear14/Mobs/Animals/rabbit.rsi + - type: DamageStateVisuals + states: + Alive: + Base: normrabbit + Dead: + Base: dead + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #At some point need their own meat + amount: 1 + prob: 0.95 + - type: Damageable + damageContainer: Biological + damageModifierSet: WastelandAnimal diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index f0e29ee943e..3145501d988 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -154,7 +154,7 @@ - type: entity parent: DrinkBottleBaseFull50 id: N14DrinkIrradiatedNukaColaBottleFull - name: irratiated Nuka Cola bottle + name: irradiated Nuka Cola bottle description: An unrefreshing beverage that has a extremely sugary taste. The aftertaste is bitter and burnt. components: - type: SolutionContainerManager diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml index 61f38f0c0a6..8ec5916dff4 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml @@ -6,9 +6,6 @@ - !type:CharacterSpeciesRequirement species: - Human - - !type:CharacterDepartmentTimeRequirement - department: Vault - min: 3600 # 1 hour playTimeTracker: VaultDweller startingGear: VaultDwellerGear alwaysUseSpawner: true diff --git a/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml b/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml index c29d98970ba..20526166696 100644 --- a/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml +++ b/Resources/ServerInfo/_Nuclear14/Guidebooks/Factions/factions.xml @@ -17,20 +17,20 @@ The Tribes of the local area have an important part to play in keeping the local Be it traditional or forward thinking, passive or aggressive, isolationist or ready to join the city and engage in trade. ## The Vault -The local Vault remains largely unfamiliar to the surface dwellers, just as the surface is also largely unknown to those within the Vault. The location of the Vault mostly lost to time. This underground sanctuary is lead by the Overseer who unbeknown to the Dwellers, may have an objective or experiment to carry out. +The local Vault remains largely unfamiliar to the surface dwellers, just as the surface is also largely secreted away to those within the Vault. The location of the Vault mostly lost to time. This underground sanctuary is lead by the Overseer who, unbeknownst to the Dwellers, may have an objective or experiment to carry out. ## Caravan Company -The Blue Line Co. is the main source of new resources and equipment in this region of the Wasteland. They have the supply lines setup to trade long distances which is especially useful once the local resources start to dry up. The company itself originates from Canada, but they still accept bottlecaps and NCR dollars because their caravans trade far and wide. +The Blue Line Co. is the main source of new resources and equipment in this region of the Wasteland. They have the supply lines set up to trade long distances which is especially useful once the local resources start to dry up. The company itself originates from Canada, but they still accept bottlecaps and NCR dollars because their caravans trade far and wide. If the local Blue Line station is lost or destroyed, the railway station will very likely cease to function. ## Midwestern Brotherhood -The Midwestern Brotherhood of Steel are another splinter organisation from the original Brotherhood of Steel. This land is not their home, they're here on a mission to investigate the rumors about this region's vast supplies of advanced technologies and gather intelligence on the new Washington chapter of the Brotherhood. +The Midwestern Brotherhood of Steel are another splinter organisation from the original Brotherhood of Steel. This land is not their home, but they're here on a mission to investigate the rumors about this region's vast supplies of advanced technologies and gather intelligence on the new Washington chapter of the Brotherhood. About 80 years ago, they departed from Lost Hills and established a feudal empire in their new territories. They are open to sharing its technology with their subjects if it also serves their interests. Recruiting tribals and training them is a common occurance back home, but should they continue doing that this far away? Should they trust the locals here? -### Washington Brotherhood +## Washington Brotherhood The Washington Brotherhood of Steel is a new and rising power within this region. They self-exiled from Lost Hills just a few years back. The intention of their Elder is finding the truth to the legends surrounding various advanced technologies of the former Washington state. They are an isolationist military dictatorship and came here with the intent to grow in strength while hiding in the shadows. -Their senior members sense that a storm is coming that could wipe out the entire Brotherhood - maybe humankind - and because of this they are not afraid of utalizing more dangerous & extreme technologies, knowledge that other chapters' Elders would advise to destroy. Due to this radical ideology of theirs they are no longer welcome back at Lost Hills. +Their senior members sense that a storm is coming that could wipe out the entire Brotherhood - maybe humankind - and because of this they are not afraid of utilizing more dangerous & extreme technologies, knowledge that other chapters' Elders would advise to destroy. Due to this radical ideology of theirs they are no longer welcome back at Lost Hills. diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png new file mode 100644 index 00000000000..be32fdd1491 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/beaver.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png new file mode 100644 index 00000000000..46cd7792a86 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json new file mode 100644 index 00000000000..481212bdc1c --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/beaver.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "beaver", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png new file mode 100644 index 00000000000..a67a0bd2ae5 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json new file mode 100644 index 00000000000..00355778007 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "opossum", + "directions": 4 + }, + { + "name": "normopossum", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png new file mode 100644 index 00000000000..a73df1c0876 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/normopossum.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png new file mode 100644 index 00000000000..c8a5dcb17b1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/opossum.rsi/opossum.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png new file mode 100644 index 00000000000..3290de97790 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json new file mode 100644 index 00000000000..5c625881fb3 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by ladyayla for N14", + "size": { + "x": 32, + "y": 16 + }, + "states": [ + { + "name": "rabbit", + "directions": 4 + }, + { + "name": "normrabbit", + "directions": 4 + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png new file mode 100644 index 00000000000..d6eff8d2f90 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/normrabbit.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png new file mode 100644 index 00000000000..a6977485354 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Animals/rabbit.rsi/rabbit.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/gib.png b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/gib.png new file mode 100644 index 00000000000..4549a5d5738 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/gib.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard.png b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard.png new file mode 100644 index 00000000000..7915286611c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/GodHoward.png b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard2.png similarity index 100% rename from Resources/Textures/_Nuclear14/Mobs/GodHoward.png rename to Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard2.png diff --git a/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard_dead.png b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard_dead.png new file mode 100644 index 00000000000..faa6bfb3838 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/howard_dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/meta.json new file mode 100644 index 00000000000..ff4af1cd5f2 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/GodHoward/GodHoward.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by ReginaeSpence for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "howard", + "directions": 4 + }, + { + "name": "howard_dead" + }, + { + "name": "gib", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Mobs/meta.json b/Resources/Textures/_Nuclear14/Mobs/meta.json deleted file mode 100644 index 5988232892f..00000000000 --- a/Resources/Textures/_Nuclear14/Mobs/meta.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "version": 1, - "size": { - "x": 252, - "y": 266 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b44fcdedfb7c7d8425bd75b9caf71644a86375d1/icons/obj/antags/cult/narsie.dmi", "Taken from google at https://www.meme-arsenal.com/en/create/template/1932814", - "states": [ - { - "name": "narsie", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "spawn", - "delays": [ - [ - 0.3, - 0.1, - 0.1, - 0.1, - 0.1, - 1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.2 - ] - ] - } - ] -} diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png index e4c52a60758..55f43c9b3f4 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png and b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json index 63cfc9d1b9c..959ac9bb22b 100644 --- a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json @@ -4,7 +4,7 @@ "copyright": "made by ladyayla for Nuclear 14", "size": { "x": 32, - "y": 32 + "y": 64 }, "states": [ {