diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index c0c665e1e2a..807c2dc93e7 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -153,7 +153,7 @@ public static readonly CVarDef /// Controls the default game preset. /// public static readonly CVarDef - GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "secret", CVar.ARCHIVE); + GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "Waves", CVar.ARCHIVE); /// /// Controls if the game can force a different preset if the current preset's criteria are not met. @@ -2105,6 +2105,6 @@ public static readonly CVarDef /// Guaranteed psionics will still go through. /// public static readonly CVarDef PsionicRollsEnabled = - CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY); + CVarDef.Create("psionics.rolls_enabled", false, CVar.SERVERONLY); } } diff --git a/Resources/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg b/Resources/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg index f031b4e1d88..4cba0bccf0e 100644 Binary files a/Resources/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg and b/Resources/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg differ diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml index ff98e134cec..971f34c13c3 100644 --- a/Resources/Credits/Patrons.yml +++ b/Resources/Credits/Patrons.yml @@ -1,58 +1,4 @@ -- Name: "weirdrock" - Tier: Captain -- Name: "Drifter Drifter" - Tier: Captain -- Name: "Bikowu" - Tier: Assistant -- Name: "Hasan al-Binabi" - Tier: Central Commander -- Name: "lleft The Dragon" - Tier: Central Commander -- Name: "Pandaconda" - Tier: Assistant -- Name: "Lazhannya" - Tier: Captain -- Name: "Bonktrauma" - Tier: Captain -- Name: "Haltell" - Tier: Captain -- Name: "Delta.Pizza" - Tier: Captain -- Name: "steph kaus" - Tier: Captain -- Name: "HyperionGM" - Tier: Central Commander -- Name: "MikeAndIkes" - Tier: Assistant -- Name: "Ashley" - Tier: Central Commander -- Name: "mura" - Tier: Captain -- Name: "Adeinitas" - Tier: Captain -- Name: "Shock" - Tier: Captain -- Name: "Dead Rabbit" - Tier: Captain -- Name: "T-Dog" - Tier: Captain -- Name: "oBerry" - Tier: Central Commander -- Name: "Wakefield" - Tier: Captain -- Name: "Hûvy" - Tier: Assistant +- Name: "mocho" + Tier: Nuclear - Name: "TheGungeonologist" - Tier: Central Commander -- Name: "Ethan" - Tier: Captain -- Name: "TeeJay Neuroth" - Tier: Captain -- Name: "Neptunia_Counseling" - Tier: Central Commander -- Name: "rosysyntax" - Tier: Assistant -- Name: "Kurzaen" - Tier: Captain -- Name: "tokie" - Tier: Central Commander + Tier: Nuclear diff --git a/Resources/Locale/en-US/Nuclear14/job-names.ftl b/Resources/Locale/en-US/Nuclear14/job-names.ftl index d270ae2a272..19f44ed0d73 100644 --- a/Resources/Locale/en-US/Nuclear14/job-names.ftl +++ b/Resources/Locale/en-US/Nuclear14/job-names.ftl @@ -1,19 +1,25 @@ # N14 -job-name-bos-mid-knight-comm = Midwest Brotherhood Knight Commander -job-description-bos-mid-knight-comm = Lead the Midwest Brotherhood of Steel on their mission. +job-name-bos-mid-paladin-comm = Midwest Brotherhood Paladin Commander +job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission. +job-name-bos-mid-paladin = Midwest Brotherhood Paladin +job-description-bos-mid-paladin = Follow the Paladin Commander on their mission. +job-name-bos-mid-knight = Midwest Brotherhood Knight +jb-description-bos-mid-knight = Follow the Paladin Commander on their mission. job-name-bos-mid-scribe = Midwest Brotherhood Scribe job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter. +job-name-bos-mid-squire = Midwest Brotherhood Squire +jb-description-bos-mid-squire = Follow your Knight into battle and do their bidding. -job-name-bos-washington-elder = Washington Brotherhood Elder -job-description-bos-washington-elder = Lead the Washington Brotherhood of Steel to glory in their mission. -job-name-bos-washington-initiate = Washington Brotherhood Initiate -job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks. -job-name-bos-washington-knight = Washington Brotherhood Knight -job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment. -job-name-bos-washington-paladin = Washington Brotherhood Paladin -job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the elders will out into the wasteland. -job-name-bos-washington-scribe = Washington Brotherhood Scribe -job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter. +job-name-bos-washington-commander = Washington Brotherhood Commander +job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission. +job-name-bos-washington-recruit = Washington Brotherhood Initiate +job-description-bos-washington-recruit = Prove yourself to your chapter to progress through the ranks. +job-name-bos-washington-soldier = Washington Brotherhood Knight +job-description-bos-washington-soldier = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment. +job-name-bos-washington-captain = Washington Brotherhood Captain +job-description-bos-washington-captain = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland. +job-name-bos-washington-researcher = Washington Brotherhood Scribe +job-description-bos-washington-researcher = Conduct scientific missions and research for your brotherhood chapter. job-name-caravan-leader = Caravan Leader job-description-caravan-leader = Coordinate the caravan company in the area and strike up trade deals with the locals. @@ -31,6 +37,13 @@ job-description-ncr-officer = A local leader in the NCR military. Fulfil your mi job-name-ncr-soldier = NCR Soldier job-description-ncr-soldier = The backbone of any military. Soldiers get stuff done and follow an NCO on missions. +job-name-ranger-recruit = Ranger Recruit +job-description-ranger-recruit = You've just been accepted within the Desert Rangers. Prove yourself worthy by learning the ropes and helping the wasteland become a better place. +job-name-ranger-ranking = Ranger +job-description-ranger-ranking = As an Ranger, you are the vigilante the wasteland needs. Your mission is to keep the wasteland safe for the innocent and bring justice to the raider gangs, as well as continuing the tradition of stopping slavery in it's tracks. +job-name-ranger-veteran = Veteran Ranger +job-description-ranger-veteran = You answer to yourself, working either independently or with your team to complete your mission objectives however required, operating either alone, in a squad or with one of the other factions. Your primary mission is to improve the situation of the wasteland and to neutralize slavers and raiders operating in the area. + job-name-tribal = Tribesperson job-description-tribal = Maintain your tribes way of life in the wasteland at all costs. Security, crafting, wellbeing, homelife, you do it all. job-name-tribal-elder = Tribe Elder @@ -59,7 +72,7 @@ job-name-wastelander = Wastelander job-description-wastelander = Survive in the wasteland and carve out your own path. It's tough out there alone, consider finding others. 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 new world 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 diff --git a/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl b/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl index abe65c9e335..e79a93b87ea 100644 --- a/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl +++ b/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl @@ -1,14 +1,17 @@ job-supervisors-bos-mid = the midwest brotherhood knight commander job-supervisors-bos-washington-elder = lead your faction to victory! job-supervisors-bos-washington = follow your elder to victory! -job-supervisors-bos-washington-initiate = follow orders from all other roles within the chapter +job-supervisors-bos-washington-recruit = follow orders from all other roles within the chapter job-supervisors-caravan = the caravan leader job-supervisors-caravan-leader = lead your caravan company to riches through trade job-supervisors-ncr = the NCR officer job-supervisors-ncr-nco = the NCR officer followed by the NCO +job-supervisors-ncr-captain = the NCR Captain +job-supervisors-ranger = the Ranger +job-supervisors-veteran-ranger = the Veteran Ranger job-supervisors-tribal = the tribe elder job-supervisors-tribal-elder = lead your tribe to health and prosperity job-supervisors-overseer = the vaults overseer job-supervisors-vault-overseer = lead your vault to prosperity and maintain the status quo job-supervisors-wastelander = look after yourself above all else -job-supervisors-townsfolk = the town mayor \ No newline at end of file +job-supervisors-townsfolk = the town mayor diff --git a/Resources/Locale/en-US/Nuclear14/reagents.ftl b/Resources/Locale/en-US/Nuclear14/reagents.ftl index 64ae86f0ea4..24e82d59409 100644 --- a/Resources/Locale/en-US/Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/Nuclear14/reagents.ftl @@ -95,11 +95,13 @@ reagent-desc-extract-starlight-berries = A berry that is yellow and seems to set reagent-name-extract-tarberries = tarberry juice reagent-desc-extract-tarberries = A water-grown crop that is slightly orange in appearance. Tastes odd, juicy, but with very little flavour, it tingles the tongue. reagent-name-extract-tato = tato juice -reagent-desc-extract-tato = What formerly may have been a tomato. Red and angry. Tastes juicy, slightly firm, would be good on a sandwich. +reagent-desc-extract-tato = What formerly may have been a tomato. Red and angry. Tastes juicy, slightly firm, would be good on a sandwich. reagent-name-extract-white-horsenettle = white horsenettle extract reagent-desc-extract-white-horsenettle = A group of nettles and berries, they don't seem too safe to eat. Tastes of poison, trying to swallow it tastes a lot of effort and makes your stomach hurt. reagent-name-extract-xander = xander extract reagent-desc-extract-xander = An edible root, it was obviously pulled from the ground at some point. Tastes similar to a potato, very starchy, but good to eat. +reagent-name-extract-fungusrad = irradiated fungus extract +reagent-desc-extract-fungusrad = An irradiated and glowing green fungus. Tastes revolting and mushy. It will gladly donate you some of it's green glow. ## Teas reagent-name-tea-agave = agave tea @@ -145,6 +147,18 @@ reagent-desc-antidote-mixture = An antidote made from radscorpion tail and water reagent-name-antidote = antidote reagent-desc-antidote = A potent antitoxin manufactured in a lab. +reagent-name-healing-poultice = healing poultice +reagent-desc-healing-poultice = A powder made from a large mixture of plants. + +reagent-name-bitterdrink = bitterdrink +reagent-desc-bitterdrink = A mixture of crushed plants mixed with water neutralizing poison and radiation from body. + +reagent-name-smelling-salts = smelling salts +reagent-desc-smelling-salts = A grainy mixture of rocks with an insanely potent smell. + +reagent-name-mourning-poultice = mournin poultice +reagent-desc-mourning-poultice = A mixture of poisonous crushed plants used in tribalistic ceremonies said to make you see gods. + # Medicine reagent-name-healing-mixture = stimpak reagent-desc-healing-mixture = A mixture of reagents that makes you heal. @@ -154,6 +168,9 @@ reagent-desc-dirty-stimpak = A dirty mixture of reagents that makes you heal. reagent-name-robust-healing-mixture = robust healing mixture reagent-desc-robust-healing-mixture = A mixture of reagents that makes you heal fast. +reagent-name-ultra-robust-healing-mixture = ultra robust healing mixture +reagent-desc-ultra-robust-healing-mixture = A mixture of reagents that make you heal faster than you can feel it, however it comes with hefty side effects. + reagent-name-damage-resist-mixture = damage resistant mixture reagent-desc-damage-resist-mixture = A mixture of reagents that makes you resistant to damage. @@ -202,6 +219,8 @@ reagent-name-wonderglue = Wonderglue reagent-desc-wonderglue = A pre-war adhesive. Don't sniff it. reagent-name-turpentine = Turpentine reagent-desc-turpentine = A spirit used for cleaning things. +reagent-name-antiseptic = Antiseptic +reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some Rubbing Alcohol. # Ores, Metals, Materials materials-gunpowder = gunpowder @@ -210,11 +229,13 @@ materials-sulfur = sulfur materials-raw-lead = raw lead materials-raw-sulfur = raw sulfur reagent-name-gunpowder = gunpowder -reagent-desc-gunpowder = gunpowder +reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead. reagent-name-fertilizer = fertilizer -reagent-desc-fertilizer = fertilizer +reagent-desc-fertilizer = Ground fertilizer. Perfect for your plants! +reagent-name-sulfur = sulfur +reagent-desc-sulfur = Ground sulfur in a powdery form. You should really wear a gas mask. # Other reagent-name-scorpiontail = scorpion tail -reagent-desc-scorpiontail = scorpion tail. Stingy. \ No newline at end of file +reagent-desc-scorpiontail = scorpion tail. Stingy. diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl index bdfa215e6a8..4667a713981 100644 --- a/Resources/Locale/en-US/loadouts/categories.ftl +++ b/Resources/Locale/en-US/loadouts/categories.ftl @@ -3,5 +3,6 @@ loadout-category-Accessories = Accessories loadout-category-Items = Items loadout-category-Jobs = Jobs loadout-category-Outer = Outer +loadout-category-Roles = Roles loadout-category-Uncategorized = Uncategorized loadout-category-Uniform = Uniform diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 27dd4c7e9a7..161053652b6 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -48,8 +48,6 @@ components: - type: StorageFill contents: - - id: GrenadeFlashBang - - id: TearGasGrenade - id: Stunbaton - id: Handcuffs - id: Handcuffs diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index 771da36719f..8363a757c70 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -81,8 +81,8 @@ - type: ZombieImmune # No zombie servant - type: RandomMetadata nameSegments: [names_golem] - - type: PotentialPsionic - - type: Psionic + #- type: PotentialPsionic + #- type: Psionic removable: false # - type: PyrokinesisPower # Pending psionic rework - type: Grammar diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml index e3eb9cd6de8..469d1fdf418 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml @@ -22,8 +22,8 @@ reagents: - ReagentId: Ectoplasm Quantity: 15 - - type: PotentialPsionic - - type: Psionic + #- type: PotentialPsionic + #- type: Psionic - type: GlimmerSource - type: AmbientSound range: 6 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml index 1f4eb696c65..66d19ffcc44 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml @@ -26,4 +26,4 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic + #- type: PotentialPsionic diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index 06abe8c45fa..3410a78912f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -24,7 +24,7 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic + #- type: PotentialPsionic - type: Respirator damage: types: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 89a6f16e525..e333cbffa97 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -118,7 +118,7 @@ - type: Grammar attributes: gender: male - - type: PotentialPsionic # Nyano + #- type: PotentialPsionic # Nyano - type: entity id: MobRatKingBuff diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index d0ac6fc0265..d70cf3277a0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -121,10 +121,6 @@ molsPerSecondPerUnitMass: 0.0005 - type: Speech speechVerb: LargeMob - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - chance: -2 - - type: Psionic #Nyano - Summary: makes psionic by default. - removable: false - type: entity name: Praetorian diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml index 5ebd43ddf48..c1653c49b03 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml @@ -11,4 +11,4 @@ damageRecovery: types: Asphyxiation: -0.5 - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. + #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic. diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml index 28687c68bfc..15f7624eb12 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml @@ -11,7 +11,7 @@ damageRecovery: types: Asphyxiation: -1.0 - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. + #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic. # Reformed Diona - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml index fb84ad3650f..d1de65df012 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml @@ -3,5 +3,3 @@ name: Urist McHands The Dwarf parent: BaseMobDwarf id: MobDwarf - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index 6510c8af99b..8009a20077f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml @@ -34,7 +34,7 @@ - PsionicInterloper #Nyano - Summary: makes a part of the psionic faction. - type: Alerts - type: Familiar - - type: Psionic #Nyano - Summary: Makes psionic on creation. + #- type: Psionic #Nyano - Summary: Makes psionic on creation. removable: false - type: entity @@ -90,9 +90,6 @@ - type: MindContainer showExamineInfo: true - type: Familiar - - type: Dispellable - - type: Psionic #Nyano - Summary: makes psionic on creation. - removable: false - type: Vocal sounds: Male: Cerberus diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 6197c82c021..2c2d6cbda85 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -3,8 +3,8 @@ name: Urist McHands parent: BaseMobHuman id: MobHuman - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. + #components: + #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic. #Syndie - type: entity @@ -48,9 +48,9 @@ components: - type: NukeOperative - type: RandomHumanoidAppearance - - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. - multiplier: 7 - warn: false + #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. + # multiplier: 7 + # warn: false - type: entity noSpawn: true @@ -70,9 +70,9 @@ - type: NpcFactionMember factions: - Syndicate - - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. - multiplier: 7 - warn: false + #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. + # multiplier: 7 + # warn: false # Space Ninja - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index ef15346a04d..223f9986a12 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -468,9 +468,9 @@ id: NukeOp components: - type: NukeOperative - - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. - multiplier: 7 - warn: false + #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. + # multiplier: 7 + # warn: false - type: entity id: RandomHumanoidSpawnerCluwne diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml index ffdb36d86bd..ea01677626d 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml @@ -1,7 +1,5 @@ - type: entity save: false name: Urist McFluff - parent: BaseMobMoth + parent: BaseMobMoth id: MobMoth - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml index 71d74222979..b9f265e0bcf 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml @@ -3,7 +3,5 @@ name: Urisst' Mzhand parent: BaseMobReptilian id: MobReptilian - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. #Weh diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index bf41f2dda6e..da1e6f30872 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -8,7 +8,7 @@ interactSuccessString: hugging-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. + #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - type: entity name: skeleton pirate diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml index 79669a8fe2a..4e5974b3084 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml @@ -2,5 +2,3 @@ save: false parent: BaseMobSlimePerson id: MobSlimePerson - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml index 0a6f4f43644..de1e3da2be7 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml @@ -3,5 +3,3 @@ name: Vox parent: BaseMobVox id: MobVox - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. diff --git a/Resources/Prototypes/Entities/Mobs/Species/golem.yml b/Resources/Prototypes/Entities/Mobs/Species/golem.yml index d3630b609af..a746c4e074a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/golem.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/golem.yml @@ -245,7 +245,7 @@ # clownedon: # True: {visible: true} # False: {visible: false} -# - type: Psionic +# #- type: Psionic # removable: false # - type: Laws # - type: IntrinsicUI diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 96fddefa3ec..6601181a91f 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -75,6 +75,9 @@ state: cardboard - type: Stack count: 1 + - type: Construction + graph: N14Cardboard + node: cardboard - type: entity parent: MaterialBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml index cb6708431a0..0654e6efca3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml @@ -59,7 +59,7 @@ sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi heldPrefix: ano01 - type: Actions - - type: Psionic #Nyano - Summary: makes psionic on creation. + #- type: Psionic #Nyano - Summary: makes psionic on creation. - type: Construction graph: Artifact node: done diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml index f098894ff79..8d858cc716d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml @@ -54,7 +54,7 @@ ano01_on: Rainbow - type: Appearance - type: Actions - - type: Psionic #Nyano - Summary: Makes psionic on creation. + #- type: Psionic #Nyano - Summary: Makes psionic on creation. - type: GuideHelp guides: - Xenoarchaeology diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 49b2eeaada1..9072d3c3778 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -13,6 +13,7 @@ quickEquip: false slots: - Back + - suitStorage - type: Wieldable - type: GunWieldBonus minAngle: -20 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index bd043c997da..d91dd389ae4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -15,6 +15,7 @@ - type: Tag tags: - Sidearm + - Revolver - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index 43c0bdce12f..cbc36491f44 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -47,8 +47,8 @@ - type: EmitSoundOnSpawn sound: path: /Audio/Effects/teleport_arrival.ogg - - type: Psionic #Nyano - Summary: makes psionic on creation. - - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer. + #- type: Psionic #Nyano - Summary: makes psionic on creation. + - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer. active: false - type: entity diff --git a/Resources/Prototypes/Nuclear14/Access/ncr.yml b/Resources/Prototypes/Nuclear14/Access/ncr.yml index 59e4a37e8e6..637614ab15a 100644 --- a/Resources/Prototypes/Nuclear14/Access/ncr.yml +++ b/Resources/Prototypes/Nuclear14/Access/ncr.yml @@ -5,15 +5,15 @@ - type: accessLevel id: NCRRanger name: id-card-access-level-ncr-ranger - + - type: accessLevel id: NCRNCO name: id-card-access-level-ncr-nco - + - type: accessLevel id: NCRSoldier name: id-card-access-level-ncr-soldier - + - type: accessLevel id: NCRCadet name: id-card-access-level-ncr-cadet @@ -25,4 +25,4 @@ - NCRRanger - NCRNCO - NCRSoldier - - NCRCadet \ No newline at end of file + - NCRCadet diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 55c1e22719a..20968b091d6 100644 --- a/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -37,70 +37,83 @@ - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander - -# Military + - id: Magazine5.56Rifle + - id: Magazine5.56Rifle + - id: N14MagazinePistol10mm + - id: N14MagazinePistol10mm + - type: entity noSpawn: true - parent: N14ClothingBackpackMilitary - id: N14ClothingBackpackMilitaryFilled + parent: N14ClothingBackpackHiking + id: N14ClothingBackpackCaravanLeaderFilled components: - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander - - id: N14CombatKnife - + - id: N14MagazinePistol12mm + - id: N14MagazinePistol12mm + - type: entity noSpawn: true - parent: N14ClothingBackpackNCR - id: N14ClothingBackpackNCRFilled + parent: N14ClothingBackpackHiking + id: N14ClothingBackpackCaravanTraderFilled components: - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander - - id: N14CombatKnife + - id: Magazine45SubMachineGun + - id: Magazine45SubMachineGun + - id: N14Weapon45SMG -# Vault +# Military - type: entity noSpawn: true - parent: N14ClothingBackpackVaultBlue - id: N14ClothingBackpackVaultDwellerFilled + parent: N14ClothingBackpackMilitary + id: N14ClothingBackpackMilitaryFilled components: - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander + - id: N14CombatKnife - type: entity noSpawn: true - parent: N14ClothingBackpackVaultRed - id: N14ClothingBackpackVaultSecurityFilled + parent: N14ClothingBackpackNCR + id: N14ClothingBackpackNCRFilled components: - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander + - id: N14CombatKnife +# Vault - type: entity noSpawn: true - parent: N14ClothingBackpackVaultBlueDark - id: N14ClothingBackpackVaultOverseerFilled + parent: N14ClothingBackpackVaultBlue + id: N14ClothingBackpackVaultDwellerFilled components: - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander - + - type: entity noSpawn: true - parent: N14ClothingBackpackVaultOrange - id: N14ClothingBackpackVaultEngineerFilled + parent: N14ClothingBackpackVaultBlue + id: N14ClothingBackpackVaultOverseerFilled components: - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander + - id: N14MagazinePistol10mm + - id: N14MagazinePistol10mm - type: entity noSpawn: true - parent: N14ClothingBackpackVaultPurple - id: N14ClothingBackpackVaultDoctorFilled + parent: N14ClothingBackpackVaultBlue + id: N14ClothingBackpackVaultSecurityFilled components: - type: StorageFill contents: - - id: N14BoxPlasticFilledWastelander \ No newline at end of file + - id: N14BoxPlasticFilledWastelander + - id: N14MagazinePistol10mm + - id: N14MagazinePistol10mm diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/TownGear/backpack.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/TownGear/backpack.yml new file mode 100644 index 00000000000..a746fadb366 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/Backpacks/TownGear/backpack.yml @@ -0,0 +1,34 @@ +# Town people +- type: entity + noSpawn: true + parent: N14ClothingBackpackExplorer + id: N14ClothingBackpackMayorFilled + components: + - type: StorageFill + contents: + - id: N14BoxPlasticFilledWastelander + - id: MagazineBox9mm + +- type: entity + noSpawn: true + parent: N14ClothingBackpackMilitary + id: N14ClothingBackpackSheriffFilled + components: + - type: StorageFill + contents: + - id: N14BoxPlasticFilledWastelander + - id: N14CombatKnife + - id: MagazineBox44 + - id: MagazineBox308 + +- type: entity + noSpawn: true + parent: N14ClothingBackpackMilitary + id: N14ClothingBackpackDeputyFilled + components: + - type: StorageFill + contents: + - id: N14BoxPlasticFilledWastelander + - id: N14CombatKnife + - id: MagazineBox10mm + - id: MagazineBox44 diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml new file mode 100644 index 00000000000..a1e662b6840 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml @@ -0,0 +1,27 @@ +- type: entity + noSpawn: true + parent: ClothingBeltRevolver + id: ClothingBeltRevolverfilled + components: + - type: StorageFill + contents: + - id: N14WeaponRevolverMagnun + - id: SpeedLoader44 + - id: SpeedLoader44 + - id: SpeedLoader44 + +- type: entity + noSpawn: true + parent: ClothingBeltMedical + id: ClothingBeltMedicalfilled + components: + - type: StorageFill + contents: + - id: N14ChemicalSyringeAntidote + - id: N14ChemicalSyringeAntidote + - id: N14DoctorSyringe + - id: N14Stimpak + - id: N14Stimpak + - id: N14Stimpak + - id: N14Stimpak + - id: N14RadXCanister diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml index d1fee7ea259..08b58551b72 100644 --- a/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml @@ -55,7 +55,6 @@ components: - type: StorageFill contents: - - id: GrenadeFlashBang - id: Stunbaton # TODO: Replace with fallout friendly baton - id: Handcuffs - id: Handcuffs @@ -77,4 +76,4 @@ components: - type: StorageFill contents: - - id: GrenadeFlashBang \ No newline at end of file + - id: GrenadeFlashBang diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/crates.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/crates.yml new file mode 100644 index 00000000000..d706ceb1c11 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/crates.yml @@ -0,0 +1,38 @@ +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledCigarettes + suffix: cigarette packs random # We don't give it a name, players need to break it to find out whats inside. + components: + - type: StorageFill + contents: + - id: N14CigarettePackSalem + prob: 0.5 + - id: N14CigarettePackKool + prob: 0.5 + - id: N14CigarettePackMarlboro + prob: 0.5 + - id: N14CigarettePackWinston + prob: 0.5 + - id: N14CigarettePackCustom + prob: 0.5 + - id: N14CigarettePackSalem + prob: 0.4 + - id: N14CigarettePackKool + prob: 0.4 + - id: N14CigarettePackMarlboro + prob: 0.4 + - id: N14CigarettePackWinston + prob: 0.4 + - id: N14CigarettePackCustom + prob: 0.4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledCigarettesRepublic + suffix: republics + name: Republic cigarette crate + components: + - type: StorageFill + contents: + - id: N14CigarettePackRepublics + amount: 6 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Belt/belts.yml index 0137c938af6..0b02f7cd9d0 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Belt/belts.yml @@ -96,13 +96,13 @@ - type: entity parent: ClothingBeltStorageBase id: ClothingBeltNCRBandolier - name: NCR bandolier - description: A bandolier commonly used by NCR marksmans and pointmans to carry single shells or cartridges. + name: bandolier + description: A bandolier commonly used to carry single shells or cartridges. components: - type: Sprite - sprite: Nuclear14/Clothing/Belt/ncrbandolier.rsi + sprite: Nuclear14/Clothing/Belt/bandolier.rsi - type: Clothing - sprite: Nuclear14/Clothing/Belt/ncrbandolier.rsi + sprite: Nuclear14/Clothing/Belt/bandolier.rsi - type: Storage whitelist: tags: @@ -120,3 +120,20 @@ sprite: Nuclear14/Clothing/Belt/ropebelt.rsi - type: Clothing sprite: Nuclear14/Clothing/Belt/ropebelt.rsi + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltRevolver + name: revolver holster + description: Can hold security gear like handcuffs and flashes. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Belt/revolverholster.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Belt/revolverholster.rsi + - type: Storage + whitelist: + tags: + - Revolver + - SpeedLoader + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Hands/gloves.yml index 9d85142d0d2..8c54b6f782f 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Hands/gloves.yml @@ -12,7 +12,7 @@ fiberMaterial: fibers-leather fiberColor: fibers-black - type: FingerprintMask - # - type: ClothingSpecialModifier + # - type: ClothingSpecialModifier # strengthModifier: 1 - type: entity @@ -29,8 +29,8 @@ fiberMaterial: fibers-leather fiberColor: fibers-brown - type: FingerprintMask - # - type: ClothingSpecialModifier - # strengthModifier: 1 + # - type: ClothingSpecialModifier + # strengthModifier: 1 - type: entity parent: ClothingHandsButcherable @@ -76,7 +76,7 @@ fiberMaterial: fibers-leather fiberColor: fibers-black - type: FingerprintMask - # - type: ClothingSpecialModifier + # - type: ClothingSpecialModifier # perceptionModifier: 1 - type: entity @@ -108,7 +108,7 @@ fiberMaterial: fibers-leather fiberColor: fibers-black - type: FingerprintMask - # - type: ClothingSpecialModifier + # - type: ClothingSpecialModifier # enduranceModifier: 1 - type: entity @@ -154,3 +154,33 @@ fiberMaterial: fibers-leather fiberColor: fibers-white - type: FingerprintMask + +- type: entity + parent: ClothingHandsButcherable + id: N14ClothingHandsGlovesNCR + name: fingerless leather gloves + description: Gloves made out of wasteland animal hides, tanned and stitched together without any fingers. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi + - type: Fiber + fiberMaterial: fibers-leather + fiberColor: fibers-brown + - type: FingerprintMask + +- type: entity + parent: ClothingHandsButcherable + id: N14ClothingHandsGlovesPatrol + name: leather patrol gloves + description: Gloves made out of brahmin leather, tanned and stitched for the purpose of patrolling around Mojave desert. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi + - type: Fiber + fiberMaterial: fibers-leather + fiberColor: fibers-brown + - type: FingerprintMask diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml index dd9beed5dd9..ecbb612354a 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml @@ -5,17 +5,39 @@ parent: ClothingHeadBase id: N14ClothingHeadHatBaseball name: pre-war baseball cap - description: A pre-war baseball cap. + description: A pre-war baseball cap. components: - type: Sprite sprite: Nuclear14/Clothing/Head/FalloutHats/baseballcap.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/baseballcap.rsi - + - type: entity parent: ClothingHeadHatTrucker id: N14ClothingHeadHatTrucker # N14:TODO This is the SS14 one, probably needs replaced. - + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatDeputy + name: deputy hat + description: When the sheriff cant do the job alone, there is when a deputy come in. + components: + - type: Sprite + sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi + - type: Clothing + sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatSheriff + name: sheriff hat + description: The law personified in a hat. + components: + - type: Sprite + sprite: Clothing/Head/Hats/hoshat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/hoshat.rsi + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatHeadscarf @@ -26,7 +48,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/headscarf.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/headscarf.rsi - + # Army - type: entity parent: ClothingHeadBase @@ -38,7 +60,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/armyberet.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/armyberet.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatArmyBeretAirborne @@ -49,7 +71,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/armyberetairborne.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/armyberetairborne.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatArmyBeretRanger @@ -60,7 +82,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/armyberetranger.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/armyberetranger.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatArmyBeretSpecial @@ -71,7 +93,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/armyberetspecial.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/armyberetspecial.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatArmyCap @@ -94,7 +116,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/bandit.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/bandit.rsi - + # Brotherhood - type: entity parent: ClothingHeadBase @@ -106,7 +128,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodcap.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodcap.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatBrotherhoodBeret @@ -122,25 +144,25 @@ parent: ClothingHeadBase id: N14ClothingHeadHatBrotherhoodFieldCap name: brotherhood of steel field cap - description: A cap worn by scribes of the Brotherhood of Steel during their field duties. + description: A cap worn by paladins of the midwest BoS during their field duties. components: - type: Sprite - sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi + sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi - type: Clothing - sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi + sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi # Enclave - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatEnclaveIntel name: enclave recon beret - description: A sharp looking beret worn by Enclave intelligence officers. + description: A sharp looking beret worn by Enclave intelligence officers. components: - type: Sprite sprite: Nuclear14/Clothing/Head/FalloutHats/enclaveintel.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/enclaveintel.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatEnclaveOfficer @@ -151,7 +173,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/enclaveofficer.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/enclaveofficer.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatEnclavePeacekeeperCap @@ -162,7 +184,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/enclavepeacekeeper.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/enclavepeacekeeper.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatEnclaveScientist @@ -173,7 +195,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/enclavescience.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/enclavescience.rsi - + # NCR - type: entity parent: ClothingHeadBase @@ -185,7 +207,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetofficer.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetofficer.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatNCRBeretMedic @@ -196,7 +218,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetmedical.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetmedical.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatNCRBeretRecon @@ -207,7 +229,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetrecon.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetrecon.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatNCRBeretSapper @@ -218,7 +240,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetsapper.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetsapper.rsi - + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatNCRSidecap @@ -241,6 +263,50 @@ - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhat.rsi +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatRangerB + name: ranger hat + description: An NCR ranger hat, standard issue amongst all but the most elite rangers. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatRangerGrey + name: grey ranger hat + description: A simple grey cowboy hat. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatRangerGreyBanded + name: banded grey ranger hat + description: A simple grey cowboy hat with some brass casings banded around itself. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCowboyRang + name: trail ranger hat + description: A rustic, homely style cowboy hat worn by trail rangers. Yeehaw! + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi + # Tribal - type: entity parent: ClothingHeadBase @@ -252,7 +318,7 @@ sprite: Nuclear14/Clothing/Head/FalloutHats/tribalhoodoutcast.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHats/tribalhoodoutcast.rsi - + # Vault - type: entity parent: ClothingHeadBase @@ -270,4 +336,39 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.8 + Piercing: 0.9 + +# Craftable +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatAnimal + name: canine hat + description: Made from a dog-like creature, this wild looking hat will keep your head warm and safe. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatNightstalker + name: nightstalker hat + description: A warm and resistent hat made from the head of a nightstalker. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.8 + Heat: 0.8 diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/helmets.yml index 830640b1721..6e6081e925a 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/helmets.yml @@ -278,6 +278,86 @@ sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi - type: Clothing sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi + - type: Tag + tags: + - HidesHair + +- type: entity + parent: N14ClothingHeadHatBaseHelmetMK2 + id: N14ClothingHeadHatRangerHelmetOld + name: old ranger combat helmet + description: An old combat helmet, out of use around the time of the war. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi + - type: Tag + tags: + - HidesHair + +- type: entity + parent: N14ClothingHeadHatBaseHelmetMK2 + id: N14ClothingHeadHatRangerHelmetDesert + name: desert ranger combat helmet + description: An U.S Marine Corps helmet, used by the legendary Desert Rangers. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.65 + Piercing: 0.75 + Heat: 0.7 + - type: Tag + tags: + - HidesHair + +- type: entity + parent: N14ClothingHeadHatBaseHelmetMK2 + id: N14ClothingHeadHatRangerHelmetPrice + name: spider ranger combat helmet + description: A customised riot helmet reminiscient of the more advanced riot helmets found in the Divide, sporting purple lenses over the traditional red or green and a pair of red fangs painted over the respirator. The back of the helmet has a the face of an albino spider painted over it. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.65 + Piercing: 0.75 + Heat: 0.7 + - type: Tag + tags: + - HidesHair + +- type: entity + parent: N14ClothingHeadHatBaseHelmetMK2 + id: N14ClothingHeadHatRangerHelmetElite + name: elite ranger combat helmet + description: An old combat helmet seen in the divide, repurposed for higher ranking Rangers. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.60 + Piercing: 0.70 + Heat: 0.6 + - type: Tag + tags: + - HidesHair # midwest BoS - type: entity diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..fa72d5ec61c --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,45 @@ +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatHoodLeatherCloak + name: leather cloak hood + description: A hood of a leather cloak, it is made from the hide of brahmin leather. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatHoodRangerCloak + name: ranger cloak hood + description: A hood of a ranger cloak, it is made from salvaged wasteland material. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatHoodPonchoCloak + name: poncho cloak hood + description: A hood of a poncho cloak, it is made from muslin cotton. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Mask/gasmasks.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Mask/gasmasks.yml index 5766a50dbf0..a873cdbb11d 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Mask/gasmasks.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Mask/gasmasks.yml @@ -1,3 +1,42 @@ +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasFire + name: fire gas mask + description: A gasmask with extra protection against fire. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/firegasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/firegasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Heat: 0.85 + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasMiner + name: miner gas mask + description: A gasmask used to keep the breath clear in mines. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/minergasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/minergasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + +# NCR Rangers, Vets + - type: entity parent: ClothingMaskGas id: ClothingMaskGasCombat @@ -20,57 +59,176 @@ - type: entity parent: ClothingMaskGas - id: ClothingMaskGasFire - name: fire gas mask - description: A gasmask with extra protection against fire. + id: ClothingMaskGasRiot + name: NCR ranger gas mask + description: A close-fitting tactical mask issued to all NCR Rangers as a proof of their service. components: - type: Item size: Tiny - type: Sprite - sprite: Nuclear14/Clothing/Mask/Gasmask/firegasmask.rsi + sprite: Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi - type: Clothing - sprite: Nuclear14/Clothing/Mask/Gasmask/firegasmask.rsi + sprite: Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi - type: Armor modifiers: coefficients: - Blunt: 0.95 - Slash: 0.95 - Heat: 0.85 + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskGas - id: ClothingMaskGasMiner - name: miner gas mask - description: A gasmask used to keep the breath clear in mines. + id: ClothingMaskGasRanger + name: ranger gas mask + description: The last in pre-war military gas masks technology, with extra protection. components: - type: Item size: Tiny - type: Sprite - sprite: Nuclear14/Clothing/Mask/Gasmask/minergasmask.rsi + sprite: Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi - type: Clothing - sprite: Nuclear14/Clothing/Mask/Gasmask/minergasmask.rsi + sprite: Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi - type: Armor modifiers: coefficients: Blunt: 0.90 Slash: 0.90 + Piercing: 0.95 + Heat: 0.95 - type: entity parent: ClothingMaskGas - id: ClothingMaskGasRiot - name: riot gas mask - description: The last in pre-war military gas masks technology, with extra protection. + id: ClothingMaskGasRangerOld + name: ranger gas mask + description: An old combat mask, out of use around the time of the war. components: - type: Item size: Tiny - type: Sprite - sprite: Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi + sprite: Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi - type: Clothing - sprite: Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi + sprite: Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi - type: Armor modifiers: coefficients: Blunt: 0.90 Slash: 0.90 - Piercing: 0.95 + Piercing: 0.90 Heat: 0.95 + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasRangerDesert + name: desert ranger gas mask + description: An U.S Marine Corps helmet, used by the legendary Desert Rangers. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.90 + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasRangerWeathered + name: weathered ranger gas mask + description: A well-used desert ranger helmet passed down through generations. Though this one's stripped of night vision and it's kevlar lining, it's even more lightweight. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.90 + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasRangerPrice + name: spider ranger gas mask + description: A customised riot helmet reminiscient of the more advanced riot helmets found in the Divide, sporting purple lenses over the traditional red or green and a pair of red fangs painted over the respirator. The back of the helmet has a the face of an albino spider painted over it. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.95 + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasRangerBroken + name: broken riot gas mask + description: An old riot gas mask, out of use around the time of the war. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasRangerElite + name: elite riot gas mask + description: An old gas mask seen in the divide, repurposed for higher ranking Rangers. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.80 + Heat: 0.9 + - type: Tag + tags: + - WhitelistChameleon diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/cloaks.yml index 60739eba938..40e936bded9 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/cloaks.yml @@ -1,15 +1,19 @@ +# BOS Washington + - type: entity parent: ClothingNeckBase - id: ClothingNeckCloakBrotherhoodWashington + id: N14ClothingNeckCloakBrotherhoodWashington name: Washington Brotherhood cloak description: A black cloak with a circular red Brotherhood logo. components: - type: Sprite sprite: Nuclear14/Clothing/Neck/WBoScloak.rsi +# NCR + - type: entity parent: ClothingNeckBase - id: ClothingNeckCloakNCR + id: N14ClothingNeckCloakNCR name: NCR cloak description: A comfy cloak with a NCR logo on one side, this kind of cloaks are commonly used by the troopers during hard weathers. components: @@ -18,9 +22,62 @@ - type: entity parent: ClothingNeckBase - id: ClothingNeckCloakLeather + id: N14ClothingNeckCloakRanger + name: NCR ranger cape + description: Ranger cape made from what looks like old poncho fitted with star, stripes and a bear. Most likely has a holster hidden underneath. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Neck/NCRrangercape.rsi + - type: ToggleableClothing + clothingPrototype: N14ClothingHeadHatHoodRangerCloak + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingNeckBase + id: N14ClothingNeckCloakRangerPoncho + name: ranger poncho + description: A durable muslin poncho. Tough enough to bear the elements and serve as handy blanket. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Neck/NCRrangerponcho.rsi + - type: ToggleableClothing + clothingPrototype: N14ClothingHeadHatHoodPonchoCloak + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + +# Neutral + +- type: entity + parent: ClothingNeckBase + id: N14ClothingNeckCloakLeather name: leather cloak description: A handmade cloak, comfy and warm. components: - type: Sprite sprite: Nuclear14/Clothing/Neck/leathercloak.rsi + - type: ToggleableClothing + clothingPrototype: N14ClothingHeadHatHoodLeatherCloak + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingNeckBase + id: N14ClothingNeckCloakYaoguai + name: yaoguai cloak + description: A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Neck/yaoguai.rsi diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/mantles.yml index 25efb6699c8..991b18f4c7d 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Neck/mantles.yml @@ -1,6 +1,6 @@ - type: entity parent: ClothingNeckBase - id: ClothingNeckMantleBrotherhoodWashington + id: N14ClothingNeckMantleBrotherhoodWashington name: Washington Brotherhood mantle description: A red with black mantle, wore by high ranks of the washington BoS army it represents a high status. components: @@ -11,7 +11,7 @@ - type: entity parent: ClothingNeckBase - id: ClothingNeckMantleNCR + id: N14ClothingNeckMantleNCR name: NCR squad leader mantle description: A tiny piece of cloth holded with a rope, commonly used between sergeants from the NCR army. components: @@ -22,7 +22,7 @@ - type: entity parent: ClothingNeckBase - id: ClothingNeckMantleLeather + id: N14ClothingNeckMantleLeather name: leather mantle description: A comfortable brown long mantle. components: @@ -30,3 +30,11 @@ sprite: Nuclear14/Clothing/Neck/leathermantle.rsi - type: Clothing sprite: Nuclear14/Clothing/Neck/leathermantle.rsi + - type: ToggleableClothing + clothingPrototype: N14ClothingHeadHatHoodLeatherCloak + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 98fbb1d9789..76ea8319a80 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -12,9 +12,9 @@ modifiers: coefficients: Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 + Slash: 0.7 + Piercing: 0.9 + Heat: 0.5 - type: entity parent: ClothingOuterBase @@ -27,15 +27,15 @@ - type: Clothing sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutmetal.rsi - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 + walkModifier: 0.80 + sprintModifier: 0.80 - type: Armor modifiers: coefficients: - Blunt: 0.8 - Slash: 0.7 + Blunt: 0.6 + Slash: 0.6 Piercing: 0.7 - Heat: 0.8 + Heat: 0.9 - type: entity parent: ClothingOuterBase @@ -50,10 +50,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.65 - Heat: 0.7 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 + Heat: 0.6 - type: entity parent: ClothingOuterBase @@ -68,10 +68,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.5 - type: entity parent: ClothingOuterBase @@ -86,10 +86,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.6 - Heat: 0.6 + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.45 + Heat: 0.45 - type: entity parent: N14ClothingOuterCombatArmorMK2 @@ -118,7 +118,7 @@ Blunt: 0.7 Slash: 0.7 Piercing: 0.7 - Heat: 0.9 + Heat: 0.7 - type: entity parent: ClothingOuterBase @@ -136,7 +136,7 @@ Blunt: 0.9 Slash: 0.9 Piercing: 0.4 - Heat: 0.9 + Heat: 0.6 # Tribal - type: entity @@ -191,9 +191,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.80 - Slash: 0.80 - Heat: 0.9 + Blunt: 0.75 + Slash: 0.75 + Heat: 0.8 - type: entity parent: ClothingOuterStorageBase @@ -208,9 +208,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.75 - Slash: 0.75 - + Blunt: 0.7 + Slash: 0.7 - type: entity parent: ClothingOuterBase @@ -228,7 +227,7 @@ Blunt: 0.75 Slash: 0.75 Piercing: 0.7 - Heat: 0.9 + Heat: 0.7 - type: entity parent: N14ClothingOuterRaiderCombat1 @@ -243,9 +242,63 @@ - type: Armor modifiers: coefficients: - Blunt: 0.85 - Slash: 0.85 + Blunt: 0.7 + Slash: 0.7 Piercing: 0.65 + Heat: 0.7 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterPoliceCombat + name: police combat armor + description: A blue lighter variant of combat armor used by police forces of the pre-war. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.6 + Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: N14ClothingOuterPoliceVest + name: police vest + description: A protective vest used for the pre-war police. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.8 + Heat: 0.7 + +- type: entity + parent: ClothingOuterStorageBase + id: N14ClothingOuterSheriffVest + name: sheriff vest + description: Sheriff job needs a good piece to protect themselfs from the dangers of the wasteland. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.6 Heat: 0.8 # NCR @@ -325,6 +378,44 @@ Piercing: 0.7 Heat: 0.5 +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterNCRCombatArmor + name: NCR combat armor + description: An old military grade pre war combat armor, repainted to the colour scheme of the New California Republic. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 + Heat: 0.6 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterNCRCombatArmorMK2 + name: NCR combat armor mk2 + description: A reinforced set of bracers, greaves, and torso plating of prewar design. This one is kitted with additional plates, repainted to the colour scheme of the New California Republic. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.5 + +#NCR Rangers + - type: entity parent: ClothingOuterStorageBase id: N14ClothingOuterRangerVest @@ -340,7 +431,7 @@ coefficients: Blunt: 0.7 Slash: 0.7 - Piercing: 0.7 + Piercing: 0.6 Heat: 0.5 - type: entity @@ -356,16 +447,16 @@ - type: Armor modifiers: coefficients: - Blunt: 0.65 - Slash: 0.65 + Blunt: 0.6 + Slash: 0.6 Piercing: 0.6 Heat: 0.8 - type: entity parent: ClothingOuterBase id: N14ClothingOuterRangerCoat - name: desert ranger armor - description: The most feared and skillfull soldiers that the wasteland can create tend to wear this armor. + name: NCR ranger armor + description: The most feared and skillfull soldiers of the NCR that the wasteland can create tend to wear this armor. components: - type: Sprite sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi @@ -374,10 +465,142 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.5 + Heat: 0.6 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRangerCombat + name: ranger combat armor + description: The rangers combat armor, or black armor consists of a pre-war L.A.P.D. riot suit under a duster with rodeo jeans. Considered one of the most prestigious suits of armor to earn and wear while in service of the NCR Rangers. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 Piercing: 0.5 + Heat: 0.6 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRangerCombatDesert + name: desert ranger combat armor + description: This is the original armor the NCR Ranger Combat armor was based off of. An awe inspiring suit of armor used by the legendary Desert Rangers. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.60 + Piercing: 0.45 + Heat: 0.6 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRangerFox + name: fox ranger combat armor + description: A customized and well-worn suit of riot gear with parts of the suit reinforced with leather armor and slain Centurion armor pieces by the wearer. A sniper's veil is wrapped around the neck. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.60 + Piercing: 0.50 + Heat: 0.6 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRangerWeathered + name: weathered ranger combat armor + description: A set of pre-unification desert ranger armor, made using parts of what was once USMC riot armor. It looks as if it has been worn for decades; the coat has become discoloured from years under the Mojave sun and has multiple tears and bullet holes in its leather. The armor plating itself seems to be in relatively good shape, though it could do with some maintenance. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.7 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRangerElite # Admin event gear (OP) + name: elite ranger combat armor + description: A customized and well-worn suit of riot gear with parts of the suit reinforced with leather armor and slain Centurion armor pieces by the wearer. A sniper's veil is wrapped around the neck. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.3 + Heat: 0.4 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRangerEliteOld + name: worn elite ranger combat armor + description: A customized and well-worn suit of riot gear with parts of the suit reinforced with leather armor and slain Centurion armor pieces by the wearer. A sniper's veil is wrapped around the neck. This one has seen some wear. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.55 + Piercing: 0.4 Heat: 0.5 + - type: ClothingSpeedModifier # a little heavier due to the high protection + walkModifier: 0.90 + sprintModifier: 0.90 + +- type: entity + parent: ClothingOuterStorageBase + id: N14ClothingOuterRangerPrice + name: spider ranger combat armor + description: A customised and faded suit of riot gear, reminiscient of that found near Hopeville in the Divide, with a pair of wrist mounted ammo pouches for easy access to spare munitions with a pair of stripes down the back made from a fire-proof material. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.60 + Piercing: 0.5 + Heat: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 # washington BoS @@ -418,7 +641,7 @@ coefficients: Blunt: 0.8 Slash: 0.8 - Piercing: 0.9 + Piercing: 0.8 Heat: 0.6 # midwest BoS @@ -436,9 +659,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.7 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.6 Heat: 0.9 - type: entity @@ -456,5 +679,61 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.65 + Piercing: 0.5 + Heat: 0.8 + +# craftable armors + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterChitinArmor + name: chitin armor + description: A suit of handmade armor, made from a lot of chitin from insects. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.65 + Piercing: 0.95 + Heat: 0.65 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterRadArmor + name: radscorpion armor + description: A suit of handmade armor, made of pieces of exoskeleton from radscorpions. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.75 + Heat: 0.8 + +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterLightMetalArmor + name: light metal armor + description: A suit of light metal armor that provides protection against physical threats. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.7 + Piercing: 0.7 Heat: 0.8 diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutcoats.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutcoats.yml index 89493703ac6..70f6882cf19 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutcoats.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/OuterClothing/falloutcoats.yml @@ -17,7 +17,6 @@ Slash: 0.85 Piercing: 0.9 Heat: 0.75 - - type: entity parent: N14ClothingOuterOverseerCoat @@ -44,7 +43,7 @@ parent: ClothingOuterStorageBase id: N14ClothingOuterCoatFollowerLab name: follower's lab coat - description: A lab coat worn by the Followers of the Apocalypse. + description: A lab coat worn by the Followers of the Apocalypse. components: - type: Sprite sprite: Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi @@ -73,7 +72,27 @@ - type: Clothing sprite: Nuclear14/Clothing/OuterClothing/Coats/falloutleatherduster.rsi - +- type: entity + parent: ClothingOuterStorageBase + id: N14ClothingOuterCoatCombatDuster + name: combat duster + description: Refurbished combat armor under a weathered duster. Simple metal plates replace the ceramic plates that has gotten damaged. + components: + - type: Sprite + sprite: Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi + - type: Clothing + sprite: Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.7 + Piercing: 0.6 + Heat: 0.7 + # Brotherhood - type: entity parent: N14ClothingOuterOverseerCoat @@ -85,7 +104,7 @@ sprite: Nuclear14/Clothing/OuterClothing/Coats/brotherhoodeldercoat.rsi - type: Clothing sprite: Nuclear14/Clothing/OuterClothing/Coats/brotherhoodeldercoat.rsi - + - type: entity parent: N14ClothingOuterOverseerCoat id: N14ClothingOuterBrotherhoodFieldScribeCoat @@ -96,7 +115,7 @@ sprite: Nuclear14/Clothing/OuterClothing/Coats/brotherhoodfieldscribe.rsi - type: Clothing sprite: Nuclear14/Clothing/OuterClothing/Coats/brotherhoodfieldscribe.rsi - + # Enclave - type: entity parent: ClothingOuterStorageBase @@ -115,7 +134,7 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.9 - + # Vault - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml index 45e041a92b5..0489e54f3fa 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml @@ -224,7 +224,7 @@ parent: ClothingUniformBase id: N14ClothingUniformJumpsuitPreWarLumberjack name: lumberjack apparel - description: Pre-war flannel, probably worn by a lumberjack. + description: Pre-war flannel, probably worn by a lumberjack. components: - type: Sprite sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/lumberjack.rsi @@ -246,7 +246,7 @@ parent: ClothingUniformBase id: N14ClothingUniformJumpsuitTribal name: tribal apparel - description: Fairly primitive clothing for fairly primitve people. + description: Fairly primitive clothing for fairly primitve people. components: - type: Sprite sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/tribal.rsi @@ -354,6 +354,50 @@ - type: Clothing sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerv3.rsi +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformRangerPatrol + name: patrol ranger uniform + description: A pair of brown slacks and a breathable shirt, meant to be worn under NCR patrol ranger armour. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi + +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformRangerModif + name: green ranger uniform + description: A ranger outfit with a green cotton longshirt and dark grey jeans along with a black bandana around the neck. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi + +- type: entity + parent: ClothingUniformBase + id: N14CltohingUniformRangerBlue + name: blue ranger outfit + description: Simple rustic clothes for a big iron packin' lawman. A blue collar shirt with tan slacks. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi + +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformRangerVeteran + name: rustic outfit + description: Simple rustic clothes for your day to day life in the wastes. + components: + - type: Sprite + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi + - type: Clothing + sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi + #midwest BoS - type: entity diff --git a/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml index 9375e7cc48f..71cf63fcf4b 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml @@ -1,8 +1,8 @@ # Wastelanders - type: entity - id: N14SpawnPointWastelander parent: SpawnPointJobBase + id: N14SpawnPointWastelander name: wastelander components: - type: SpawnPoint @@ -15,7 +15,7 @@ # BOS Midwest - type: entity id: N14SpawnPointBoSMidPaladinCommander - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS midwest paladin commander components: - type: SpawnPoint @@ -27,7 +27,7 @@ - type: entity id: N14SpawnPointBoSMidKnight - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS midwest knight components: - type: SpawnPoint @@ -39,7 +39,7 @@ - type: entity id: N14SpawnPointBoSMidPaladin - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS midwest paladin components: - type: SpawnPoint @@ -51,7 +51,7 @@ - type: entity id: N14SpawnPointBoSMidInitiate - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS midwest initiate components: - type: SpawnPoint @@ -63,7 +63,7 @@ - type: entity id: N14SpawnPointBoSMidScribe - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS midwest scribe components: - type: SpawnPoint @@ -73,10 +73,10 @@ - state: green - state: passenger # TODO make new icons -# BOS Washington +# BOS Washington - type: entity id: N14SpawnPointBoSWashingtonCommander - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS washington commander components: - type: SpawnPoint @@ -85,10 +85,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointBoSWashingtonRecruit - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS washington recruit components: - type: SpawnPoint @@ -97,10 +97,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointBoSWashingtonCaptain - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS washington caaptain components: - type: SpawnPoint @@ -109,10 +109,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointBoSWashingtonSoldier - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS washington soldier components: - type: SpawnPoint @@ -121,10 +121,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointBoSWashingtonResearcher - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: BOS washington researcher components: - type: SpawnPoint @@ -133,11 +133,11 @@ layers: - state: green - state: passenger # TODO make new icons - + # Caravan Company - type: entity id: N14SpawnPointCaravanLeader - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: caravan leader components: - type: SpawnPoint @@ -146,10 +146,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointCaravanTrader - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: caravan trader components: - type: SpawnPoint @@ -158,11 +158,23 @@ layers: - state: green - state: passenger # TODO make new icons - + +- type: entity + id: N14SpawnPointCaravanGuard + parent: N14SpawnPointWastelander + name: caravan guard + components: + - type: SpawnPoint + job_id: CaravanGuard + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + # NCR - type: entity id: N14SpawnPointNCRCadet - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: NCR cadet components: - type: SpawnPoint @@ -171,10 +183,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointNCRNCO - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: NCR NCO components: - type: SpawnPoint @@ -183,10 +195,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointNCROfficer - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: NCR officer components: - type: SpawnPoint @@ -195,10 +207,22 @@ layers: - state: green - state: passenger # TODO make new icons - + +- type: entity + id: N14SpawnPointNCRRanger + parent: N14SpawnPointWastelander + name: NCR ranger + components: + - type: SpawnPoint + job_id: NCRRanger + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + - type: entity id: N14SpawnPointNCRSoldier - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: NCR Soldier components: - type: SpawnPoint @@ -207,11 +231,48 @@ layers: - state: green - state: passenger # TODO make new icons - + +# Rangers +- type: entity + id: N14SpawnPointRangerRecruit + parent: N14SpawnPointWastelander + name: ranger recruit + components: + - type: SpawnPoint + job_id: RangerRecruit + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointRanger + parent: N14SpawnPointWastelander + name: ranger + components: + - type: SpawnPoint + job_id: Ranger + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointRangerVeteran + parent: N14SpawnPointWastelander + name: ranger veteran + components: + - type: SpawnPoint + job_id: RangerVeteran + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + # Tribals - type: entity id: N14SpawnPointTribal - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: tribal components: - type: SpawnPoint @@ -220,10 +281,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTribalElder - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: tribal elder components: - type: SpawnPoint @@ -232,10 +293,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTribalFarmer - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: tribal farmer components: - type: SpawnPoint @@ -244,10 +305,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTribalHealer - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: tribal healer components: - type: SpawnPoint @@ -256,11 +317,11 @@ layers: - state: green - state: passenger # TODO make new icons - + # Vault - type: entity id: N14SpawnPointOverseer - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: overseer components: - type: SpawnPoint @@ -269,10 +330,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointVaultDoctor - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: vault doctor components: - type: SpawnPoint @@ -281,10 +342,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointVaultDweller - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: vault dweller components: - type: SpawnPoint @@ -293,10 +354,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointVaultEngineer - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: vault engineer components: - type: SpawnPoint @@ -305,10 +366,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointVaultSecurity - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: vault security components: - type: SpawnPoint @@ -317,11 +378,11 @@ layers: - state: green - state: passenger # TODO make new icons - + # Wastelanders - type: entity id: N14SpawnPointWastelandBartender - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: wasteland bartender components: - type: SpawnPoint @@ -330,10 +391,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointWastelandChaplain - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: wasteland chaplain components: - type: SpawnPoint @@ -342,10 +403,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointWastelandFarmer - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: wasteland farmer components: - type: SpawnPoint @@ -354,10 +415,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointWastelandMusician - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: wasteland musician components: - type: SpawnPoint @@ -366,10 +427,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointWastelandReporter - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: wasteland reporter components: - type: SpawnPoint @@ -378,10 +439,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointWastelandScavenger - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: wasteland scavenger components: - type: SpawnPoint @@ -390,11 +451,11 @@ layers: - state: green - state: passenger # TODO make new icons - + # Townsfolk - type: entity id: N14SpawnPointTownsfolkTownsperson - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: townsperson components: - type: SpawnPoint @@ -403,10 +464,10 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTownsfolkTownMechanic - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: town mechanic components: - type: SpawnPoint @@ -415,82 +476,89 @@ layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTownsfolkTownDoctor - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: town doctor components: - type: SpawnPoint job_id: TownDoctor + - type: Sprite layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTownsfolkTownShopkeeper - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: town shopkeeper components: - type: SpawnPoint job_id: TownShopkeeper + - type: Sprite layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTownsfolkTownDeputy - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: town deputy components: - type: SpawnPoint job_id: TownDeputy + - type: Sprite layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTownsfolkTownSheriff - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: town sheriff components: - type: SpawnPoint job_id: TownSheriff + - type: Sprite layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointTownsfolkTownMayor - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: town mayor components: - type: SpawnPoint job_id: TownMayor + - type: Sprite layers: - state: green - state: passenger # TODO make new icons - - + + # Fun / Misc - type: entity id: N14SpawnPointFollowers - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: followers of the apocalypse components: - type: SpawnPoint job_id: Followers + - type: Sprite layers: - state: green - state: passenger # TODO make new icons - + - type: entity id: N14SpawnPointZetan - parent: SpawnPointJobBase + parent: N14SpawnPointWastelander name: Zetan components: - type: SpawnPoint job_id: Zetan + - type: Sprite layers: - state: green - state: passenger # TODO make new icons diff --git a/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/animals.yml index 717c3f56684..2cdde2c00b2 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -95,7 +95,7 @@ damage: groups: Brute: 5 - + - type: entity name: gecko id: N14MobGecko @@ -147,7 +147,7 @@ spawned: - id: N14FoodMeatGecko amount: 3 - + - type: entity name: nightstalker cub id: N14MobNightstalkerCub @@ -203,7 +203,7 @@ reagents: - ReagentId: Toxin Quantity: 2.5 - + - type: entity name: nightstalker id: N14MobNightstalker @@ -234,6 +234,10 @@ thresholds: 0: Alive 150: Dead + - type: Butcherable + spawned: + - id: N14MaterialNightstalkerPelt + amount: 1 - type: DamageStateVisuals states: Alive: @@ -277,7 +281,7 @@ fix1: shape: !type:PhysShapeCircle - radius: 0.5 + radius: 0.49 density: 100 mask: - MobMask @@ -287,6 +291,10 @@ thresholds: 0: Alive 500: Dead + - type: Butcherable + spawned: + - id: N14MaterialYaoguaiHide + amount: 1 - type: DamageStateVisuals states: Alive: @@ -304,6 +312,7 @@ damage: types: Slash: 15 + Structural: 5 range: 1.25 - type: MovementSpeedModifier baseWalkSpeed : 3 @@ -355,6 +364,7 @@ damage: types: Slash: 15 + Structural: 5 range: 1.5 - type: MovementSpeedModifier baseWalkSpeed : 3 @@ -365,6 +375,11 @@ speed: 1.5 qualities: - Prying + - type: Prying + pryPowered: !type:Bool + true + force: !type:Bool + true useSound: path: /Audio/Items/crowbar.ogg - type: Insulated @@ -397,6 +412,7 @@ damage: types: Slash: 22 + Structural: 10 - type: MobThresholds thresholds: 0: Alive @@ -409,7 +425,7 @@ Base: deathclaw # TODO: Crit sprite Dead: Base: dead - + - type: entity name: metal deathclaw id: N14MobDeathclawMetal @@ -431,6 +447,7 @@ damage: types: Slash: 20 + Structural: 10 - type: MobThresholds thresholds: 0: Alive diff --git a/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/insects.yml b/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/insects.yml index 9bd49fcc169..8c9b899dfe6 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/insects.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/insects.yml @@ -47,6 +47,8 @@ soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg - type: Butcherable spawned: + - id: N14MaterialAntChitin + amount: 1 - id: N14FoodMeatRadRaw amount: 1 prob: 0.75 @@ -94,6 +96,8 @@ Base: dead - type: Butcherable spawned: + - id: N14MaterialAntChitin + amount: 1 - id: N14FoodMeatRadRaw amount: 3 - type: Bloodstream @@ -139,6 +143,8 @@ Quantity: 10 - type: Butcherable spawned: + - id: N14MaterialAntChitin + amount: 1 - id: N14FoodMeatRadRaw amount: 3 - id: N14FoodFireantNectar @@ -237,6 +243,8 @@ Base: dead - type: Butcherable spawned: + - id: N14MaterialExoskeleton + amount: 1 - id: N14FoodMeatRadscorpion amount: 1 - id: N14FoodMeatRadscorpionLeg 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 68996e92398..16b060ec62b 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -96,6 +96,205 @@ Quantity: 50 - type: Sprite sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi + +# New Soda +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14DrinkNukaColaEmpty + name: Nuka Cola bottle + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: empty + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpillBehavior { } + - !type:SpawnEntitiesBehavior + spawn: + N14DrinkNukaColaBroken: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Item + size: Small + +- type: entity + parent: BrokenBottle + id: N14DrinkNukaColaBroken + name: broken Nuka Cola bottle + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: broken + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaCherry + name: Nuka Cola Cherry + description: The leading cola since 2044. Cherry flavor. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: cherry + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaCola + name: Nuka Cola + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: cola + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaGrape + name: Nuka Cola Grape + description: The leading cola since 2044. Grape flavor. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: grape + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaOrange + name: Nuka Cola Orange + description: The leading cola since 2044. Orange flavor. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: orange + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaYellow + name: Nuka Cola Yellow + description: A rare flavor of Nuka-Cola from crazy naked Roshambo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: piss + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaQuantum + name: Nuka Cola Quantum + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: quantum + shader: unshaded + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaQuartz + name: Nuka Cola Quartz + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: quartz + shader: unshaded + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + - type: PointLight + color: "#B2FFFF" + radius: 1.5 + energy: 0.2 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaVictory + name: Nuka Cola Victory + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: victory + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 + +- type: entity + parent: N14DrinkNukaColaEmpty + id: N14DrinkNukaColaWild + name: Nuka Cola Wild + description: The leading cola since 2044. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi + state: wild + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: NukaCola # Change me + Quantity: 50 # Alcohol #N14Absinthe @@ -103,16 +302,83 @@ #N14AlcoholZ #N14BeantownBrownBeer #N14Bourbon -#N14GammaGulpBeer + +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14DrinkGammagulpBeer + name: Gamma Gulp Beer + description: One of Gecko's biggest exports. A mild, radioactive alcohol. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: gammagulp + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: N14GammaGulpBeer + Quantity: 50 + #N14GwinnetStout #N14Lager #N14Moonshine #N14Pilsner -#N14RoentgenRum + +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14DrinkRoentgenRum + name: Roentgen Rum + description: One of Gecko's biggest exports. A strong, tingly alcohol. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: roentgen + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: N14RoentgenRum + Quantity: 50 + #N14RotGut #N14RumNuka #N14Scotch #N14Vodka -#N14Whiskey + +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14DrinkWhisky + name: whiskey + description: A bottle of standard looking whiskey + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: whisky + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: Whiskey + Quantity: 50 + #N14WhiskeyRare -#N14Wine + +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14DrinkWine + name: wine + description: Nappa Valley Wine. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Drinks/alcohol.rsi + state: nappavalleywine + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: N14Wine + Quantity: 50 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml index 53225f2c28e..102e066ff04 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Flora/wastelandflora.yml @@ -74,7 +74,7 @@ loot: All: WildBananaYuccaAll PlantSampleTaker: WildBananaYuccaClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildBarrelCactus @@ -135,7 +135,7 @@ loot: All: WildBrocFlowerAll PlantSampleTaker: WildBrocFlowerClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildBuffaloGourd @@ -178,7 +178,7 @@ loot: All: WildCabbageAll PlantSampleTaker: WildCabbageClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildCarrot @@ -220,7 +220,7 @@ - PlantSampleTaker loot: All: WildCaveFungusAll - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildCaveFungusRad @@ -245,7 +245,7 @@ - PlantSampleTaker loot: All: WildCaveFungusRadAll - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildCotton @@ -286,7 +286,7 @@ loot: All: WildCoyoteTobaccoAll PlantSampleTaker: WildCoyoteTobaccoClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildDatura @@ -368,7 +368,7 @@ loot: All: WildMesquiteAll PlantSampleTaker: WildMesquiteClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildMutfruit @@ -388,7 +388,7 @@ loot: All: WildMutfruitAll PlantSampleTaker: WildMutfruitClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildNettle @@ -429,7 +429,7 @@ loot: All: WildOnionAll PlantSampleTaker: WildOnionClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildPinyon @@ -449,7 +449,7 @@ loot: All: WildPinyonAll PlantSampleTaker: WildPinyonClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildPricklypear @@ -534,7 +534,7 @@ loot: All: WildTarberriesAll PlantSampleTaker: WildTarberriesClippers - + - type: entity parent: N14WastelandFlora id: N14WastelandFloraWildTato @@ -620,7 +620,7 @@ scale: 0.7, 0.7 - type: Item sprite: Nuclear14/Objects/Consumable/Flora/wastelandflora.rsi - + - type: entity abstract: True parent: N14FloraProduce @@ -639,8 +639,8 @@ Quantity: 4 - ReagentId: N14RadParticleFood Quantity: 1 - - + + # Plant Produce - type: entity parent: N14FloraProduce @@ -719,7 +719,7 @@ Quantity: 10 - type: Produce seedId: N14WildBarrelCactus - + - type: entity parent: N14FloraProduceFood @@ -829,7 +829,7 @@ Quantity: 10 - type: Produce seedId: N14WildCabbage - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildCarrot @@ -871,7 +871,7 @@ - type: Stack stackType: CaveFungus count: 1 - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildCaveFungusRad @@ -883,7 +883,19 @@ - type: Stack stackType: CaveFungusRad count: 1 - + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: ExtractFungusRad + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ExtractFungusRad + Quantity: 10 + - type: entity parent: N14FloraProduce id: N14FloraProduceWildCoyoteTobacco @@ -909,7 +921,7 @@ Quantity: 10 - type: Produce seedId: N14CoyoteTobacco - + - type: entity parent: N14FloraProduce id: N14FloraProduceWildDaturaFlower @@ -962,7 +974,7 @@ Quantity: 10 - type: Produce seedId: N14WildJalapeno - + - type: entity parent: N14FloraProduce id: N14FloraProduceWildMaize @@ -989,7 +1001,7 @@ Quantity: 10 - type: Produce seedId: N14WildMaize - + - type: entity parent: N14FloraProduce id: N14FloraProduceWildMesquitePods @@ -1015,7 +1027,7 @@ Quantity: 10 - type: Produce seedId: N14WildMesquite - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildMutfruit @@ -1041,7 +1053,7 @@ Quantity: 10 - type: Produce seedId: N14WildMutfruit - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildNettle @@ -1100,7 +1112,7 @@ - type: SliceableFood count: 4 slice: FoodOnionRedSlice # N14TODO: Create slice - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildPinyonNuts @@ -1114,7 +1126,7 @@ count: 1 - type: Produce seedId: N14WildPinyon - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildPricklyPearFruit @@ -1209,7 +1221,7 @@ Quantity: 10 - type: Produce seedId: N14Tarberry - + - type: entity parent: N14FloraProduceFood id: N14FloraProduceWildTato diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/cigarette.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/cigarette.yml new file mode 100644 index 00000000000..5483f724031 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/cigarette.yml @@ -0,0 +1,102 @@ +- type: entity + parent: Cigarette + id: N14Cigarette + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + state: unlit-icon + scale: 0.5, 0.5 + - type: Tag + tags: + - Cigarette + - Trash + - type: SpaceGarbage + - type: Clothing + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + slots: [ mask ] + equippedPrefix: unlit + - type: Item + size: Tiny + +- type: entity + parent: N14Cigarette + id: N14CigaretteSpent + suffix: spent + components: + - type: Sprite + state: burnt-icon + - type: Smokable + state: Burnt + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 20 + - type: Tag + tags: + - Cigarette + - Trash + - Burnt + +- type: entity + parent: N14Cigarette + id: N14CigaretteKool + description: A Kool brand cigarette. + suffix: kool + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi + - type: Clothing + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi + +- type: entity + parent: N14CigaretteKool + id: N14CigaretteSalem + description: A Salem brand cigarette. + suffix: salem + +- type: entity + parent: N14Cigarette + id: N14CigaretteMarlboro + description: A Marlboro brand cigarette. + suffix: marlboro + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi + - type: Clothing + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi + +- type: entity + parent: N14Cigarette + id: N14CigaretteRepublic + description: A Republic brand cigarette. + suffix: republic + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi + - type: Clothing + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi + +- type: entity + parent: N14Cigarette + id: N14CigaretteRollie + description: A roll up cigarette. + suffix: rollie + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi + - type: Clothing + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi + - type: Construction + graph: N14Cigarette + node: cigarette + +- type: entity + parent: N14Cigarette + id: N14CigaretteWinston + description: A Winston brand cigarette. + suffix: winston + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi + - type: Clothing + sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml new file mode 100644 index 00000000000..f5f274f0533 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/packs.yml @@ -0,0 +1,179 @@ +- type: entity + id: N14CigPackBase + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: cigarette pack + abstract: true + components: + - type: Sprite + scale: 0.65, 0.65 + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + - state: overlay_cig_0 + map: ["cig0"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_1 + map: ["cig1"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_2 + map: ["cig2"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_3 + map: ["cig3"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_4 + map: ["cig4"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_5 + map: ["cig5"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_6 + map: ["cig6"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_7 + map: ["cig7"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - state: overlay_cig_8 + map: ["cig8"] + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi + visible: false + - type: Tag + tags: + - CigPack + - Trash + - type: PhysicalComposition + materialComposition: + Cardboard: 10 + - type: Item + size: Tiny + shape: # Yes, this is cursed, but it breaks otherwise, dont question it. + - 0,0,0,1 + - type: Storage + grid: + - 0,0,4,1 + - type: StorageFill + contents: + - id: Cigarette + amount: 8 + - type: ItemCounter + count: + tags: [Cigarette] + composite: true + layerStates: + - cig0 + - cig1 + - cig2 + - cig3 + - cig4 + - cig5 + - cig6 + - cig7 + - cig8 + - type: Appearance + +# - type: entity + # parent: N14CigPackBase + # id: N14CigarettePack + # name: cigarette packet + # description: A generic pack of cigarettes. + +- type: entity + parent: N14CigPackBase + id: N14CigarettePackSalem + name: Salem cigs pack + description: A refined green cigarette packet. A label on the packaging reads, Salem. Refreshes your taste. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi + - type: StorageFill + contents: + - id: N14CigaretteSalem + amount: 8 + +- type: entity + parent: N14CigPackBase + id: N14CigarettePackKool + name: Kools cigs pack + description: A kool green cigarette packet. A label on the packaging reads, KOOL. So good, it's got to be KOOL! + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi + - type: StorageFill + contents: + - id: N14CigaretteKool + amount: 8 + +- type: entity + parent: N14CigPackBase + id: N14CigarettePackMarlboro + name: Marlboro cigs pack + description: A cool red cigarette packet. A label on the packaging reads, Marlboro. Where theres a man, theres a Marlboro. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi + - type: StorageFill + contents: + - id: N14CigaretteMarlboro + amount: 8 + +- type: entity + parent: N14CigPackBase + id: N14CigarettePackWinston + name: Winston cigs pack + description: A refined red cigarette packet. A label on the packaging reads, Winston. Winston tastes good, like a cigarette should! + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi + - type: StorageFill + contents: + - id: N14CigaretteWinston + amount: 8 + +- type: entity + parent: N14CigPackBase + id: N14CigarettePackCustom + suffix: custom + name: cardboard cigs pack + description: A simple hand-made cardboard cigarette pack + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi + - type: StorageFill + contents: + - id: N14CigaretteRollie + amount: 8 + +- type: entity + parent: N14CigPackBase + id: N14CigarettePackRepublics + name: Republics cig pack + description: A rustic cardboard cigarette pack with the flag of the New Californian Republic on it. A label on the packaging reads, Republics. Taste the freedom, feel the burn. + components: + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi + - type: StorageFill + contents: + - id: N14CigaretteRepublic + amount: 8 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/smokeables.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/smokeables.yml new file mode 100644 index 00000000000..e373b0c90a0 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Consumable/Smokeables/smokeables.yml @@ -0,0 +1,49 @@ +- type: entity + parent: BaseStorageItem + name: pack of rolling paper + id: N14PackRollingPaper + description: A pack of thin pieces of paper used to make fine smokeables. + components: + - type: Storage + grid: + - 0,0,3,1 + whitelist: + tags: + - RollingPaper + - CigFilter + - type: StorageFill + contents: + - id: N14RollingPaper + amount: 4 + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpapers + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + +- type: entity + parent: PaperRolling + id: N14RollingPaper + suffix: Full + components: + - type: Stack + stackType: N14RollingPaper + count: 5 + - type: Sprite + sprite: Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi + state: rollie_paper + scale: 0.6, 0.6 + - type: Item + sprite: Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi + size: Tiny + - type: Construction + graph: N14RollingPaper + node: rollingpaper + +- type: entity + id: N14RollingPaper1 + suffix: Single + parent: N14RollingPaper + components: + - type: Stack + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/containers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/containers.yml new file mode 100644 index 00000000000..7e8e140390d --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/containers.yml @@ -0,0 +1,86 @@ +- type: entity + parent: BaseItem + id: N14FuelTankHandy + name: fuel tank + description: A tank of Mr Handy fuel. + components: + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 5 + behaviors: + - !type:SolutionExplosionBehavior + solution: tank + - trigger: + !type:DamageTypeTrigger + damageType: Piercing + damage: 5 + behaviors: + - !type:SolutionExplosionBehavior + solution: tank + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpillBehavior + solution: tank + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:DoActsBehavior + acts: ["Destruction"] + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: WeldingFuel + Quantity: 250 + - type: DrainableSolution + solution: tank + - type: ExaminableSolution + solution: tank + - type: ReagentTank + tankType: Fuel + - type: DamageOnToolInteract + tools: + - Welding + weldingDamage: + types: + Heat: 10 + - type: PacifismDangerousAttack + - type: Explosive + explosionType: Default + totalIntensity: 20 # ~ 4 tile radius + - type: Sprite + sprite: Nuclear14/Objects/Misc/handyfuel.rsi + layers: + - state: fuel + # - state: fueltank-2-1 + # map: ["enum.SolutionContainerLayers.Fill"] + # visible: false + # - type: Appearance + # - type: SolutionContainerVisuals + # maxFillLevels: 3 + # fillBaseName: fueltank-2- + +- type: entity + parent: N14FuelTankHandy + id: N14FuelTankHandyRusty + name: fuel tank + suffix: rusty + description: A rusty tank of Mr Handy fuel. + components: + - type: Sprite + layers: + - state: fuel-rusty \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/materials.yml index f5dd471f44d..036da99ce99 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Materials/materials.yml @@ -28,12 +28,13 @@ reagents: - ReagentId: Gunpowder Quantity: 10 - - type: DrainableSolution - solution: powder + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Gunpowder + Quantity: 10 - type: ExaminableSolution solution: powder - - type: DeleteOnSolutionEmpty - solution: powder - type: Tag tags: - RawMaterial @@ -81,6 +82,11 @@ reagents: - ReagentId: Sulfur Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Sulfur + Quantity: 10 - type: entity parent: SulfurPowder @@ -96,4 +102,36 @@ suffix: 10 components: - type: Stack - count: 10 \ No newline at end of file + count: 10 + +- type: entity + parent: SheetPaper + id: N14Paper + name: paper + suffix: 10 + components: + - type: Stack + stackType: N14Paper + count: 10 + baseLayer: base + layerStates: + - paper + - type: Sprite + sprite: /Textures/Nuclear14/Objects/Misc/clutter.rsi + state: paper + layers: + - state: paper + map: ["base"] + - type: Item + heldPrefix: paper + - type: Construction + graph: N14Paper + node: paper + +- type: entity + parent: N14Paper + id: N14Paper1 + suffix: Single + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml index d6d394f19ff..0bbac4f8097 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/craftingmaterials.yml @@ -8,7 +8,19 @@ - type: Sprite sprite: Nuclear14/Objects/Misc/crafting_material.rsi state: radscorpiontail - + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: N14ScorpionTail + Quantity: 10 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: N14ScorpionTail + Quantity: 10 + - type: entity parent: BaseItem id: N14MaterialBrahminHide @@ -19,4 +31,56 @@ sprite: Nuclear14/Objects/Misc/mob_drops.rsi state: hide_brahmin - type: Stack - stackType: BrahminHide \ No newline at end of file + stackType: BrahminHide + +- type: entity + parent: BaseItem + id: N14MaterialAntChitin + name: ant chitin + description: A strong and resistent piece of ant "skin". + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/mob_drops.rsi + state: chitin + +- type: entity + parent: BaseItem + id: N14MaterialExoskeleton + name: radscorpion exoskeleton piece + description: A strong and resistent piece of radscorpion exoskeleton. + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/mob_drops.rsi + state: rad_exo + +- type: entity + parent: BaseItem + id: N14MaterialNightstalkerPelt + name: nightstalker pelt + description: A pelt of fresh nightstalker leather. + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/mob_drops.rsi + state: pelt_nightstalker + +- type: entity + parent: BaseItem + id: N14MaterialYaoguaiHide + name: yaoguai hide + description: A big hide of yaoguai, heavy and strong. + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/mob_drops.rsi + state: hide_yaoguai + +# Materials + +- type: entity + parent: BaseItem + id: N14MaterialLeather + name: leather + description: A piece of leather, just non special leather. + components: + - type: Sprite + sprite: Nuclear14/Objects/Misc/materials.rsi + state: leather \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml index 20e3f24f4a5..b77f723e0d8 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/currency.yml @@ -14,6 +14,7 @@ quickEquip: false slots: - belt + - idcard - type: Storage grid: - 0,0,2,1 @@ -46,9 +47,12 @@ - caps - caps2 - caps3 + - moneypouch + - moneybag - type: Sprite sprite: Nuclear14/Objects/Misc/currency.rsi state: caps + scale: 0.6, 0.6 layers: - state: caps3 map: ["base"] @@ -72,7 +76,7 @@ name: caps icon: { sprite: /Textures/Nuclear14/Objects/Misc/currency.rsi, state: caps3 } spawn: N14CurrencyCap - maxCount: 1000 + maxCount: 500 - type: entity parent: N14CurrencyCap @@ -246,6 +250,7 @@ - aurelius - aurelius2 - aurelius3 + - moneybag - type: Sprite sprite: Nuclear14/Objects/Misc/currency.rsi state: aurelius @@ -258,7 +263,7 @@ name: legion aurei icon: { sprite: /Textures/Nuclear14/Objects/Misc/currency.rsi, state: aurelius3 } spawn: N14CurrencyLegionAureus - maxCount: 1000 + maxCount: 500 - type: entity parent: N14CurrencyLegionAureus @@ -308,6 +313,7 @@ - denarius - denarius2 - denarius3 + - moneybag - type: Sprite sprite: Nuclear14/Objects/Misc/currency.rsi state: denarius @@ -320,7 +326,7 @@ name: legion denarii icon: { sprite: /Textures/Nuclear14/Objects/Misc/currency.rsi, state: denarius3 } spawn: N14CurrencyLegionDenarius - maxCount: 1000 + maxCount: 500 - type: entity parent: N14CurrencyLegionDenarius diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/junk.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/junk.yml index 8292a2bc1d6..2db808ce4f3 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/junk.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/junk.yml @@ -10,7 +10,8 @@ - type: Tag tags: - JunkItem - + - Trash + - type: entity parent: N14JunkItemBase id: N14JunkItemBasePlastic # Parent anything made from plastic to this. @@ -22,20 +23,35 @@ - type: PhysicalComposition materialComposition: Plastic: 50 - + - type: entity parent: N14JunkItemBase id: N14JunkItemBaseMetal # Parent anything made from metal to this. abstract: true components: + - type: WelderRefinable + refineResult: + - SheetSteel1 - type: PhysicalComposition materialComposition: Steel: 50 +- type: entity + parent: [N14JunkItemBase, DrinkBottlePlasticBaseFull] + id: N14JunkItemBaseContainer + abstract: true + components: + - type: WelderRefinable + refineResult: + - SheetPlastic1 + - type: PhysicalComposition + materialComposition: + Plastic: 50 + # TODO: Give all items in orGroup: "JunkItem" material composition they can be "welded", "wrenched" or "pried" into # Products and Random Bits - type: entity - parent: N14JunkItemBase + parent: N14JunkItemBaseContainer id: N14JunkAbraxoCleaner name: Abraxo Cleaner description: Abraxo brand detergent. @@ -48,6 +64,12 @@ reagents: - ReagentId: Abraxocleaner Quantity: 50 + - type: WelderRefinable + refineResult: + - MaterialCardboard2 + - type: PhysicalComposition + materialComposition: + Cardboard: 100 - type: entity parent: N14JunkItemBasePlastic @@ -112,6 +134,10 @@ components: - type: Sprite state: iron + - type: WelderRefinable + refineResult: + - SheetSteel1 + - SheetSteel1 - type: entity parent: N14JunkItemBaseMetal @@ -177,7 +203,7 @@ state: toy_race_car - type: entity - parent: N14JunkItemBaseMetal + parent: N14JunkItemBaseContainer id: N14JunkTurpentine name: turpentine description: A can of turps. @@ -220,7 +246,7 @@ type: TransferAmountBoundUserInterface - type: entity - parent: N14JunkItemBasePlastic + parent: N14JunkItemBaseContainer id: N14JunkWonderglue name: Wonderglue description: A bottle of old Wonderglue. diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml index 2dbe0f55c0a..ec95010c432 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml @@ -11,7 +11,7 @@ size: Huge - type: SpawnItemsOnUse items: - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -38,7 +38,7 @@ - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm - id: N14MagazinePistol9mm - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -63,7 +63,7 @@ - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm - id: N14MagazinePistol9mm - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -87,8 +87,8 @@ - id: N14WeaponPistolColt - id: N14MagazinePistol45 - id: N14MagazinePistol45 - - id: N14MagazinePistol45 - - id: N14CombatKnife + - id: N14MagazinePistol45 + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -112,6 +112,30 @@ - id: N14WeaponPistolColt - id: N14MagazinePistol45 - id: N14MagazinePistol45 + - id: N14MagazinePistol45 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: morale booster kit + parent: KitBase + id: KitMorale + description: Only the most loyal troops of the NCR carry low quality equipment, a special troop made only to boost the morale during suicide charges. + components: + - type: Sprite + state: pointman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14ClothingOuterNCRPlate + - id: N14ClothingMaskPlate + - id: ClothingBeltNCRPouches + - id: N14WastelandFlagSpear + - id: N14ClothingBackpackSatchelNCR + - id: N14WeaponPistolColt + - id: N14MagazinePistol45 - id: N14MagazinePistol45 - id: N14CombatKnife sound: @@ -130,17 +154,17 @@ - type: SpawnItemsOnUse items: - id: N14ClothingOuterNCRPouchedVest - - id: ClothingBeltNCRHarness + - id: ClothingBeltMedicalfilled - id: N14ClothingBackpackSatchelNCR - id: N14weapon9mmSMG - id: N14MagazineSMG9mm - - id: N14MagazineSMG9mm + - id: N14MagazineSMG9mm - id: N14MagazineSMG9mm - id: N14MagazineSMG9mm - id: N14WeaponPistol10mm - id: N14MagazinePistol10mm - id: N14MagazinePistol10mm - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -161,11 +185,11 @@ - id: ClipMagazine308Rifle - id: ClipMagazine308Rifle - id: ClipMagazine308Rifle - - id: ClipMagazine308Rifle + - id: ClipMagazine308Rifle - id: N14WeaponPistol10mm - id: N14MagazinePistol10mm - id: N14MagazinePistol10mm - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -188,7 +212,7 @@ - id: N14WeaponPistol10mm - id: N14MagazinePistol10mm - id: N14MagazinePistol10mm - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -206,11 +230,11 @@ items: - id: N14WeaponAutoRifle - id: Magazine308Rifle - - id: Magazine308Rifle + - id: Magazine308Rifle - id: N14WeaponPistol10mm - id: N14MagazinePistol10mm - id: N14MagazinePistol10mm - - id: N14CombatKnife + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg @@ -233,6 +257,232 @@ - id: N14WeaponPistol10mm - id: N14MagazinePistol10mm - id: N14MagazinePistol10mm - - id: N14CombatKnife + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +# Ranger + +- type: entity + name: ranger rifleman kit + parent: KitBase + id: KitRiflemanRanger + description: A crate containing advance weaponry for members of the rangers. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponCarbine + - id: LongMagazine5.56Rifle + - id: LongMagazine5.56Rifle + - id: LongMagazine5.56Rifle + - id: MagazineBox5.56 + - id: N14WeaponRevolverMagnun + - id: SpeedLoader44 + - id: SpeedLoader44 + - id: MagazineBox44 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: ranger marksman kit + parent: KitBase + id: KitMarksmanRanger + description: A crate containing advance weaponry for members of the rangers. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponMarksman + - id: Magazine7.62Rifle + - id: Magazine7.62Rifle + - id: Magazine7.62Rifle + - id: MagazineBox7.62 + - id: N14WeaponRevolverMagnun + - id: SpeedLoader44 + - id: SpeedLoader44 + - id: MagazineBox44 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: ranger CQB specialist kit + parent: KitBase + id: KitCQBRanger + description: A crate containing advance weaponry for members of the rangers. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponAutoShotgun + - id: N14MagazineShotgun12 + - id: N14MagazineShotgun12 + - id: N14MagazineShotgun12 + - id: MagazineBox12gauge + - id: N14WeaponRevolverMagnun + - id: SpeedLoader44 + - id: SpeedLoader44 + - id: MagazineBox44 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: veteran ranger precision rifle kit + parent: KitBase + id: KitRiflemanRangerVeteran + description: A cache containing belongings of a veteran ranger. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponBrushGun + - id: MagazineBox45-70 + - id: MagazineBox45-70 + - id: N14WeaponHunterRevolver + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: MagazineBox45-70 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: veteran ranger heavy sniper kit + parent: KitBase + id: KitHeavySniperRangerVeteran + description: A cache containing belongings of a veteran ranger. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponAntiMateriel + - id: MagazineBox50 + - id: N14WeaponHunterRevolver + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: MagazineBox45-70 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: veteran ranger trailman kit + parent: KitBase + id: KitTrailmanRangerVeteran + description: A cache containing belongings of a veteran ranger. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponLeverCarbine + - id: MagazineBox44 + - id: MagazineBox44 + - id: N14WeaponHunterRevolver + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: MagazineBox45-70 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: veteran ranger assault kit + parent: KitBase + id: KitAssaultRangerVeteran + description: A cache containing belongings of a veteran ranger. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponCarbine + - id: LongMagazine5.56Rifle + - id: LongMagazine5.56Rifle + - id: LongMagazine5.56Rifle + - id: MagazineBox5.56 + - id: N14WeaponHunterRevolver + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: MagazineBox45-70 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: veteran ranger marksman kit + parent: KitBase + id: KitMarksmanRangerVeteran + description: A cache containing belongings of a veteran ranger. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponMarksman + - id: Magazine7.62Rifle + - id: Magazine7.62Rifle + - id: Magazine7.62Rifle + - id: MagazineBox7.62 + - id: N14WeaponHunterRevolver + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: MagazineBox45-70 + - id: N14CombatKnife + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: veteran ranger cqb kit + parent: KitBase + id: KitCQBRangerVeteran + description: A cache containing belongings of a veteran ranger. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponRiotShotgun + - id: N14MagazineShotgun20 + - id: N14MagazineShotgun20 + - id: N14MagazineShotgun20 + - id: MagazineBox20gauge + - id: N14WeaponHunterRevolver + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: SpeedLoader45-70 + - id: MagazineBox45-70 + - id: N14CombatKnife sound: path: /Audio/Effects/unwrap.ogg diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index f97f135cd40..2f0ca9960da 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -1,4 +1,4 @@ -# TODO: Sprites exist, just need entities and reagents etc: berserkpowder, bitterdrink, healingpowder, healingpoultice, hydra, traumapack, mourningpoultice? Plus anything else not sprited. +# TODO: Sprites exist, just need entities and reagents etc: berserkpowder, hydra, traumapack. Plus anything else not sprited. - type: entity parent: BaseItem @@ -17,7 +17,7 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 30 + maxVol: 15 - type: ExaminableSolution solution: pen - type: Hypospray @@ -29,6 +29,59 @@ maxFillLevels: 1 changeColor: false emptySpriteName: stimpak0 + - type: WelderRefinable + refineResult: + - SheetPlastic1 + +- type: entity + name: doctors syringe + parent: BaseItem + description: Used to draw blood samples from mobs, or to inject them with reagents. Chem junkies would kill you for it. + id: N14BaseSyringe + abstract: true + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Medical/drugs.rsi + layers: + - state: stimpak + map: ["enum.SolutionContainerLayers.Fill"] + - type: Item + sprite: Objects/Specific/Medical/medipen.rsi + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + - type: Injector + injectOnly: false + - type: ExaminableSolution + solution: injector + - type: Spillable + solution: injector + - type: TrashOnSolutionEmpty + solution: injector + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: stimpak0 + - type: WelderRefinable + refineResult: + - SheetPlastic1 + - type: Tag + tags: + - Syringe + +- type: entity + parent: N14BaseSyringe + id: N14DoctorSyringe + components: + - type: Injector + transferAmount: 15 + toggleState: Draw + - type: Tag + tags: + - Syringe + - Trash - type: entity parent: N14ChemicalSyringe @@ -57,7 +110,7 @@ - type: Construction graph: N14Stimpak node: stimpak - + - type: entity parent: N14Stimpak id: N14StimpakDirty @@ -125,7 +178,7 @@ reagents: - ReagentId: Antidote Quantity: 15 - + - type: entity parent: N14ChemicalSyringe id: N14JetInhaler @@ -149,7 +202,7 @@ node: jet - type: entity - parent: N14ChemicalSyringe + parent: N14JetInhaler id: N14Jet suffix: filled name: Jet @@ -217,7 +270,7 @@ parent: N14ChemicalSyringe id: N14Psycho name: psycho - description: A syringe filled with a reagent designed to make you more violent. Legend has it that these have a military origin. + description: A syringe filled with a reagent designed to make you more violent. Legend has it that these have a military origin. components: - type: Sprite layers: @@ -287,8 +340,8 @@ - type: Construction graph: N14HealingPowder node: healingpowder - - + + - type: entity parent: DrinkBottleGlassBaseFull id: N14Antidote @@ -304,3 +357,107 @@ - type: Sprite sprite: Nuclear14/Objects/Specific/Medical/fallout2.rsi state: antidote + +- type: entity + parent: N14ChemicalSyringe + id: N14SmellingSalts + name: smelling salts + description: A small glass ampoule containing smelling salts. Their smell is said to wake up even a dead ghoul. + components: + - type: Sprite + layers: + - state: smellingsalts + map: [ "enum.SolutionContainerLayers.Fill" ] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: smellingsalts0 + - type: Hypospray + solutionName: pen + transferAmount: 25 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 10 + reagents: + - ReagentId: SmellingSalts + Quantity: 10 + +- type: entity + parent: Pill + id: N14HealingPoultice + name: healing Healing + description: A bag of poultice to help with all common ailments slowly. + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Medical/drugs.rsi + state: healingpoultice + - type: Item + sprite: Nuclear14/Objects/Specific/Medical/drugs.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: HealingPoultice + Quantity: 20 + +- type: entity + parent: DrinkBottleGlassBaseFull + id: N14Bitterdrink + name: Bitterdrink + description: A bottle containing a mixture of plants to aid against poisons and radiation. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Bitterdrink + Quantity: 50 + - type: Sprite + sprite: Nuclear14/Objects/Specific/Medical/drugs.rsi + state: bitterdrink + +- type: entity + parent: Pill + id: N14MourningPoultice + name: mourning poultice + description: A bag of powder made from poisonous flowers for use within tribal ceremenoies. + components: + - type: Sprite + sprite: Nuclear14/Objects/Specific/Medical/drugs.rsi + state: mourningpoultice + - type: Item + sprite: Nuclear14/Objects/Specific/Medical/drugs.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: MourningPoultice + Quantity: 20 + +- type: entity + parent: N14ChemicalSyringe + id: N14UltraStimpak + name: ultra stimpak + description: A special type of super stimpak with an additional mixture of chemicals which makes a man near invincible at a great cost. It is widely deemed inhumane and outlawed. + components: + - type: Sprite + layers: + - state: ultrastimpak + map: [ "enum.SolutionContainerLayers.Fill" ] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: ultrarstimpak0 + - type: Hypospray + solutionName: pen + transferAmount: 25 + - type: SolutionContainerManager + solutions: + pen: + maxVol: 25 + reagents: + - ReagentId: UltraRobustHealingMixture + Quantity: 25 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/equipment.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/equipment.yml new file mode 100644 index 00000000000..6dc6372835d --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Medical/equipment.yml @@ -0,0 +1,65 @@ +- type: entity + id: N14MortarpestleGrinder + parent: BaseItem + name: mortar & pestle + description: A mortar and pestle for grinding things into reagents. + suffix: grinder/juicer + components: + - type: ReagentGrinder + workTime: 10 + grindSound: /Audio/Effects/metal_scrape3.ogg + juiceSound: /Audio/Effects/metal_scrape3.ogg + - type: ActivatableUI + key: enum.ReagentGrinderUiKey.Key + - type: UserInterface + interfaces: + - key: enum.ReagentGrinderUiKey.Key + type: ReagentGrinderBoundUserInterface + - type: Appearance + - type: Sprite + sprite: Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi + drawdepth: SmallObjects + snapCardinals: true + offset: "0.0,0.4" + layers: + - map: [ "grinder" ] + state: mortar + - state: pestle + - type: GenericVisualizer + visuals: + enum.ReagentGrinderVisualState.BeakerAttached: + bottle: + True: {state: "bottle1"} + False: {state: "pestle"} + # - type: SolutionContainerManager + # solutions: + # grinder: + # maxVol: 50 + # - type: SolutionTransfer + # canChangeTransferAmount: true + # - type: RefillableSolution + # solution: grinder + # - type: DrainableSolution + # solution: grinder + # - type: ExaminableSolution + # solution: grinder + # - type: DrawableSolution + # solution: grinder + # - type: Spillable + # solution: grinder + - type: ContainerContainer + containers: + beakerSlot: !type:ContainerSlot + inputContainer: !type:Container + - type: ItemSlots + slots: + beakerSlot: + whitelist: + components: + - FitsInDispenser + - type: ExtensionCableReceiver + - type: ApcPowerReceiver + needsPower: false + - type: Construction + graph: N14MortarPestle + node: mortarpestle \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45-70.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45-70.yml new file mode 100644 index 00000000000..ac4020381b2 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/45-70.yml @@ -0,0 +1,35 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox45-70 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge45-70 + proto: N14Cartridge45-70 + capacity: 30 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBox45-70 + id: MagazineBox45-70 + name: ammunition box (.45-70 gov't) + components: + - type: BallisticAmmoProvider + proto: N14Cartridge45-70 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml index 8b137891791..a2ccdcafc75 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Boxes/50.yml @@ -1 +1,35 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox50 + components: + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - N14Cartridge.50 + proto: N14Cartridge.50 + capacity: 30 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/50anti-material.rsi + netsync: false + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance +- type: entity + parent: BaseMagazineBox50 + id: MagazineBox50 + name: ammunition box (.50 anti materiel) + components: + - type: BallisticAmmoProvider + proto: N14Cartridge.50 + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45-70.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45-70.yml new file mode 100644 index 00000000000..428570a3eb5 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/45-70.yml @@ -0,0 +1,11 @@ +- type: entity + id: N14Cartridge45-70 + name: cartridge (.45-70 gov't) + parent: BaseCartridgeLightRifle + components: + - type: CartridgeAmmo + proto: N14Bullet45-70 + - type: Tag + tags: + - Cartridge + - N14Cartridge45-70 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml index ce90efd7d0d..a0e02a114fc 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/50.yml @@ -6,7 +6,7 @@ - type: Tag tags: - Cartridge - - CartridgeAntiMateriel + - N14Cartridge.50 - type: CartridgeAmmo proto: N14Bullet50 - type: Sprite diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml index f1c41e6824b..26f390db414 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/12gauge.yml @@ -10,4 +10,4 @@ - type: Projectile damage: types: - Piercing: 12 + Piercing: 10 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml index ea613338953..6e01282f438 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/308.yml @@ -7,4 +7,4 @@ - type: Projectile damage: types: - Piercing: 32 + Piercing: 38 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml index 02b4eadd44f..47c2698ad13 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/44.yml @@ -7,4 +7,4 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 30 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml new file mode 100644 index 00000000000..8da28f40bff --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml @@ -0,0 +1,10 @@ +- type: entity + id: N14Bullet45-70 + name: bullet (.45-70 gov't) + parent: BaseBullet + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 32 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 f437230d0cf..787192b9331 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 @@ -7,4 +7,4 @@ - type: Projectile damage: types: - Piercing: 49 + Piercing: 60 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/10mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/10mm.yml new file mode 100644 index 00000000000..943060394c3 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/10mm.yml @@ -0,0 +1,40 @@ +- type: entity + id: N14BaseSpeedLoader10 + name: "speed loader (10mm)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoader + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - N14CartridgePistol10 + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoader10 + name: "speed loader (10mm)" + parent: N14BaseSpeedLoader10 + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol10 + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/44.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/44.yml new file mode 100644 index 00000000000..405048b3971 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/44.yml @@ -0,0 +1,40 @@ +- type: entity + id: N14BaseSpeedLoader44 + name: "speed loader (.44 magnum)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoader + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - N14Cartridge44Magnum + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoader44 + name: "speed loader (.44 magnum)" + parent: N14BaseSpeedLoader44 + components: + - type: BallisticAmmoProvider + proto: N14Cartridge44Magnum + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/45-70.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/45-70.yml new file mode 100644 index 00000000000..cc663051d24 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/45-70.yml @@ -0,0 +1,40 @@ +- type: entity + id: N14BaseSpeedLoader45-70 + name: "speed loader (45-70 gov)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoader + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - N14Cartridge45-70 + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoader45-70 + name: "speed loader (45-70 gov)" + parent: N14BaseSpeedLoader45-70 + components: + - type: BallisticAmmoProvider + proto: N14Cartridge45-70 + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/9mm.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/9mm.yml new file mode 100644 index 00000000000..996d7ecb0d6 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Speedloaders/9mm.yml @@ -0,0 +1,40 @@ +- type: entity + id: N14BaseSpeedLoader9 + name: "speed loader (9mm)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoader + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - N14CartridgePistol9 + capacity: 6 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoader9 + name: "speed loader (9mm)" + parent: N14BaseSpeedLoader9 + components: + - type: BallisticAmmoProvider + proto: N14CartridgePistol9 + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml index 99e2c777683..9553f58608c 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/LMGs/LMGs.yml @@ -4,6 +4,8 @@ id: N14WeaponAutoRifle description: A high caliber long and heavy machine gun of the pre-war, chambered in the powerfull 308. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi layers: @@ -62,6 +64,8 @@ id: N14WeaponLMG description: A light machine gun designed by the NCR for their heavy troops, sometimes gived to the troops in low numbers, chambered in 5.56. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi layers: diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index af54bdb8091..dd111a9b186 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -12,10 +12,28 @@ whitelist: tags: - N14CartridgePistol9 + - SpeedLoader proto: N14CartridgePistol9 - type: entity - name: Magnum revolver + name: 10mm revolver + parent: BaseWeaponRevolver + id: N14WeaponRevolver10mm + description: The first prototype for the semiauto 10mm pistol, Uses 10mm ammo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - N14CartridgePistol10 + - SpeedLoader + proto: N14CartridgePistol10 + +- type: entity + name: magnum revolver parent: BaseWeaponRevolver id: N14WeaponRevolverMagnun description: The Big Iron. Uses .44 magnum ammo. @@ -28,13 +46,14 @@ whitelist: tags: - N14Cartridge44Magnum + - SpeedLoader proto: N14Cartridge44Magnum - type: entity name: hunting revolver parent: BaseWeaponRevolver id: N14WeaponHunterRevolver - description: A heavy revolver with a long cannon designed to hunt small animals, but it also works for people. Uses .44 magnum ammo. + description: A heavy revolver with a long cannon designed to hunt small animals, but it also works for people. Uses .45-70 gov't ammo. components: - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi @@ -43,5 +62,23 @@ - type: RevolverAmmoProvider whitelist: tags: - - N14Cartridge44Magnum - proto: N14Cartridge44Magnum + - N14Cartridge45-70 + - SpeedLoader + proto: N14Cartridge45-70 + +- type: entity + name: ranger sequoia + parent: BaseWeaponRevolver + id: N14WeaponRangerSequoia + description: 20 years of suffering for a good looking glorified revolver, worth it. Uses .45-70 gov't ammo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi + - type: RevolverAmmoProvider + whitelist: + tags: + - N14Cartridge45-70 + - SpeedLoader + proto: N14Cartridge45-70 diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 86121e67d4b..ebcb0c2240b 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -4,6 +4,12 @@ id: N14WeaponRifleR91 description: An old fashioned assault rifle chambered in 5.56. # TODO: Need to create projectiles, magazines and boxes for 5.56. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi layers: @@ -58,6 +64,12 @@ id: N14WeaponChineseRifle description: A old foreing assault rifle with strange simbols on it, the chamber has enough space to hold a 7,62 bullet. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi layers: @@ -109,6 +121,12 @@ id: N14WeaponCarbine description: A black compact assault rifle, uses 5.56 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi layers: @@ -164,6 +182,12 @@ id: N14WeaponMarksman description: A heavy semiautomatic rifle with a scope, uses 7.62 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi layers: @@ -217,6 +241,12 @@ id: N14WeaponService description: A cheap mass produced post war rifle made by the NCR, chambered in 5.56. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi layers: @@ -269,6 +299,12 @@ id: N14WeaponBattleRifle description: A long semi automatic rifle feed by clips, chambered in the powerfull 308. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi layers: @@ -323,6 +359,12 @@ id: N14WeaponOldCarbine description: A short compact rifle of the pre-war, chambered in 5.56. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi layers: diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 21cf2024b00..30baf8a6415 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -4,6 +4,12 @@ id: N14WeaponSubMachineGun10mm description: Fully automatic submachinegun chambered in 10mm. # TODO: Need to create projectiles, magazines and boxes for 10mm. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi layers: @@ -55,6 +61,12 @@ id: N14WeaponSubMachineGun12mm description: A heavy submachinegun chambered in 12mm. # TODO: Need to create projectiles, magazines and boxes for 12mm. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi layers: @@ -62,8 +74,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi - type: Gun fireRate: 6 soundGunshot: @@ -109,6 +119,12 @@ id: N14weapon12mmpipe description: a makeshift 12mm SMG, looks like is gonna explode the second it shoots. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi layers: @@ -163,6 +179,12 @@ id: N14weapon10mmpipe description: a makeshift 10mm SMG, if you shake it you could hear the loose parts inside of the gun. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi layers: @@ -214,6 +236,12 @@ id: N14WeaponAdvanceSubMachineGun12mm description: A bulky sub machine gun with a top magazine fed system, it uses 12mm ammmo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi layers: @@ -221,8 +249,6 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi - type: Gun fireRate: 7 soundGunshot: @@ -268,6 +294,12 @@ id: N14weapon9mmSMG description: a metallic pre-war simple SMG, chambered in 9mm. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi layers: @@ -319,6 +351,12 @@ id: N14Weapon45SMG description: A pre-war SMG with a wooden stock, chambered in .45. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi layers: diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index e484716ebbd..dd23b98bb29 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -4,13 +4,19 @@ id: N14WeaponDoubleBarrelShotgun description: An immortal classic, uses 12 gauge shells. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi - type: Wieldable - type: Gun - fireRate: 8 + fireRate: 6 - type: BallisticAmmoProvider whitelist: tags: @@ -24,6 +30,14 @@ id: N14WeaponShotgun description: A pump action shotgun. components: + - type: Gun + fireRate: 1 + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi - type: Item @@ -50,6 +64,12 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-0 map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi size: Large @@ -62,7 +82,7 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 - fireRate: 3 + fireRate: 2 selectedMode: FullAuto availableModes: - FullAuto @@ -98,6 +118,12 @@ id: N14WeaponCaravanShotgun description: The perfect shotgun for a long jorney. works well for hunting brahmins, geckos and fiends, uses 20 gauge shells. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi - type: Item @@ -118,6 +144,12 @@ id: N14WeaponLeverShotgun description: The perfect gun for a cowboy, it uses 20 gauge shells. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi - type: Item @@ -137,7 +169,7 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 - fireRate: 3 + fireRate: 1 - type: entity name: riot shotgun @@ -145,6 +177,12 @@ id: N14WeaponRiotShotgun description: A compact semi automatic shotgun used by the police forces of the pre war, chambered in 20 gauge shells. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi + quickEquip: false + slots: + - Back + - suitStorage - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi netsync: false @@ -154,6 +192,7 @@ - state: mag-0 map: ["enum.GunVisualLayers.Mag"] - type: Item + size: Ginormous sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi - type: Wieldable - type: GunWieldBonus @@ -164,7 +203,7 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 - fireRate: 4 + fireRate: 2 selectedMode: SemiAuto availableModes: - SemiAuto diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 2ba431923fe..fc72fc517db 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -4,6 +4,8 @@ id: N14WeaponSniperHunting description: A rugged bolt action rifle. Uses .308 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi - type: Item @@ -48,7 +50,24 @@ minAngle: 24 maxAngle: 105 angleIncrease: 4 - angleDecay: 16 + angleDecay: 16 + +- type: entity + name: .50 NCR rifle + parent: N14WeaponAntiMateriel + id: N14Weapon50NcrRifle + description: A try by the NCR to make .50 ammo a standart on normal infantry, very cheap but it will deal a lot of damage. Uses .50 anti-material ammo. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi + - type: BallisticAmmoProvider + whitelist: + tags: + - N14Cartridge.50 + capacity: 1 + proto: N14Cartridge.50 - type: entity name: lever action carbine @@ -56,6 +75,8 @@ id: N14WeaponLeverCarbine description: A lever action short carbine. Uses .44 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi - type: Item @@ -69,7 +90,7 @@ maxAngle: 105 angleIncrease: 4 angleDecay: 16 - fireRate: 3 + fireRate: 1 - type: BallisticAmmoProvider whitelist: tags: @@ -83,27 +104,42 @@ id: N14WeaponLeverRifle description: A long lever action repeater rifle. Uses .308 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - type: Item sprite: Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi - - type: Wieldable - - type: GunWieldBonus - minAngle: -23 - maxAngle: -104 - type: Gun - minAngle: 24 - maxAngle: 105 - angleIncrease: 4 - angleDecay: 16 - fireRate: 2 + fireRate: 1 - type: entity - name: Pipe Rifle + name: brush gun + parent: N14WeaponSniperHunting + id: N14WeaponBrushGun + description: A powerfull lever action carbine. Uses .45-70 gov't ammo. + components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi + - type: Item + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi + - type: BallisticAmmoProvider + whitelist: + tags: + - N14Cartridge45-70 + capacity: 10 + proto: N14Cartridge45-70 + +- type: entity + name: pipe rifle parent: N14WeaponSniperHunting id: N14WeaponPipeRifle description: A piece of metal pipe with a wooden stock, works has a gun and uses .308 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi - type: Item @@ -114,15 +150,7 @@ tags: - N14Cartridge308Rifle capacity: 1 - proto: N14Cartridge308Rifle - - type: GunWieldBonus - minAngle: -23 - maxAngle: -104 - - type: Gun - minAngle: 24 - maxAngle: 105 - angleIncrease: 4 - angleDecay: 16 + proto: N14Cartridge308Rifle - type: entity name: varmint rifle @@ -130,6 +158,8 @@ id: N14WeaponSniperVarmint description: A pre-war low power bolt action rifle, originally designed to hunt small animals this gun works fine with anything not bigger than a human. Uses 5.56 ammo. components: + - type: Clothing + sprite: Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi - type: Sprite sprite: Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi - type: Item diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml index de12104b748..d06e6e9fcea 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/axes.yml @@ -22,6 +22,31 @@ - type: Item sprite: Nuclear14/Objects/Weapons/Melee/hatchet.rsi size: Normal + +- type: entity + name: tribal hatchet + parent: BaseItem + id: N14TribalHatchet + description: A tool that is just as useful as a weapon. Used for chopping things. + components: + - type: Tag + tags: + - BotanyHatchet + - Axe + - type: Sharp + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi + state: icon + netsync: false + - type: UseDelay + - type: MeleeWeapon + damage: + types: + Slash: 12 + Piercing: 5 + - type: Item + sprite: Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi + size: Normal - type: entity name: fireaxe diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml similarity index 100% rename from Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/baseball_bat.yml rename to Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/spear.yml index 65adecf404a..1affb58e848 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Melee/spear.yml @@ -1,3 +1,83 @@ +- type: entity + name: baseThrowingSpear + parent: BaseItem + id: baseThrowingSpear + description: Definition of a Classic. Keeping murder affordable since 200,000 BCE. + components: + - type: EmbeddableProjectile + offset: 0.15,0.15 + - type: ThrowingAngle + angle: 225 + - type: Tag + tags: + - Spear + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + vertices: + - -0.40,-0.30 + - -0.30,-0.40 + - 0.40,0.30 + - 0.30,0.40 + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/spear.rsi + layers: + - state: spear + - state: spear1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Piercing: 12 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: DamageOtherOnHit + damage: + types: + Piercing: 26 + - type: Item + size: Large + - type: Clothing + quickEquip: false + slots: + - back + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + - type: MeleeChemicalInjector + solution: melee + - type: RefillableSolution + solution: melee + - type: InjectableSolution + solution: melee + - type: SolutionInjectOnCollide + transferAmount: 5 + fixtureId: "throw-fixture" + blockSlots: NONE + - type: SolutionTransfer + maxTransferAmount: 5 + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: UseDelay + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: spear + - type: entity name: spear parent: Spear @@ -8,6 +88,10 @@ sprite: Nuclear14/Objects/Weapons/Melee/spear.rsi netsync: false state: spear + - type: MeleeWeapon + damage: + types: + Piercing: 20 - type: entity @@ -24,3 +108,35 @@ sprite: Nuclear14/Objects/Weapons/Melee/flagspear.rsi netsync: false state: spear + - type: MeleeWeapon + damage: + types: + Piercing: 20 + + +- type: entity + name: tribal spear + parent: Spear + id: N14WastelandTribalSpear + description: Strong and with a devastating attack, these spears are commonly made and used by tribals. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/tribalspear.rsi + netsync: false + state: spear + - type: MeleeWeapon + damage: + types: + Piercing: 18 + Slash: 8 + +- type: entity + name: javelin + parent: baseThrowingSpear + id: N14WastelandTribalJavelin + description: Practically a very short spear, but his strength doesnt come from melee combat. + components: + - type: Sprite + sprite: Nuclear14/Objects/Weapons/Melee/javelin.rsi + netsync: false + state: spear diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Decoration/junk_piles.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Decoration/junk_piles.yml index cc9ff5fd407..8c5e4336038 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Decoration/junk_piles.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Decoration/junk_piles.yml @@ -4,7 +4,7 @@ components: - type: Storage #temporary until we can implement the gatherable grid: - - 0,0,6,3 + - 0,0,5,5 - type: UserInterface interfaces: - key: enum.StorageUiKey.Key diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Machines/vending_machines.yml index a7b3037d06c..6e3316ebe7f 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Machines/vending_machines.yml @@ -36,4 +36,144 @@ components: - type: VendingMachine pack: NukaRadInventory - # Needs a run down variant of the sprite \ No newline at end of file + # Needs a run down variant of the sprite + + +# vendors as storage type +- type: entity + parent: VendingMachine + id: N14VendingMachineNukaColaNew + suffix: storage, empty + name: Nuka-Cola machine + description: A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. + components: + - type: Sprite + sprite: Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: WiresVisuals + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#b34747" + - type: Storage + grid: + - 0,0,3,3 + maxItemSize: Small + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: Transform + anchored: true + +- type: entity + parent: N14VendingMachineNukaColaNew + id: N14VendingMachineNukaColaNewFilled + suffix: storage, random + components: + - type: StorageFill + contents: + - id: N14DrinkNukaColaEmpty + prob: 0.3 + - id: N14DrinkNukaColaBroken + prob: 0.3 + - id: N14DrinkNukaCola + prob: 0.3 + - id: N14DrinkNukaCola + prob: 0.3 + - id: N14DrinkNukaCola + prob: 0.2 + - id: N14DrinkNukaColaCherry + prob: 0.1 + - id: N14DrinkNukaColaGrape + prob: 0.1 + - id: N14DrinkNukaColaOrange + prob: 0.1 + - id: N14DrinkNukaColaYellow + prob: 0.05 + - id: N14DrinkNukaColaQuantum + prob: 0.05 + - id: N14DrinkNukaColaQuartz + prob: 0.05 + - id: N14DrinkNukaColaVictory + prob: 0.05 + - id: N14DrinkNukaColaWild + prob: 0.05 + +# Cigarette vendors +- type: entity + parent: BaseStructure + id: N14VendingMachineCigarette + suffix: storage, empty + name: cigarette vendor + description: A Pre-War vending machine that dispenses cigarettes. + components: + - type: Sprite + sprite: Nuclear14/Structures/Machines/VendingMachines/vendors.rsi + layers: + - state: cigarette + - type: Storage + grid: + - 0,0,3,3 + maxItemSize: Normal + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: Transform + anchored: true + +- type: entity + parent: N14VendingMachineCigarette + id: N14VendingMachineCigaretteFilled + suffix: random + components: + - type: StorageFill + contents: + - id: N14CigarettePackWinston + prob: 0.3 + - id: N14CigarettePackMarlboro + prob: 0.3 + - id: N14CigarettePackKool + prob: 0.3 + - id: N14CigarettePackSalem + prob: 0.3 + - id: N14CigarettePackWinston + prob: 0.2 + - id: N14CigarettePackMarlboro + prob: 0.2 + - id: N14CigarettePackKool + prob: 0.2 + - id: N14CigarettePackSalem + prob: 0.2 + +- type: entity + parent: N14VendingMachineCigarette + id: N14VendingMachineCigaretteFilledRepublic + suffix: republics + name: Republics cig vendor + description: A pre-war cigarette vendor that's been filled with Republic cigarette packs. + components: + - type: StorageFill + contents: + - id: N14CigarettePackRepublics + prob: 0.5 + - id: N14CigarettePackRepublics + prob: 0.5 + - id: N14CigarettePackRepublics + prob: 0.5 + - id: N14CigarettePackRepublics + prob: 0.3 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Misc/craftingbenches.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Misc/craftingbenches.yml index f51b776d1fa..e2c0be685ee 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Misc/craftingbenches.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Misc/craftingbenches.yml @@ -33,7 +33,7 @@ - type: ExtensionCableReceiver - type: ApcPowerReceiver needsPower: false - + - type: entity parent: N14WorkbenchBase id: N14WorkbenchWeaponbench @@ -42,7 +42,7 @@ components: - type: Sprite state: weaponbench - + - type: entity parent: N14WorkbenchBase id: N14WorkbenchAmmobench @@ -103,7 +103,7 @@ - Magazine308Rifle - ClipMagazine308Rifle - MagazineBox308 - + - type: entity parent: N14WorkbenchBase id: N14WorkbenchArmorbench @@ -112,7 +112,7 @@ components: - type: Sprite state: armorbench - + - type: entity parent: N14WorkbenchBase id: N14WorkbenchTinkerbench @@ -121,7 +121,7 @@ components: - type: Sprite state: tinkerbench - + - type: entity parent: BaseStructure id: N14WorkbenchChemistryset @@ -243,6 +243,7 @@ - N14LargeBeaker - N14Dropper - N14Syringe + - N14SyringeInjectable - N14PillCanister - N14ChemistryEmptyBottle01 - N14PillCanisterRadX @@ -262,7 +263,7 @@ - N14Flare - N14FlashlightLantern - N14Matchbox - + - type: entity parent: N14WorkbenchBase id: N14WorkbenchForge @@ -288,4 +289,4 @@ staticRecipes: # Ores - IngotLead - - SulfurPowder \ No newline at end of file + - SulfurPowder diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Power/generators.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Power/generators.yml index 352c1e6f21b..4ce0f81e392 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Power/generators.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Power/generators.yml @@ -44,7 +44,10 @@ totalIntensity: 100 intensitySlope: 1 maxIntensity: 150 - + - type: Damageable + damageContainer: Inorganic + damageModifierSet: StructuralMetallic + - type: entity parent: N14GeneratorFusioncore id: N14GeneratorFusionMini @@ -101,7 +104,7 @@ - 0 # nitrogen - 340.5701689 # carbon dioxide temperature: 373.15 - + - type: entity parent: N14GeneratorFusionMini id: N14GeneratorFusionEnclave @@ -131,7 +134,7 @@ supplyRate: 1000 supplyRampRate: 250 supplyRampTolerance: 250 - + - type: entity parent: N14GeneratorFusionMini id: N14GeneratorFusionMiniRusted @@ -142,7 +145,7 @@ sprite: Nuclear14/Structures/Power/32x48_machines.rsi layers: - state: generator_rust - + - type: entity parent: N14GeneratorFusioncore id: N14GeneratorPrewar @@ -155,7 +158,7 @@ - state: generator_off - state: generator_on offset: 0.5, 0 - + - type: entity parent: N14GeneratorPrewar id: N14GeneratorPrewarUranium @@ -167,7 +170,7 @@ layers: - state: generator_off - state: generator_uranium - + - type: entity parent: BaseGenerator id: N14GeneratorVaultTecReactor @@ -202,7 +205,7 @@ energy: 4.5 softness: 0.5 color: "#B4FCF0" - + - type: entity parent: N14GeneratorVaultTecReactor id: N14GeneratorReactorFloor @@ -224,7 +227,7 @@ totalIntensity: 20000 # ~15 tile radius. intensitySlope: 5 maxIntensity: 50 - + - type: entity parent: BaseStructure id: N14GeneratorReactorFloorDestroyed diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/crates.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/crates.yml index 4607079f99a..12863fa601c 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/crates.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Storage/crates.yml @@ -354,8 +354,17 @@ MaterialWoodPlank: min: 0 max: 1 + - !type:EmptyAllContainersBehaviour - type: Sprite sprite: Nuclear14/Structures/Storage/Crates/woodencrates.rsi + - type: Storage + grid: + - 0,0,6,3 + maxItemSize: Huge + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] # N14TODO: Add crate deconstruction - type: entity diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/hydrant.yml b/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/hydrant.yml index fdb0d6d2722..87681702702 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/hydrant.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/hydrant.yml @@ -78,6 +78,9 @@ - state: frame - state: closed map: ["enum.ItemCabinetVisualLayers.Door"] + - state: closed # N14:TODO: Add this state + map: ["enum.ItemCabinetVisualLayers.ContainsItem"] + visible: true - type: entity parent: N14WallmountFireHydrantOld diff --git a/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/wallmounts.txt b/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/wallmounts.txt deleted file mode 100644 index cad760f4fdf..00000000000 --- a/Resources/Prototypes/Nuclear14/Entities/Structures/Wallmount/wallmounts.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Fire Extinguisher -- type: entity - parent: ExtinguisherCabinet - id: N14FireExtinguisherCabinet - name: fire extinguisher cabinet - description: A small wall mounted cabinet for a fire extinguisher. - components: - - type: Sprite - sprite: Structures/N14/Wallmounts/fireextinguisher.rsi - netsync: false - snapCardinals: true - layers: - - state: frame - - state: extinguisher - map: ["enum.ItemCabinetVisualLayers.ContainsItem"] - visible: true - - state: closed - map: ["enum.ItemCabinetVisualLayers.Door"] - -- type: entity - parent: N14FireExtinguisherCabinet - id: N14FireExtinguisherCabinetOpen - suffix: Open - components: - - type: ItemCabinet - opened: true - -- type: entity - parent: N14FireExtinguisherCabinet - id: N14FireExtinguisherCabinetFilled - suffix: Filled - components: - - type: ItemCabinet - cabinetSlot: - ejectOnInteract: true - startingItem: FireExtinguisher - whitelist: - components: - - FireExtinguisher - -- type: entity - parent: N14FireExtinguisherCabinetFilled - id: N14FireExtinguisherCabinetFilledOpen - suffix: Filled, Open - components: - - type: ItemCabinet - opened: true diff --git a/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml new file mode 100644 index 00000000000..e0fc6d90bce --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml @@ -0,0 +1,263 @@ +- type: loadout + id: LoadoutNCRKitRifleman + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitRifleman + +- type: loadout + id: LoadoutNCRKitMorale + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitMorale + +- type: loadout + id: LoadoutNCRKitGunner + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitGunner + +- type: loadout + id: LoadoutNCRKitMarksman + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitMarksman + +- type: loadout + id: LoadoutNCRKitPointman + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitPointman + +- type: loadout + id: LoadoutNCRKitMedic + category: Roles + cost: 8 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCROfficer + - Survivor + items: + - KitMedic + +- type: loadout + id: LoadoutNCRKitSpecialRifleman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRNCO + - NCROfficer + - Survivor + items: + - KitSpecialRifleman + +- type: loadout + id: LoadoutNCRKitSpecialAssault + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRNCO + - NCROfficer + - Survivor + items: + - KitSpecialAssault + +- type: loadout + id: LoadoutNCRKitSpecialGunner + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRNCO + - NCROfficer + - Survivor + items: + - KitSpecialGunner + +- type: loadout + id: LoadoutNCRKitSpecialPointman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRNCO + - NCROfficer + - Survivor + items: + - KitSpecialPointman + +- type: loadout + id: LoadoutRangerKitRifleman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerRecruit + - Ranger + items: + - KitRiflemanRanger + +- type: loadout + id: LoadoutRangerKitMarksman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerRecruit + - Ranger + items: + - KitMarksmanRanger + +- type: loadout + id: LoadoutRangerKitCQB + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerRecruit + - Ranger + items: + - KitCQBRanger + +- type: loadout + id: LoadoutVeteranRangerKitRifleman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerVeteran + items: + - KitRiflemanRangerVeteran + +- type: loadout + id: LoadoutVeteranRangerKitHeavySniper + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerVeteran + items: + - KitHeavySniperRangerVeteran + +- type: loadout + id: LoadoutVeteranRangerKitTrailman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerVeteran + items: + - KitTrailmanRangerVeteran + +- type: loadout + id: LoadoutVeteranRangerKitAssault + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerVeteran + items: + - KitAssaultRangerVeteran + +- type: loadout + id: LoadoutVeteranRangerKitMarksman + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerVeteran + items: + - KitMarksmanRangerVeteran + +- type: loadout + id: LoadoutVeteranRangerKitCQB + category: Roles + cost: 10 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - RangerVeteran + items: + - KitCQBRangerVeteran + diff --git a/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml new file mode 100644 index 00000000000..24c9c7ed53b --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml @@ -0,0 +1,148 @@ +- type: loadout + id: LoadoutNCRRangerArmor + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingOuterRangerVest + +- type: loadout + id: LoadoutNCRRangerArmorV2 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingOuterRangerArmor + +- type: loadout + id: LoadoutNCRRangerGun1 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14Weapon50NcrRifle + - MagazineBox50 + +- type: loadout + id: LoadoutNCRRangerGun2 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14WeaponCarbine + - LongMagazine5.56Rifle + - LongMagazine5.56Rifle + +- type: loadout + id: LoadoutNCRRangerGun3 + category: Roles + cost: 4 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14WeaponLeverRifle + - MagazineBox308 + +- type: loadout + id: LoadoutNCR5.56 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - LongMagazine5.56Rifle + - LongMagazine5.56Rifle + +- type: loadout + id: LoadoutNCR50 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - MagazineBox50 + +- type: loadout + id: LoadoutNCR308 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - MagazineBox308 + +- type: loadout + id: LoadoutNCRmask1 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - ClothingMaskGasRiot + +- type: loadout + id: LoadoutNCRmask2 + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - ClothingMaskGasCombat + +- type: loadout + id: LoadoutNCRhelmet + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingHeadHatRangerHelmet + +- type: loadout + id: LoadoutNCRhat + category: Roles + cost: 2 + exclusive: true + requirements: + - !type:LoadoutJobRequirement + jobs: + - NCRRanger + items: + - N14ClothingHeadHatRanger diff --git a/Resources/Prototypes/Nuclear14/Loadouts/categories.yml b/Resources/Prototypes/Nuclear14/Loadouts/categories.yml new file mode 100644 index 00000000000..ec8eaef872e --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Loadouts/categories.yml @@ -0,0 +1,5 @@ +# See the following file for existing categories: Resources\Prototypes\Loadouts\categories.yml + +# Alphabetically ordered +- type: loadoutCategory + id: Roles \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Loadouts/hands.yml b/Resources/Prototypes/Nuclear14/Loadouts/hands.yml new file mode 100644 index 00000000000..6ef66e9bb43 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Loadouts/hands.yml @@ -0,0 +1,27 @@ +- type: loadout + id: N14LoadoutHandsGlovesCloth + category: Accessories + cost: 2 + items: + - N14ClothingHandsGlovesCloth + +- type: loadout + id: N14LoadoutHandsGlovesLeather + category: Accessories + cost: 4 + items: + - N14ClothingHandsGlovesLeather + +- type: loadout + id: N14LoadoutHandsGlovesFur + category: Accessories + cost: 4 + items: + - N14ClothingHandsGlovesFur + +- type: loadout + id: N14LoadoutHandsGlovesBlackLeather + category: Accessories + cost: 4 + items: + - N14ClothingHandsGlovesBlackLeather diff --git a/Resources/Prototypes/Nuclear14/Loadouts/head.yml b/Resources/Prototypes/Nuclear14/Loadouts/head.yml index f02c98e5239..01092591bb5 100644 --- a/Resources/Prototypes/Nuclear14/Loadouts/head.yml +++ b/Resources/Prototypes/Nuclear14/Loadouts/head.yml @@ -31,4 +31,11 @@ category: Accessories cost: 2 items: - - N14ClothingHeadHatTribalOutcastHood \ No newline at end of file + - N14ClothingHeadHatTribalOutcastHood + +- type: loadout + id: N14LoadoutHeadHatArmyCap + category: Accessories + cost: 2 + items: + - N14ClothingHeadHatArmyCap diff --git a/Resources/Prototypes/Nuclear14/Loadouts/items.yml b/Resources/Prototypes/Nuclear14/Loadouts/items.yml index 4ce424dfbe6..39577787a88 100644 --- a/Resources/Prototypes/Nuclear14/Loadouts/items.yml +++ b/Resources/Prototypes/Nuclear14/Loadouts/items.yml @@ -3,14 +3,49 @@ category: Items cost: 1 items: - - Cigarette + - N14Cigarette - type: loadout - id: N14LoadoutItemCigsBlack + id: N14LoadoutItemCigsSalem category: Items cost: 2 items: - - CigPackBlack + - N14CigarettePackSalem + +- type: loadout + id: N14LoadoutItemCigsKool + category: Items + cost: 2 + items: + - N14CigarettePackKool + +- type: loadout + id: N14LoadoutItemCigsMarlboro + category: Items + cost: 2 + items: + - N14CigarettePackMarlboro + +- type: loadout + id: N14LoadoutItemCigsWinston + category: Items + cost: 2 + items: + - N14CigarettePackWinston + +- type: loadout + id: N14LoadoutItemCigsCustom + category: Items + cost: 2 + items: + - N14CigarettePackCustom + +- type: loadout + id: N14LoadoutItemCigsRepublics + category: Items + cost: 2 + items: + - N14CigarettePackRepublics - type: loadout id: N14LoadoutItemLighter @@ -31,4 +66,11 @@ category: Items cost: 1 items: - - Matchbox \ No newline at end of file + - Matchbox + +- type: loadout + id: N14LoadoutItemWallet + category: Items + cost: 1 + items: + - N14Wallet \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Loadouts/neck.yml b/Resources/Prototypes/Nuclear14/Loadouts/neck.yml index 8543d361a1d..1790ee92eb5 100644 --- a/Resources/Prototypes/Nuclear14/Loadouts/neck.yml +++ b/Resources/Prototypes/Nuclear14/Loadouts/neck.yml @@ -3,11 +3,11 @@ category: Accessories cost: 2 items: - - ClothingNeckCloakLeather + - N14ClothingNeckCloakLeather - type: loadout id: N14LoadoutNeckMantleLeather category: Accessories cost: 2 items: - - ClothingNeckMantleLeather \ No newline at end of file + - N14ClothingNeckMantleLeather diff --git a/Resources/Prototypes/Nuclear14/Loadouts/shoes.yml b/Resources/Prototypes/Nuclear14/Loadouts/shoes.yml new file mode 100644 index 00000000000..83bc81fa2df --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Loadouts/shoes.yml @@ -0,0 +1,35 @@ +- type: loadout + id: N14LoadoutShoesBlack + category: Accessories + cost: 2 + items: + - N14ClothingShoesBlack + +- type: loadout + id: N14LoadoutShoesBrown + category: Accessories + cost: 2 + items: + - N14ClothingShoesBrown + +- type: loadout + id: N14LoadoutShoesRags + category: Accessories + cost: 2 + items: + - N14ClothingShoesRags + +- type: loadout + id: N14LoadoutBootsCowboy + category: Accessories + cost: 2 + items: + - N14ClothingBootsCowboy + +- type: loadout + id: N14LoadoutBootsBlack + category: Accessories + cost: 2 + items: + - N14ClothingBootsBlack + diff --git a/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml b/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml index b237b1c555c..038d3a5a2f8 100644 --- a/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml +++ b/Resources/Prototypes/Nuclear14/Reagents/Consumable/extracts.yml @@ -9,7 +9,7 @@ physicalDesc: reagent-physical-desc-syrupy flavor: syrupy color: "#babf4d" - + - type: reagent parent: BaseDrink id: ExtractBananaYucca @@ -48,7 +48,7 @@ Brute: -0.1 - !type:ChemVomit probability: 0.1 - + - type: reagent parent: BaseDrink id: ExtractBuffaloGourd @@ -58,7 +58,7 @@ physicalDesc: reagent-physical-desc-cloudy flavor: watermelon color: "#f0ff8c" - + - type: reagent parent: BaseDrink id: ExtractCabbage @@ -73,7 +73,7 @@ effects: - !type:ModifyBloodLevel amount: 0.5 - + - type: reagent parent: BaseDrink id: ExtractCactusWater #barrel cactus @@ -82,7 +82,7 @@ desc: reagent-desc-extract-cactus-water physicalDesc: reagent-physical-desc-odorless color: "#5f959c" - + - type: reagent id: ExtractCarrot name: reagent-name-extract-carrot @@ -102,9 +102,9 @@ - !type:AdjustReagent reagent: Nutriment amount: 0.5 - + # Cave fungus = no reagent - + - type: reagent id: ExtractCoyoteTobacco name: reagent-name-extract-coyote-tobacco @@ -116,7 +116,7 @@ plantMetabolism: - !type:PlantAdjustHealth amount: -5 - + - type: reagent id: ExtractDatura #HeartbreakerToxin name: reagent-name-extract-datura @@ -135,7 +135,7 @@ plantMetabolism: - !type:PlantAdjustToxins amount: 10 - + - type: reagent parent: BaseDrink id: ExtractHoneyMesquitePod @@ -145,7 +145,7 @@ physicalDesc: reagent-physical-desc-sugary flavor: sweet color: "#f0ff8c" - + - type: reagent parent: BaseDrink id: ExtractJalapenoPepper @@ -155,7 +155,7 @@ physicalDesc: reagent-physical-desc-spicy flavor: spicy color: "#d12519" - + - type: reagent id: ExtractMaize name: reagent-name-extract-maize @@ -172,7 +172,7 @@ - !type:AdjustReagent reagent: Nutriment amount: 0.2 - + - type: reagent parent: BaseDrink id: ExtractMutfruit @@ -182,7 +182,7 @@ physicalDesc: reagent-physical-desc-pulpy flavor: fiber color: "#6ab854" - + - type: reagent parent: BaseDrink id: ExtractNettle @@ -192,7 +192,7 @@ physicalDesc: reagent-physical-desc-chalky flavor: bitter color: "#009900" - + # No reagent for pinyon...yet? - type: reagent @@ -204,7 +204,7 @@ physicalDesc: reagent-physical-desc-citric flavor: fruity color: "#6ab854" - + - type: reagent id: ExtractRazorgrainFlour name: reagent-name-extract-razorgrain @@ -244,8 +244,8 @@ desc: reagent-desc-extract-tarberries physicalDesc: reagent-physical-desc-sugary flavor: sweet - color: "#2746b8" - + color: "#2746b8" + - type: reagent parent: BaseDrink id: ExtractTato @@ -255,7 +255,7 @@ physicalDesc: reagent-physical-desc-starchy flavor: savory color: "#97a832" - + - type: reagent id: ExtractWhiteHorsenettle name: reagent-name-extract-white-horsenettle @@ -274,7 +274,7 @@ plantMetabolism: - !type:PlantAdjustToxins amount: 10 - + - type: reagent id: ExtractXander name: reagent-name-extract-xander @@ -292,3 +292,21 @@ Brute: -0.1 - !type:ChemVomit probability: 0.1 + +- type: reagent + id: ExtractFungusRad + name: reagent-name-extract-fungusrad + group: Toxins + desc: reagent-desc-extract-fungusrad + physicalDesc: reagent-physical-desc-fizzy + color: "#4eff3b" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + Radiation: 0.5 + - !type:ChemVomit + probability: 0.2 diff --git a/Resources/Prototypes/Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/Nuclear14/Reagents/medicine.yml index 69031f7cb9e..566c7031ee6 100644 --- a/Resources/Prototypes/Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/Nuclear14/Reagents/medicine.yml @@ -15,7 +15,7 @@ Burn: -2.0 Brute: -2.0 Airloss: -2.0 - + - type: reagent id: DirtyStimpak name: reagent-name-dirty-stimpak @@ -34,7 +34,7 @@ Airloss: -1.5 types: Radiation: 0.1 - + - type: reagent id: HealingPowder name: reagent-name-healing-powder @@ -52,7 +52,7 @@ Brute: -0.5 - !type:ChemVomit probability: 0.05 - + # Poison - type: reagent id: AntidoteMixture @@ -123,7 +123,7 @@ # Radiation - type: reagent - id: RadAway + id: RadAway name: reagent-name-damage-resist-mixture group: Medicine desc: reagent-desc-damage-resist-mixture @@ -136,7 +136,7 @@ damage: types: Radiation: -2.5 - + - type: reagent id: RadX name: reagent-name-rad-x @@ -155,7 +155,7 @@ # Other - type: reagent - id: DamageResistMixture #used in med-x. TODO: figure out how to make a reagent give you dmg resistance + id: DamageResistMixture #used in med-x. TODO: figure out how to make a reagent give you dmg resistance name: reagent-name-damage-resist-mixture group: Medicine desc: reagent-desc-damage-resist-mixture @@ -189,7 +189,7 @@ Medicine: effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect - + - type: reagent id: MentatsBerry name: reagent-name-mentats-berry @@ -201,7 +201,7 @@ Medicine: effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect - + - type: reagent id: MentatsGrape name: reagent-name-mentats-grape @@ -213,7 +213,7 @@ Medicine: effects: - !type:Drunk #TODO: when we get SPECIAL, make this increase Int, Chr, and remove this effect - + - type: reagent id: MentatsOrange name: reagent-name-mentats-orange @@ -271,3 +271,130 @@ effects: - !type:SatiateThirst factor: -0.2 + +- type: reagent + id: SmellingSalts + name: reagent-name-smelling-salts + group: Medicine + desc: reagent-desc-smelling-salts + physicalDesc: reagent-physical-desc-strong-smelling + color: "#e1f5f4" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Airloss: -10 #TODO add detail to wake up a guy if found + - !type:Jitter + - !type:ChemVomit + probability: 0.1 + +- type: reagent + id: HealingPoultice + name: reagent-name-healing-poultice + group: Medicine + desc: reagent-desc-healing-poultice + physicalDesc: reagent-physical-desc-soothing + color: "#24b530" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Brute: -0.5 + Burn: -0.5 + Toxin: -0.5 + - !type:ChemVomit + probability: 0.05 + - !type:Drunk + min: 25 + - !type:Jitter + min: 25 + +- type: reagent + id: Bitterdrink + name: reagent-name-bitterdrink + group: Medicine + desc: reagent-desc-bitterdrink + physicalDesc: reagent-physical-desc-sticky + color: "#ba67f5" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Toxin: -2.5 + types: + Radiation: -1 + - !type:ChemVomit + min: 25 + - !type:Drunk + +- type: reagent + id: MourningPoultice + name: reagent-name-mourning-poultice + group: Medicine + desc: reagent-desc-mourning-poultice + physicalDesc: reagent-physical-desc-oily + color: "#1d3d22" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Toxin: 0.5 + types: + Radiation: 0.5 + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + - !type:GenericStatusEffect + key: Stutter + component: ScrambledAccent + - !type:GenericStatusEffect + key: SlurredSpeech + component: TelepathicRepeater + +- type: reagent + id: UltraRobustHealingMixture + name: reagent-name-ultra-robust-healing-mixture + group: Medicine + desc: reagent-desc-ultra-robust-healing-mixture + physicalDesc: reagent-physical-desc-overpowering + color: "#ff0000" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Burn: -10 + Brute: -10 + Airloss: -10 + Toxin: 1 + types: + Radiation: 0.2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 35 + damage: + types: + Cellular: 0.8 + - !type:MovespeedModifier + walkSpeedModifier: 0.40 + sprintSpeedModifier: 0.40 + conditions: + - !type:ReagentThreshold + min: 25 + - !type:Drunk + conditions: + - !type:ReagentThreshold + min: 25 diff --git a/Resources/Prototypes/Nuclear14/Reagents/products.yml b/Resources/Prototypes/Nuclear14/Reagents/products.yml index 4446c67214c..ee91a34ca38 100644 --- a/Resources/Prototypes/Nuclear14/Reagents/products.yml +++ b/Resources/Prototypes/Nuclear14/Reagents/products.yml @@ -33,7 +33,7 @@ time: 5 refresh: false - !type:Jitter - + - type: reagent id: Turpentine name: reagent-name-turpentine @@ -50,4 +50,22 @@ type: Add time: 5 refresh: false - - !type:Jitter \ No newline at end of file + - !type:Jitter + +- type: reagent + id: Antiseptic + name: reagent-name-antiseptic + group: Products + desc: reagent-desc-turpentine + physicalDesc: reagent-physical-desc-strong-smelling + color: "#98cbf5" + metabolisms: + Medicine: + effects: # TODO: Add negative effects + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + - !type:Jitter diff --git a/Resources/Prototypes/Nuclear14/Recipes/Crafting/materials.yml b/Resources/Prototypes/Nuclear14/Recipes/Crafting/materials.yml new file mode 100644 index 00000000000..1c399e0f7a2 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Crafting/materials.yml @@ -0,0 +1,52 @@ +# Paper +- type: construction + name: paper + id: N14Paper + graph: N14Paper + startNode: start + targetNode: paper + category: construction-category-misc + description: "A stack of 10 paper" + icon: { sprite: Nuclear14/Objects/Misc/clutter.rsi, state: paper } + objectType: Item + hide: false + +- type: constructionGraph + id: N14Paper + start: start + graph: + - node: start + edges: + - to: paper + steps: + - material: WoodPlank + doAfter: 2 + - node: paper + entity: N14Paper + +# Cardboard +- type: construction + name: cardboard + id: N14Cardboard + graph: N14Cardboard + startNode: start + targetNode: cardboard + category: construction-category-misc + description: "A sheet of cardboard." + icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard } + objectType: Item + hide: false + +- type: constructionGraph + id: N14Cardboard + start: start + graph: + - node: start + edges: + - to: cardboard + steps: + - material: N14Paper + amount: 2 + doAfter: 2 + - node: cardboard + entity: MaterialCardboard1 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Recipes/Crafting/medical.yml b/Resources/Prototypes/Nuclear14/Recipes/Crafting/medical.yml index a22b5513513..8615a99b904 100644 --- a/Resources/Prototypes/Nuclear14/Recipes/Crafting/medical.yml +++ b/Resources/Prototypes/Nuclear14/Recipes/Crafting/medical.yml @@ -1,3 +1,34 @@ +# Mortar and pestle +- type: construction + name: mortar & pestle + id: N14MortarPestle + graph: N14MortarPestle + startNode: start + targetNode: mortarpestle + category: construction-category-medical + description: A mortar and pestle for grinding reagents. + hide: false + icon: + sprite: Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi + state: mortar + objectType: Item + +- type: constructionGraph + id: N14MortarPestle + start: start + graph: + - node: start + edges: + - to: mortarpestle + steps: + - material: WoodPlank + amount: 2 + doAfter: 5 + + - node: mortarpestle + entity: N14MortarpestleGrinder + + # Healing Powder - type: construction name: healing powder diff --git a/Resources/Prototypes/Nuclear14/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/Nuclear14/Recipes/Crafting/smokeables.yml new file mode 100644 index 00000000000..19c9388ccef --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Recipes/Crafting/smokeables.yml @@ -0,0 +1,52 @@ +# Rolling Paper +- type: construction + name: rolling paper + id: N14RollingPaper + graph: N14RollingPaper + startNode: start + targetNode: rollingpaper + category: construction-category-misc + description: "A stack of rolling papers for making cigarettes." + icon: { sprite: Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi, state: rollie_paper } + objectType: Item + hide: false + +- type: constructionGraph + id: N14RollingPaper + start: start + graph: + - node: start + edges: + - to: rollingpaper + steps: + - material: N14Paper + doAfter: 2 + - node: rollingpaper + entity: N14RollingPaper + +# Rollie +- type: construction + name: cigarette + id: N14Cigarette + graph: N14Cigarette + startNode: start + targetNode: cigarette + category: construction-category-misc + description: "A roll up cigarette filled with coyote tobacco" + icon: { sprite: Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi, state: unlit-icon } + objectType: Item + hide: false + +- type: constructionGraph + id: N14Cigarette + start: start + graph: + - node: start + edges: + - to: cigarette + steps: + - material: N14RollingPaper + - material: CoyoteTobacco + doAfter: 2 + - node: cigarette + entity: N14CigaretteRollie \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Nuclear14/Recipes/Lathes/chemistry.yml index 837053fd0c4..c94f93aaf4d 100644 --- a/Resources/Prototypes/Nuclear14/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Nuclear14/Recipes/Lathes/chemistry.yml @@ -5,7 +5,7 @@ category: N14Chemistry materials: Glass: 100 - + - type: latheRecipe id: N14LargeBeaker result: LargeBeaker @@ -32,6 +32,15 @@ Plastic: 100 Steel: 25 +- type: latheRecipe + id: N14SyringeInjectable + result: N14DoctorSyringe + completetime: 2 + category: N14Chemistry + materials: + Plastic: 100 + Steel: 25 + - type: latheRecipe id: N14PillCanister result: PillCanister @@ -39,7 +48,7 @@ category: N14Chemistry materials: Plastic: 100 - + - type: latheRecipe id: N14PillCanisterRadX result: N14RadXCanister @@ -47,7 +56,7 @@ category: N14Chemistry materials: Glass: 100 - + - type: latheRecipe id: N14PillCanisterMentats result: N14MentatsCanister @@ -55,7 +64,7 @@ category: N14Chemistry materials: Steel: 100 - + - type: latheRecipe id: N14PillCanisterBuffout result: N14BuffoutCanister @@ -63,7 +72,7 @@ category: N14Chemistry materials: Glass: 100 - + - type: latheRecipe id: N14PillCanisterCateye result: N14CateyeCanister @@ -71,7 +80,7 @@ category: N14Chemistry materials: Glass: 100 - + - type: latheRecipe id: N14PillCanisterFixer result: N14FixerCanister @@ -79,7 +88,7 @@ category: N14Chemistry materials: Steel: 100 - + - type: latheRecipe id: N14JetInhaler result: N14JetInhaler @@ -94,4 +103,4 @@ completetime: 2 category: N14Chemistry materials: - Glass: 50 \ No newline at end of file + Glass: 50 diff --git a/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml index 4f716b0207f..45f74c9373e 100644 --- a/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Nuclear14/Recipes/Reactions/medicine.yml @@ -1,3 +1,13 @@ +- type: reaction + id: Antiseptic + reactants: + Abraxocleaner: + amount: 1 + Ethanol: + amount: 1 + products: + Antiseptic: 2 + - type: reaction id: AntidoteMixture reactants: @@ -7,7 +17,66 @@ amount: 1 products: AntidoteMixture: 2 - + +- type: reaction + id: AntidoteMixtureConversion + reactants: + AntidoteMixture: + amount: 100 + Silicon: + amount: 20 # 2 grinded glass + effects: + - !type:CreateEntityReactionEffect + entity: N14Antidote + +- type: reaction + id: Antidote + reactants: + AntidoteMixture: + amount: 1 + ExtractTarberries: + amount: 1 + products: + Antidote: 2 + +- type: reaction + id: AntidoteConversion + reactants: + Antidote: + amount: 15 + Oil: + amount: 5 + Phosphorus: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: N14ChemicalSyringeAntidote + +- type: reaction + id: RadAway + reactants: + ExtractFungusRad: + amount: 1 + Antiseptic: + amount: 2 + Water: + amount: 2 + products: + RadAway: 5 + +- type: reaction + id: RadAwayConversion + reactants: + RadAway: + amount: 20 + Oil: + amount: 5 + Phosphorus: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: N14RadAwayBloodbag + - type: reaction id: Jet reactants: @@ -17,7 +86,7 @@ amount: 1 products: MovespeedMixture: 2 - + - type: reaction id: Mentats reactants: @@ -29,7 +98,7 @@ # amount: 1 products: Mentats: 2 - + - type: reaction id: MentatsBerry reactants: @@ -39,7 +108,7 @@ amount: 1 products: MentatsBerry: 1 - + - type: reaction id: MentatsGrape reactants: @@ -51,7 +120,7 @@ # amount: 1 products: MentatsGrape: 1 - + - type: reaction id: MentatsOrange reactants: @@ -61,7 +130,7 @@ amount: 1 products: MentatsOrange: 1 - + - type: reaction id: Stimpak reactants: @@ -73,7 +142,20 @@ amount: 1 products: HealingMixture: 1 - + +- type: reaction + id: StimpakConversion + reactants: + HealingMixture: + amount: 25 + Oil: # Plastic contains 5u of Oil and 5u of Phosphorus + amount: 5 + Phosphorus: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: N14Stimpak + - type: reaction id: DirtyStimpak reactants: @@ -84,4 +166,17 @@ WastelandBlood: amount: 1 products: - DirtyStimpak: 1 \ No newline at end of file + DirtyStimpak: 1 + +- type: reaction + id: DirtyStimpakConversion + reactants: + DirtyStimpak: + amount: 25 + Oil: + amount: 5 + Phosphorus: + amount: 5 + effects: + - !type:CreateEntityReactionEffect + entity: N14StimpakDirty diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml index 2267fdfd789..b64e2873594 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidKnight - setPreference: false # Delete line for RP - name: job-name-bos-mid-knight - description: job-description-bos-mid-knight + setPreference: true + name: Midwest knight + description: follow the paladins orders and fight for the brotherhood. playTimeTracker: BoSMidKnight startingGear: BoSMidKnight icon: "JobIconPassenger" @@ -20,7 +20,6 @@ outerClothing: N14ClothingOuterMidwestArmorMK2 hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml index 0c4be328663..70b301521ee 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidPaladinCommander - setPreference: false # Delete line for RP - name: job-name-bos-mid-paladin-comm - description: job-description-bos-mid-paladin-comm + setPreference: true + name: Midwest paladin commander + description: Lead the midwest exploration team, follow the objetives and take decisions to take control over the wasteland. playTimeTracker: BoSMidPaladinCommander startingGear: BoSMidPaladinCommGear icon: "JobIconPassenger" @@ -18,7 +18,7 @@ shoes: N14ClothingBootsCombat hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder + ears: N14ClothingHeadsetBOSMidwest belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml index a1cf13d10d7..4f627841d2a 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidPaladin - setPreference: false # Delete line for RP - name: job-name-bos-mid-paladin-comm - description: job-description-bos-mid-paladin + setPreference: true + name: Midwest paladin + description: lead the knights and squired during the mission, follow the paladin commander directions and fight for the brotherhood. playTimeTracker: BoSMidPaladin startingGear: BoSMidPaladinGear icon: "JobIconPassenger" @@ -16,9 +16,11 @@ jumpsuit: N14ClothingUniformBosRecon back: N14ClothingBackpackMilitary shoes: N14ClothingBootsCombat + head: N14ClothingHeadHatBrotherhoodFieldCap + outerClothing: N14ClothingOuterMidwestArmorMK2 hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder + ears: N14ClothingHeadsetBOSMidwest #placeholder belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml index c3523a256e0..13f25afacc2 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidScribe - setPreference: false # Delete line for RP - name: job-name-bos-mid-scribe - description: job-description-bos-mid-scribe + setPreference: true + name: Midwest scribe + description: Maintain equipment and support the knights and paladins in their mission. playTimeTracker: BoSMidScribe startingGear: BoSMidScribeGear icon: "JobIconPassenger" @@ -19,7 +19,7 @@ shoes: N14ClothingBootsCombat outerClothing: N14ClothingOuterMidwestBoSCoat id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetScience #placeholder + ears: N14ClothingHeadsetBOSMidwest belt: N14ClothingBeltUtilityFilled - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml index 8629f08be2e..25b80d747bb 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml @@ -1,8 +1,8 @@ - type: job id: BoSMidSquire - setPreference: false # Delete line for RP - name: job-name-bos-mid-squire - description: job-description-bos-mid-squire + setPreference: true + name: Midwest squire + description: Follow orders and become the hardened steel the brotherhood wants you to be. playTimeTracker: BoSMidSquire startingGear: BoSMidSquire icon: "JobIconPassenger" @@ -19,7 +19,6 @@ head: N14ClothingHeadHatBrotherhoodMidwestHelmet outerClothing: N14ClothingOuterMidwestArmor id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltMilitary - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml index 655e8288bf4..f1251df3f5e 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/captain.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonCaptain - setPreference: false # Delete line for RP - name: job-name-bos-washington-captain - description: job-description-bos-washington-captain + setPreference: true + name: Washington captain + description: lead the washington troops and make sure the objetives are accomplished, keep on line the troops. playTimeTracker: BoSWashingtonCaptain startingGear: BoSWashingtonCaptainGear icon: "JobIconPassenger" @@ -23,7 +23,7 @@ head: N14ClothingHeadHatBrotherhoodCap outerClothing: N14ClothingOuterCombatArmorBOSMK2 id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder + ears: N14ClothingHeadsetBOSWashington belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml index 7e0bd6333ad..8fe9ea3aea0 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/commander.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonCommander - setPreference: false # Delete line for RP - name: job-name-bos-washington-commander - description: job-description-bos-washington-commander + setPreference: true + name: Washington commander + description: You have a job to do, complete the mission no matter how much it costs, no matter how much blood needs to be spilled. playTimeTracker: BoSWashingtonCommander weight: 10 startingGear: BoSWashingtonCommanderGear @@ -19,10 +19,10 @@ jumpsuit: N14ClothingUniformJumpsuitBOSBlack back: N14ClothingBackpackMilitary shoes: N14ClothingBootsCombatMK2 - neck: ClothingNeckCloakBrotherhoodWashington + neck: N14ClothingNeckCloakBrotherhoodWashington head: N14ClothingHeadHatBrotherhoodBeret id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetAltSecurity #placeholder + ears: N14ClothingHeadsetBOSWashington belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml index 913663b7b14..40cc92faa18 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/recruit.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonRecruit - setPreference: false # Delete line for RP - name: job-name-bos-washington-Recruit - description: job-description-bos-washington-Recruit + setPreference: true + name: Washington recruit + description: Follow orders and climb the ranks for better a better life, theres no other choice. playTimeTracker: BoSWashingtonRecruit startingGear: BoSWashingtonRecruitGear icon: "JobIconPassenger" @@ -19,7 +19,6 @@ shoes: N14ClothingBootsCombat id: N14IDBrotherhoodHolotag outerClothing: N14ClothingOuterCombatArmorBOS - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml index aa6b76ab505..50b52be60c8 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/researcher.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonResearcher - setPreference: false # Delete line for RP - name: job-name-bos-washington-Researcher - description: job-description-bos-washington-Researcher + setPreference: true + name: Washington researcher + description: Support the troops and maintain the gear, make sure to stay 10 steps far from the savages of the wasteland. playTimeTracker: BoSWashingtonResearcher startingGear: BoSWashingtonResearcherGear icon: "JobIconScientist" @@ -20,7 +20,7 @@ shoes: N14ClothingBootsCombat outerClothing: N14ClothingOuterBosScribe id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetScience #placeholder + ears: N14ClothingHeadsetBOSWashington belt: N14ClothingBeltUtilityFilled - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml index 0eaac8e2a6a..c796797c761 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/BrotherhoodWashington/soldier.yml @@ -1,8 +1,8 @@ - type: job id: BoSWashingtonSoldier - setPreference: false # Delete line for RP - name: job-name-bos-washington-soldier - description: job-description-bos-washington-soldier + setPreference: true + name: Washington soldier + description: Follow your captain orders, no matter how much death they will cause, you follow orders. playTimeTracker: BoSWashingtonSoldier startingGear: BoSWashingtonSoldierGear icon: "JobIconPassenger" @@ -22,7 +22,6 @@ head: N14ClothingHeadHatBrotherhoodHelmet outerClothing: N14ClothingOuterCombatArmorBOSMK2 id: N14IDBrotherhoodHolotag - ears: ClothingHeadsetSecurity #placeholder belt: ClothingBeltBoSWebbing - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml index 8206a66686b..ad2feba9674 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml @@ -1,6 +1,6 @@ - type: job id: CaravanGuard - setPreference: false # Delete line for RP + setPreference: true name: job-name-caravan-guard description: job-description-caravan-guard playTimeTracker: CaravanGuard @@ -15,11 +15,11 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitCaravan back: N14ClothingBackpackCaravanFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingBootsCombat id: N14IDPassportCaravan - innerClothingSkirt: N14ClothingUniformJumpsuitTrader #placeholder - satchel: N14ClothingBackpackSatchelCaravanFilled - duffelbag: N14ClothingBackpackDuffelCaravanFilled + pocket2: N14WeaponPistol10mm + outerClothing: N14ClothingOuterLightMetalArmor + suitstorage: N14WeaponRifleR91 - type: playTimeTracker id: CaravanGuard diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml index 3ca3c93e12f..71db3cb158f 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml @@ -1,6 +1,6 @@ - type: job id: CaravanLeader - setPreference: false # Delete line for RP + setPreference: true name: job-name-caravan-leader description: job-description-caravan-leader playTimeTracker: CaravanLeader @@ -17,12 +17,10 @@ equipment: head: N14ClothingHeadHatTrucker jumpsuit: N14ClothingUniformJumpsuitMerchant - back: N14ClothingBackpackCaravanFilled - shoes: ClothingShoesColorBrown + back: N14ClothingBackpackCaravanLeaderFilled + shoes: N14ClothingBootsLeather + pocket1: N14WeaponPistol12mm id: N14IDPassportCaravan - innerClothingSkirt: N14ClothingUniformJumpsuitMerchant #placeholder - satchel: N14ClothingBackpackSatchelCaravanFilled - duffelbag: N14ClothingBackpackDuffelCaravanFilled - type: playTimeTracker - id: CaravanLeader \ No newline at end of file + id: CaravanLeader diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml index dffcc962d4b..8b93b18c98d 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml @@ -1,6 +1,6 @@ - type: job id: CaravanTrader - setPreference: false # Delete line for RP + setPreference: true name: job-name-caravan-trader description: job-description-caravan-trader playTimeTracker: CaravanTrader @@ -15,12 +15,10 @@ id: CaravanTraderGear equipment: jumpsuit: N14ClothingUniformJumpsuitTrader - back: N14ClothingBackpackCaravanFilled - shoes: ClothingShoesColorBlack + back: N14ClothingBackpackCaravanTraderFilled + shoes: N14ClothingBootsLeather id: N14IDPassportCaravan innerClothingSkirt: N14ClothingUniformJumpsuitTrader #placeholder - satchel: N14ClothingBackpackSatchelCaravanFilled - duffelbag: N14ClothingBackpackDuffelCaravanFilled - type: playTimeTracker - id: CaravanTrader \ No newline at end of file + id: CaravanTrader diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml index 865873444df..ede19db52ee 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_cadet.yml @@ -1,8 +1,8 @@ - type: job id: NCRCadet - setPreference: false # Delete line for RP - name: job-name-ncr-cadet - description: job-description-ncr-cadet + setPreference: true + name: NCR cadet + description: Show your officers that youre ready to become a private of the NCR army. playTimeTracker: NCRCadet startingGear: NCRCadetGear icon: "JobIconSecurityCadet" @@ -18,7 +18,6 @@ jumpsuit: N14ClothingUniformNCR shoes: N14ClothingBootsLeather id: N14IDNCRDogtag - ears: ClothingHeadsetSecurity #placeholder innerClothingSkirt: N14ClothingUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml index a9352863814..b7789746e05 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml @@ -1,6 +1,6 @@ - type: job id: NCRNCO - setPreference: false # Delete line for RP + setPreference: true name: job-name-ncr-nco description: job-description-ncr-nco playTimeTracker: NCRNCO @@ -24,7 +24,6 @@ eyes: ClothingEyesGlassesSunglasses outerClothing: N14ClothingOuterNCRVest id: N14IDNCRDogtag - ears: ClothingHeadsetSecurity #placeholder innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml index 931134ae536..12245633644 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml @@ -1,6 +1,6 @@ - type: job id: NCROfficer - setPreference: false # Delete line for RP + setPreference: true name: job-name-ncr-officer description: job-description-ncr-officer playTimeTracker: NCROfficer @@ -20,7 +20,6 @@ shoes: N14ClothingBootsLeather eyes: ClothingEyesGlassesSunglasses id: N14IDNCRDogtag - ears: ClothingHeadsetAltSecurity #placeholder innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml index d0abc12fb07..1e73a6211a4 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_soldier.yml @@ -1,8 +1,8 @@ - type: job id: NCRSoldier - setPreference: false # Delete line for RP - name: job-name-ncr-soldier - description: job-description-ncr-soldier + setPreference: true + name: NCR soldier + description: Follow orders and fight for the republic. playTimeTracker: NCRSoldier startingGear: NCRSoldierGear icon: "JobIconWarden" @@ -17,9 +17,8 @@ equipment: head: N14ClothingHeadHatNCRHelmetMetal jumpsuit: N14ClothingUniformNCR - shoes: ClothingShoesBootsJack + shoes: N14ClothingBootsLeather id: N14IDNCRDogtag - ears: ClothingHeadsetSecurity #placeholder innerClothingSkirt: N14ClothingUniformNCR #placeholder - type: playTimeTracker diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml new file mode 100644 index 00000000000..656b8faac74 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/republic_ranger.yml @@ -0,0 +1,26 @@ +- type: job + id: NCRRanger + setPreference: true + name: republic ranger + description: the most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic. + playTimeTracker: NCRRanger + weight: 10 + startingGear: NCRRangerGear + icon: "JobIconHeadOfSecurity" + requireAdminNotify: true + canBeAntag: false + accessGroups: + - NCR + +- type: startingGear + id: NCRRangerGear + equipment: + jumpsuit: N14ClothingUniformRangerV3 + shoes: N14ClothingBootsCombat + belt: ClothingBeltRevolverfilled + id: N14IDBadgeNCRDesertRanger + back: N14ClothingBackpackMilitaryFilled + innerClothingSkirt: N14ClothingUniformRangerV3 #placeholder + +- type: playTimeTracker + id: NCRRanger diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger.yml new file mode 100644 index 00000000000..a4011583e30 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger.yml @@ -0,0 +1,31 @@ +- type: job + id: Ranger + setPreference: true + name: desert ranger + description: job-description-ranger-ranking + playTimeTracker: Ranger + startingGear: RangerGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-ranger-veteran + canBeAntag: false + access: + - NCRCadet + - NCRSoldier + - NCRNCO + - NCRRanger + +- type: startingGear + id: RangerGear + equipment: + head: N14ClothingHeadHatRangerHelmetDesert + back: N14ClothingBackpackMilitaryFilled + jumpsuit: N14ClothingUniformRangerV2 + shoes: N14ClothingBootsLeather + belt: ClothingBeltRevolver + mask: ClothingMaskGasRangerDesert + outerClothing: N14ClothingOuterRangerCombatDesert + id: N14IDBadgeNCRDesertRanger + innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder + +- type: playTimeTracker + id: Ranger diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml new file mode 100644 index 00000000000..840741b0488 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml @@ -0,0 +1,29 @@ +- type: job + id: RangerRecruit + setPreference: true + name: recruit desert ranger + description: job-description-ranger-recruit + playTimeTracker: RangerRecruit + startingGear: RangerRecruitGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-ranger + canBeAntag: false + access: + - NCRCadet + - NCRSoldier + - NCRRanger + +- type: startingGear + id: RangerRecruitGear + equipment: + head: N14ClothingHeadHatCowboyRang + back: N14ClothingBackpackMilitaryFilled + jumpsuit: N14ClothingUniformRangerV1 + shoes: N14ClothingBootsLeather + belt: ClothingBeltRevolver + outerClothing: N14ClothingOuterRangerCombat + id: N14IDBadgeNCRDesertRangerRecruit + innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder + +- type: playTimeTracker + id: RangerRecruit diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_veteran.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_veteran.yml new file mode 100644 index 00000000000..6519ee5e693 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Rangers/ranger_veteran.yml @@ -0,0 +1,31 @@ +- type: job + id: RangerVeteran + setPreference: true + name: veteran desert ranger + description: job-description-ranger-veteran + playTimeTracker: RangerVeteran + weight: 10 + startingGear: RangerVeteranGear + icon: "JobIconHeadOfSecurity" + supervisors: job-supervisors-ncr-captain + requireAdminNotify: true + canBeAntag: false + accessGroups: + - NCR + +- type: startingGear + id: RangerVeteranGear + equipment: + head: N14ClothingHeadHatRangerHelmetElite + back: N14ClothingBackpackMilitaryFilled + jumpsuit: N14ClothingUniformRangerVeteran + shoes: N14ClothingBootsCombat + gloves: N14ClothingHandsGlovesCombat + belt: ClothingBeltRevolver + mask: ClothingMaskGasRangerElite + outerClothing: N14ClothingOuterRangerEliteOld + id: N14IDBadgeNCRDesertRangerElite + innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder + +- type: playTimeTracker + id: RangerVeteran diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml index 6ea6f020b7a..ee70efdd0de 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml @@ -1,6 +1,6 @@ - type: job id: TownDoctor - setPreference: false # Delete line for RP + setPreference: true name: job-name-towndoctor description: job-description-towndoctor playTimeTracker: TownDoctor @@ -13,7 +13,8 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitWastelandDoc back: N14ClothingBackpackWastelanderFilled # N14TODO: Doctors Bag - shoes: ClothingShoesColorBlack + shoes: N14ClothingShoesBlack + gloves: N14ClothingHandsGlovesNitrile id: N14IDDoctorTown outerClothing: ClothingOuterCoatLab innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack @@ -21,4 +22,4 @@ duffelbag: N14ClothingBackpackDuffelFilled # N14TODO: Doctors Bag - type: playTimeTracker - id: TownDoctor \ No newline at end of file + id: TownDoctor diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml index 2630bbc5ff7..4ad1316d0ad 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml @@ -1,6 +1,6 @@ - type: job id: TownMechanic - setPreference: false # Delete line for RP + setPreference: true name: job-name-townmechanic description: job-description-townmechanic playTimeTracker: TownMechanic @@ -13,7 +13,7 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitMechanic back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingShoesBlack id: N14IDPassportTownsfolk belt: N14ClothingBeltUtilityFilled innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack @@ -21,4 +21,4 @@ duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: TownMechanic \ No newline at end of file + id: TownMechanic diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml index 8421c1d7bab..c7433e0beed 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml @@ -1,6 +1,6 @@ - type: job id: TownShopkeeper - setPreference: false # Delete line for RP + setPreference: true name: job-name-townshopkeeper description: job-description-townshopkeeper playTimeTracker: TownShopkeeper @@ -13,11 +13,11 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitMerchant back: N14ClothingBackpackWastelanderFilled # N14TODO: Trader bag - shoes: ClothingShoesColorBlack + shoes: N14ClothingShoesBlack id: N14IDPassportTownsfolk innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled # N14TODO: Trader bag - type: playTimeTracker - id: TownShopkeeper \ No newline at end of file + id: TownShopkeeper diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml index 1582fff4650..632016b9691 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml @@ -1,6 +1,6 @@ - type: job id: Townsperson - setPreference: false # Delete line for RP + setPreference: true name: job-name-townsperson description: job-description-townsperson playTimeTracker: Townsperson @@ -13,11 +13,11 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitSettlerRags back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingShoesBlack id: N14IDPassportTownsfolk innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: Townsperson \ No newline at end of file + id: Townsperson diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml index 440a6f7c04d..6a058325e28 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml @@ -1,6 +1,6 @@ - type: job id: TownDeputy - setPreference: false # Delete line for RP + setPreference: true name: job-name-towndeputy description: job-description-towndeputy playTimeTracker: TownDeputy @@ -12,15 +12,15 @@ id: TownDeputyGear equipment: jumpsuit: N14ClothingUniformJumpsuitCowboyBrown - back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + head: N14ClothingHeadHatDeputy + back: N14ClothingBackpackDeputyFilled + shoes: N14ClothingShoesBlack id: N14IDBadgeTownDeputy - outerClothing: N14ClothingOuterLeatherArmor + outerClothing: N14ClothingOuterPoliceVest pocket1: RadioHandheld + pocket2: N14WeaponRevolver10mm belt: N14ClothingBeltPoliceFilled - innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack - satchel: N14ClothingBackpackSatchelWastelanderFilled - duffelbag: N14ClothingBackpackDuffelFilled + suitstorage: N14WeaponLeverCarbine - type: playTimeTracker - id: TownDeputy \ No newline at end of file + id: TownDeputy diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml index 323bfde6e84..1e01432e6a1 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml @@ -1,6 +1,6 @@ - type: job id: TownMayor - setPreference: false # Delete line for RP + setPreference: true name: job-name-townmayor description: job-description-townmayor playTimeTracker: TownMayor @@ -12,13 +12,12 @@ id: TownMayorGear equipment: jumpsuit: N14ClothingUniformJumpsuitCheckered - back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + back: N14ClothingBackpackMayorFilled + shoes: N14ClothingShoesBrown + belt: N14WeaponPistolChinese id: N14IDBadgeTownMayor pocket1: RadioHandheld innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack - satchel: N14ClothingBackpackSatchelWastelanderFilled - duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: TownMayor \ No newline at end of file + id: TownMayor diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml index c3607cfa9d2..798af69caf0 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml @@ -1,6 +1,6 @@ - type: job id: TownSheriff - setPreference: false # Delete line for RP + setPreference: true name: job-name-townsheriff description: job-description-townsheriff playTimeTracker: TownSheriff @@ -12,15 +12,15 @@ id: TownSheriffGear equipment: jumpsuit: N14ClothingUniformJumpsuitCowboyGrey - back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + back: N14ClothingBackpackSheriffFilled + shoes: N14ClothingBootsCowboy + head: N14ClothingHeadHatSheriff id: N14IDBadgeTownSheriff - outerClothing: N14ClothingOuterCombatArmor + outerClothing: N14ClothingOuterSheriffVest pocket1: RadioHandheld + pocket2: N14WeaponHunterRevolver belt: N14ClothingBeltPoliceFilled - innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack - satchel: N14ClothingBackpackSatchelWastelanderFilled - duffelbag: N14ClothingBackpackDuffelFilled + suitstorage: N14WeaponLeverRifle - type: playTimeTracker - id: TownSheriff \ No newline at end of file + id: TownSheriff diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribal.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribal.yml index 72212b1d82d..d818b338a28 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribal.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribal.yml @@ -1,6 +1,6 @@ - type: job id: Tribal - setPreference: false # Delete line for RP + setPreference: true name: job-name-tribal description: job-description-tribal playTimeTracker: Tribal @@ -13,9 +13,11 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitTribal outerClothing: N14ClothingOuterTribalArmor + shoes: N14ClothingShoesTribal + gloves: N14ClothingHandsGlovesTribal innerClothingSkirt: N14ClothingUniformJumpskirtTribal satchel: ClothingBackpackSatchelHydroponicsFilled #placeholder duffelbag: ClothingBackpackDuffelFilled #placeholder - type: playTimeTracker - id: Tribal \ No newline at end of file + id: Tribal diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalelder.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalelder.yml index 26c25533172..62fe4c925f8 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalelder.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalelder.yml @@ -1,6 +1,6 @@ - type: job id: TribalElder - setPreference: false # Delete line for RP + setPreference: true name: job-name-tribal-elder description: job-description-tribal-elder playTimeTracker: TribalElder @@ -13,10 +13,12 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitTribal outerClothing: N14ClothingOuterTribalArmorHeavy + shoes: N14ClothingShoesTribal + gloves: N14ClothingHandsGlovesTribal belt: ClothingBeltPlantFilled #placeholder innerClothingSkirt: N14ClothingUniformJumpskirtTribal satchel: ClothingBackpackSatchelHydroponicsFilled #placeholder duffelbag: ClothingBackpackDuffelFilled #placeholder - type: playTimeTracker - id: TribalElder \ No newline at end of file + id: TribalElder diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalfarmer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalfarmer.yml index c67650fbb10..f62b4589fb9 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalfarmer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalfarmer.yml @@ -1,6 +1,6 @@ - type: job id: TribalFarmer - setPreference: false # Delete line for RP + setPreference: true name: job-name-tribal-farmer description: job-description-farmer playTimeTracker: TribalFarmer @@ -14,10 +14,12 @@ jumpsuit: N14ClothingUniformJumpsuitTribal back: ClothingBackpackHydroponicsFilled #placeholder outerClothing: N14ClothingOuterTribalArmor + shoes: N14ClothingShoesTribal + gloves: N14ClothingHandsGlovesTribal belt: ClothingBeltPlantFilled innerClothingSkirt: N14ClothingUniformJumpskirtTribal satchel: ClothingBackpackSatchelHydroponicsFilled #placeholder duffelbag: ClothingBackpackDuffelFilled #placeholder - type: playTimeTracker - id: TribalFarmer \ No newline at end of file + id: TribalFarmer diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalhealer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalhealer.yml index 69a275f3cbf..1cc9868a21c 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalhealer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Tribal/tribalhealer.yml @@ -1,6 +1,6 @@ - type: job id: TribalHealer - setPreference: false # Delete line for RP + setPreference: true name: job-name-tribal-healer description: job-description-tribal-healer playTimeTracker: TribalHealer @@ -14,10 +14,12 @@ jumpsuit: N14ClothingUniformJumpsuitTribal back: ClothingBackpackHydroponicsFilled #placeholder outerClothing: N14ClothingOuterTribalArmor + shoes: N14ClothingShoesTribal + gloves: N14ClothingHandsGlovesTribal belt: ClothingBeltPlantFilled innerClothingSkirt: N14ClothingUniformJumpskirtTribal satchel: ClothingBackpackSatchelHydroponicsFilled #placeholder duffelbag: ClothingBackpackDuffelFilled #placeholder - type: playTimeTracker - id: TribalHealer \ No newline at end of file + id: TribalHealer diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/overseer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/overseer.yml index 42c6ad1b392..ac112fee2b9 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/overseer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/overseer.yml @@ -19,13 +19,12 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitVault14 back: N14ClothingBackpackVaultOverseerFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingBootsBlack eyes: ClothingEyesGlassesSunglasses id: N14VaultOverseerPDA ears: N14ClothingHeadsetVaultCommand + pocket1: N14WeaponPistol10mm innerClothingSkirt: N14ClothingUniformJumpsuitVault14 - satchel: N14ClothingBackpackVaultOverseerFilled #placeholder - duffelbag: N14ClothingBackpackVaultOverseerFilled #placeholder - type: playTimeTracker - id: Overseer \ No newline at end of file + id: Overseer diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdoctor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdoctor.yml index 35e2d397655..f05e3e8be4a 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdoctor.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdoctor.yml @@ -15,15 +15,13 @@ id: VaultDoctorGear equipment: jumpsuit: N14ClothingUniformJumpsuitVault14 - back: N14ClothingBackpackVaultDoctorFilled - shoes: ClothingShoesColorWhite + back: N14ClothingBackpackVaultOverseerFilled + shoes: N14ClothingBootsBlack outerClothing: ClothingOuterCoatLab id: N14VaultDoctorPDA ears: N14ClothingHeadsetVaultMedical belt: ClothingBeltMedicalFilled innerClothingSkirt: N14ClothingUniformJumpsuitVault14 - satchel: N14ClothingBackpackVaultDoctorFilled - duffelbag: N14ClothingBackpackVaultDoctorFilled - type: playTimeTracker - id: VaultDoctor \ No newline at end of file + id: VaultDoctor diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml index 42a577f267f..c7e2de971fb 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml @@ -15,10 +15,10 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitVault14 back: N14ClothingBackpackVaultDwellerFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingBootsBlack id: N14VaultPDA ears: N14ClothingHeadsetVaultDweller innerClothingSkirt: N14ClothingUniformJumpsuitVault14 - type: playTimeTracker - id: VaultDweller \ No newline at end of file + id: VaultDweller diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultengineer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultengineer.yml index 5798b28ff4d..e4282928ecf 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultengineer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultengineer.yml @@ -16,15 +16,12 @@ equipment: head: ClothingHeadHatHardhatYellow jumpsuit: N14ClothingUniformJumpsuitVault14 - back: N14ClothingBackpackVaultEngineerFilled - shoes: ClothingShoesBootsWork + back: N14ClothingBackpackVaultDwellerFilled + shoes: N14ClothingBootsBlack outerClothing: ClothingOuterVestHazard id: N14VaultEngineerPDA belt: N14ClothingBeltUtilityFilled ears: N14ClothingHeadsetVaultEngineering - innerClothingSkirt: N14ClothingUniformJumpsuitVault14 - satchel: N14ClothingBackpackVaultEngineerFilled - duffelbag: N14ClothingBackpackVaultEngineerFilled - type: playTimeTracker - id: VaultEngineer \ No newline at end of file + id: VaultEngineer diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml index 28fa18eedb5..ed09d8de604 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml @@ -17,16 +17,14 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitVault14 back: N14ClothingBackpackVaultSecurityFilled - shoes: ClothingShoesBootsJack + shoes: N14ClothingBootsBlack eyes: ClothingEyesGlassesSunglasses head: ClothingHeadHelmetRiot outerClothing: N14ClothingOuterVaultSecVest id: N14VaultSecurityPDA + pocket1: N14WeaponPistol10mm ears: N14ClothingHeadsetVaultSecurity belt: N14ClothingBeltPoliceFilled - innerClothingSkirt: N14ClothingUniformJumpsuitVault14 #placeholder - satchel: ClothingBackpackSatchelSecurityFilled #placeholder - duffelbag: ClothingBackpackDuffelSecurityFilled #placeholder - type: playTimeTracker - id: VaultSecurity \ No newline at end of file + id: VaultSecurity diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/bartender.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/bartender.yml index 91d5173d129..5948791bccb 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/bartender.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/bartender.yml @@ -1,6 +1,6 @@ - type: job id: WastelandBartender - setPreference: false # Delete line for RP + setPreference: true name: job-name-bartender description: job-description-bartender playTimeTracker: WastelandBartender @@ -15,10 +15,10 @@ jumpsuit: N14ClothingUniformJumpsuitBartenderAlt outerClothing: N14ClothingOuterLeatherArmor back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingBootsLeather innerClothingSkirt: N14ClothingUniformJumpsuitBartenderAlt #placeholder satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: WastelandBartender \ No newline at end of file + id: WastelandBartender diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/chaplain.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/chaplain.yml index c1cc2419fc0..e5f3b0c4517 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/chaplain.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/chaplain.yml @@ -1,6 +1,6 @@ - type: job id: WastelandChaplain - setPreference: false # Delete line for RP + setPreference: true name: job-name-chaplain description: job-description-chaplain playTimeTracker: WastelandChaplain @@ -17,10 +17,10 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitFollowers back: N14ClothingBackpackChaplainFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingBootsBlack innerClothingSkirt: N14ClothingUniformJumpsuitFollowers satchel: N14ClothingBackpackSatchelChaplainFilled duffelbag: N14ClothingBackpackDuffelChaplainFilled - type: playTimeTracker - id: WastelandChaplain \ No newline at end of file + id: WastelandChaplain diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/farmer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/farmer.yml index 90efb5c5f68..1847b2e3a5e 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/farmer.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/farmer.yml @@ -1,6 +1,6 @@ - type: job id: WastelandFarmer - setPreference: false # Delete line for RP + setPreference: true name: job-name-farmer description: job-description-farmer playTimeTracker: Farmer @@ -13,7 +13,7 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitBrahminFarmer back: N14ClothingBackpackWastelanderFilled - shoes: N14ClothingShoesRags + shoes: N14ClothingBootsLeather outerClothing: ClothingOuterApronBotanist belt: N14ClothingBeltPlantFilled innerClothingSkirt: N14ClothingUniformJumpsuitBrahminFarmer #placeholder @@ -21,4 +21,4 @@ duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: Farmer \ No newline at end of file + id: Farmer diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/musician.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/musician.yml index c410d12ea8c..1a6f666e47a 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/musician.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/musician.yml @@ -1,6 +1,6 @@ - type: job id: WastelandMusician - setPreference: false # Delete line for RP + setPreference: true name: job-name-musician description: job-description-musician playTimeTracker: WastelandMusician @@ -18,9 +18,9 @@ jumpsuit: N14ClothingUniformJumpsuitManagerSuit back: N14ClothingBackpackMusicianFilled eyes: ClothingEyesGlassesSunglasses - shoes: ClothingShoesColorBlack + shoes: N14ClothingShoesBrown satchel: N14ClothingBackpackSatchelMusicianFilled duffelbag: N14ClothingBackpackDuffelMusicianFilled - type: playTimeTracker - id: WastelandMusician \ No newline at end of file + id: WastelandMusician diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/reporter.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/reporter.yml index d020ca961fd..dfcbd71434f 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/reporter.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/reporter.yml @@ -1,6 +1,6 @@ - type: job id: WastelandReporter - setPreference: false # Delete line for RP + setPreference: true name: job-name-reporter description: job-description-reporter playTimeTracker: WastelandReporter @@ -13,10 +13,10 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitDetectiveAlt back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorWhite + shoes: N14ClothingShoesBlack innerClothingSkirt: N14ClothingUniformJumpsuitDetectiveAlt satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: WastelandReporter \ No newline at end of file + id: WastelandReporter diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/scavenger.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/scavenger.yml index 5d20cdb8499..95b7da20f4c 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/scavenger.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/scavenger.yml @@ -1,6 +1,6 @@ - type: job id: WastelandScavenger - setPreference: false # Delete line for RP + setPreference: true name: job-name-scavenger description: job-description-scavenger playTimeTracker: WastelandScavenger @@ -17,11 +17,11 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitMechanic back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesBootsSalvage + shoes: N14ClothingBootsFire belt: N14ClothingBeltUtilityFilled innerClothingSkirt: N14ClothingUniformJumpsuitMechanic satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: WastelandScavenger \ No newline at end of file + id: WastelandScavenger diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/wastelander.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/wastelander.yml index f0f2465cef3..017c785f2dc 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/wastelander.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Wastelanders/wastelander.yml @@ -1,6 +1,6 @@ - type: job id: Wastelander - setPreference: false # Delete line for RP + setPreference: true name: job-name-wastelander description: job-description-wastelander playTimeTracker: Wastelander @@ -13,10 +13,10 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitRags back: N14ClothingBackpackWastelanderFilled - shoes: ClothingShoesColorBlack + shoes: N14ClothingShoesRags innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled - type: playTimeTracker - id: Wastelander \ No newline at end of file + id: Wastelander diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml index c8487ed1fa1..6235b9f9ae3 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml @@ -37,6 +37,17 @@ - NCRNCO - NCROfficer - NCRSoldier + - NCRRanger + + +- type: department + id: Rangers + description: department-NCR-description + color: "#3ab700" + roles: + - RangerRecruit + - Ranger + - RangerVeteran - type: department id: Tribe @@ -85,15 +96,14 @@ - TownDeputy - TownSheriff - TownMayor - + - type: department id: Zetan description: department-Zetan-description color: "#7ec133" - editorHidden: true roles: - Zetan - + - type: department id: Followers description: department-Followers-description diff --git a/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml b/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml index d5481fe043a..f840631c184 100644 --- a/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml +++ b/Resources/Prototypes/Nuclear14/Stacks/consumable_stacks.yml @@ -179,3 +179,11 @@ icon: { sprite: Nuclear14/Objects/Consumable/Flora/wastelandflora.rsi, state: xander_root } spawn: N14FloraProduceWildXander maxCount: 5 + +# Smokeables +- type: stack + id: N14RollingPaper + name: rolling paper + icon: { sprite: Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi, state: rollie_paper } + spawn: N14RollingPaper1 + maxCount: 5 \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml index a30a72b9f9e..b7296ee9487 100644 --- a/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/Nuclear14/Stacks/material_stacks.yml @@ -20,6 +20,14 @@ maxCount: 100 itemSize: 1 +- type: stack + id: N14Paper + name: paper + icon: { sprite: "/Textures/Nuclear14/Objects/Misc/clutter.rsi", state: paper } + spawn: N14Paper1 + maxCount: 10 + itemSize: 1 + # Ores # - type: stack # id: LeadOre diff --git a/Resources/Prototypes/Nuclear14/tags.yml b/Resources/Prototypes/Nuclear14/tags.yml index 667708f3c5e..969335debeb 100644 --- a/Resources/Prototypes/Nuclear14/tags.yml +++ b/Resources/Prototypes/Nuclear14/tags.yml @@ -20,6 +20,10 @@ - type: Tag id: Saw +# Guns types. +- type: Tag + id: Revolver + # Ammo tags(cartriges). - type: Tag id: N14CartridgePistol22 @@ -57,6 +61,9 @@ - type: Tag id: N14ShellShotgun20 +- type: Tag + id: N14Cartridge45-70 + - type: Tag id: N14Cartridge308Rifle @@ -118,6 +125,9 @@ - type: Tag id: N14Clip308Rifle +- type: Tag + id: SpeedLoader + # Ammo tags(Battery). - type: Tag diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml index 6c96d3a56dd..afa114ecbca 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml @@ -5,7 +5,7 @@ name: mystagogue's hardsuit helmet description: Lightweight hardsuit helmet that has a galaxy-first psionic passthrough system. components: - - type: Psionic + #- type: Psionic - type: TinfoilHat passthrough: true destroyOnFry: false diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml index 0bc1b60ad35..52a8ac45f42 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml @@ -11,7 +11,7 @@ - type: VisionCorrection - type: ClothingGrantPsionicPower power: TelegnosisPower - - type: Psionic + #- type: Psionic - type: entity id: BedsheetInvisibilityCloak @@ -25,7 +25,7 @@ sprite: Clothing/Neck/Bedsheets/black.rsi - type: ClothingGrantPsionicPower power: PsionicInvisibilityPower - - type: Psionic + #- type: Psionic - type: entity parent: ClothingHandsBase @@ -45,7 +45,7 @@ - type: FingerprintMask - type: ClothingGrantPsionicPower power: DispelPower - - type: Psionic + #- type: Psionic - type: entity parent: ClothingHandsBase @@ -63,4 +63,4 @@ - type: FingerprintMask - type: ClothingGrantPsionicPower power: NoosphericZapPower - - type: Psionic + #- type: Psionic diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml index 5daf2e15e56..5cdfa18e812 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml @@ -143,8 +143,8 @@ # bloodReagent: DemonsBlood # - type: Body # prototype: VampiricAnimalLarge -# - type: PotentialPsionic -# - type: Psionic +# #- type: PotentialPsionic +# #- type: Psionic # removable: false # - type: MetapsionicPower # - type: MeleeWeapon diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml index 562b9c564ec..b83f52f3e13 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml @@ -32,4 +32,4 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic + #- type: PotentialPsionic diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml index db7936cc5b4..facb5ced4bc 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml @@ -49,5 +49,5 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic + #- type: PotentialPsionic diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml index abe2833e890..e78493bf9f6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml @@ -14,7 +14,7 @@ layers: - state: eyeball shader: unshaded - - type: Psionic + #- type: Psionic - type: MindContainer - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml index b4d3ca1abff..3204cf095f1 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml @@ -23,7 +23,7 @@ # state: bluespace # color: purple # - type: Speech -# - type: Psionic +# #- type: Psionic # - type: SoulCrystal # - type: SolutionContainerManager # solutions: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml index d8e791af1ed..3da14947d89 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml @@ -22,4 +22,4 @@ NoMind: { state: pod_1 } Gore: { state: pod_1 } Idle: { state: pod_0 } - - type: Psionic + #- type: Psionic diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml index e157f8b7ff4..43d3bb7658a 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml @@ -4,7 +4,7 @@ name: glimmer prober description: Probes the noösphere to generate research points. Might be worth turning off if glimmer is a problem. components: - - type: Psionic + #- type: Psionic - type: GlimmerSource - type: Construction graph: GlimmerDevices @@ -90,7 +90,7 @@ name: glimmer drain description: Uses electricity to try and sort out the noösphere, reducing its level of entropy. components: - - type: Psionic + #- type: Psionic - type: GlimmerSource addToGlimmer: false - type: Construction diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml index f7481abf1ed..0ddd145a736 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml @@ -16,7 +16,7 @@ - type: Oracle - type: Speech speechSounds: Tenor - - type: Psionic + #- type: Psionic - type: SolutionContainerManager solutions: fountain: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml index ae85cd25e03..2da5a6703c7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml @@ -27,8 +27,8 @@ channels: - Common - Science - - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it - - type: Psionic + #- type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it + #- type: Psionic - type: Grammar attributes: gender: female diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index c80e222c3fa..68b5eaa048a 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -22,7 +22,7 @@ special: - !type:AddComponentSpecial components: - - type: Psionic + #- type: Psionic - type: MetapsionicPower setPreference: false diff --git a/Resources/Prototypes/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/smokeables.yml index 06f2216c973..1b7406fac37 100644 --- a/Resources/Prototypes/Recipes/Crafting/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/smokeables.yml @@ -8,7 +8,6 @@ description: "A roll of dried plant matter wrapped in thin paper." icon: { sprite: Objects/Consumable/Smokeables/Cannabis/joint.rsi, state: unlit-icon } objectType: Item - hide: false - type: construction name: blunt @@ -20,7 +19,6 @@ description: "A roll of dried plant matter wrapped in a dried tobacco leaf." icon: { sprite: Objects/Consumable/Smokeables/Cannabis/blunt.rsi, state: unlit-icon } objectType: Item - hide: false - type: construction name: cigarette @@ -32,7 +30,6 @@ description: "A roll of tobacco and nicotine." icon: { sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi, state: unlit-icon } objectType: Item - hide: false # I wanted to put a hand-grinder here but we need construction graphs that use non-consumed catalysts first. @@ -47,7 +44,6 @@ icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile } # color: darkgreen objectType: Item - hide: false - type: construction name: ground tobacco @@ -59,5 +55,4 @@ description: "Ground tobacco, perfect for hand-rolled cigarettes." icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile } # color: brown - objectType: Item - hide: false \ No newline at end of file + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index e950ffaed44..2cc6b942814 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -18,10 +18,10 @@ - !type:AddComponentSpecial components: - type: BibleUser #Lets them heal with bibles - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. - multiplier: 3 + #- !type:AddComponentSpecial + # components: + # - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + # multiplier: 3 setPreference: false - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index f16eab2056c..5c5680af24f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -16,7 +16,7 @@ special: - !type:AddComponentSpecial components: - - type: Psionic # Nyano - Summary: Makes the mime psionic. + #- type: Psionic # Nyano - Summary: Makes the mime psionic. - type: MimePowers - type: FrenchAccent setPreference: false diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index c1305ef12f5..476e68e9bcf 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -41,10 +41,10 @@ - !type:AddComponentSpecial components: - type: CommandStaff - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. - flatBonus: 0.025 + #- !type:AddComponentSpecial + # components: + # - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + # flatBonus: 0.025 - type: startingGear id: CaptainGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 4ef9cc7e1c3..095cbac9f4d 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -67,10 +67,10 @@ - !type:AddComponentSpecial components: - type: CommandStaff - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. - flatBonus: 0.025 + #- !type:AddComponentSpecial + # components: + # - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + # flatBonus: 0.025 - type: startingGear id: HoPGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index a35928dc13e..622c75f98f2 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -35,10 +35,10 @@ - !type:AddComponentSpecial components: - type: CommandStaff - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. - flatBonus: 0.025 + #- !type:AddComponentSpecial + # components: + # - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + # flatBonus: 0.025 setPreference: false - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 30a6b971c3e..759778dc0cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -40,10 +40,10 @@ - !type:AddComponentSpecial components: - type: CommandStaff - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. - flatBonus: 0.025 + #- !type:AddComponentSpecial + # components: + # - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + # flatBonus: 0.025 setPreference: false - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 210b8816331..5c7556cebc9 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -28,7 +28,7 @@ - !type:AddComponentSpecial components: - type: BibleUser # Nyano - Lets them heal with bibles - - type: Psionic # Nyano - They start with telepathic chat + #- type: Psionic # Nyano - They start with telepathic chat - type: DispelPower # Nyano - They get the Dispel psionic power on spawn - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 1adf5fd40b0..66bdf9e156e 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -40,10 +40,10 @@ - !type:AddComponentSpecial components: - type: CommandStaff - - !type:AddComponentSpecial - components: - - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. - flatBonus: 0.025 + #- !type:AddComponentSpecial + # components: + # - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + # flatBonus: 0.025 setPreference: false - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 7936d2212bd..83534425097 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -2,7 +2,6 @@ id: Logistics # DeltaV - Logistics Department replacing Cargo description: department-Cargo-description color: "#A46106" - editorHidden: true roles: - CargoTechnician - Quartermaster @@ -14,7 +13,6 @@ description: department-Civilian-description color: "#9FED58" weight: -10 - editorHidden: true roles: - Bartender - Borg @@ -42,7 +40,6 @@ id: Command description: department-Command-description color: "#334E6D" - editorHidden: true roles: - Captain - CentralCommandOfficial @@ -59,7 +56,6 @@ id: Engineering description: department-Engineering-description color: "#EFB341" - editorHidden: true roles: - AtmosphericTechnician - ChiefEngineer @@ -71,7 +67,6 @@ id: Medical description: department-Medical-description color: "#52B4E9" - editorHidden: true roles: - Chemist - ChiefMedicalOfficer @@ -87,7 +82,6 @@ description: department-Security-description color: "#DE3A3A" weight: 20 - editorHidden: true roles: - HeadOfSecurity - SecurityCadet @@ -102,7 +96,6 @@ id: Epistemics # DeltaV - Epistemics Department replacing Science description: department-Science-description color: "#D381C9" - editorHidden: true roles: - ResearchDirector - SeniorResearcher @@ -116,7 +109,6 @@ description: department-Specific-description color: "#9FED58" weight: 10 - editorHidden: true roles: - Boxer - Reporter diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png index 4da4f1e6b20..88351c9e8dd 100644 Binary files a/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/icon.png b/Resources/Textures/Clothing/Belt/medical.rsi/icon.png index 9b0c3855099..56a15f34831 100644 Binary files a/Resources/Textures/Clothing/Belt/medical.rsi/icon.png and b/Resources/Textures/Clothing/Belt/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/medical.rsi/inhand-left.png index 05b12bcf4e2..ebf6f6ca37a 100644 Binary files a/Resources/Textures/Clothing/Belt/medical.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/medical.rsi/inhand-right.png index a3e40d34a82..e13bfa1b5c5 100644 Binary files a/Resources/Textures/Clothing/Belt/medical.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/equipped-HELMET.png index 9e72e0c1d4e..3bdc6d5caa1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/icon.png index 8bc74102592..bb4fb371aab 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png index f980e7b3ecc..cf031193a12 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png index e441011bcf4..aab176b2c46 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/equipped-BELT.png rename to Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/equipped-BELT.png diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/icon.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/icon.png rename to Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/icon.png diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/inhand-left.png rename to Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/inhand-left.png diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/inhand-right.png rename to Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/inhand-right.png diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/meta.json similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Belt/ncrbandolier.rsi/meta.json rename to Resources/Textures/Nuclear14/Clothing/Belt/bandolier.rsi/meta.json diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/10mmrevolver.png b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/10mmrevolver.png new file mode 100644 index 00000000000..8a6942c0fce Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/10mmrevolver.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/9mmrevolver.png b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/9mmrevolver.png new file mode 100644 index 00000000000..426b0909cc4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/9mmrevolver.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/hunter-revolver.png b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/hunter-revolver.png new file mode 100644 index 00000000000..b11203e8d02 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/hunter-revolver.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/magnum.png b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/magnum.png new file mode 100644 index 00000000000..703a41cfcf1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/magnum.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/meta.json new file mode 100644 index 00000000000..8b37611ba85 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from multiple ss13 forks", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ranger-sequoia" + }, + { + "name": "hunter-revolver" + }, + { + "name": "magnum" + }, + { + "name": "10mmrevolver" + }, + { + "name": "9mmrevolver" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/ranger-sequoia.png b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/ranger-sequoia.png new file mode 100644 index 00000000000..b5aacfec79b Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/beltoverlay.rsi/ranger-sequoia.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/equipped-BELT.png new file mode 100644 index 00000000000..e724e9e9f7c Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/icon.png new file mode 100644 index 00000000000..5265a2ed4d1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/inhand-left.png new file mode 100644 index 00000000000..460c6a390a0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/inhand-right.png new file mode 100644 index 00000000000..5dd01519b34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/meta.json new file mode 100644 index 00000000000..adca2abad26 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Belt/revolverholster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tg at commit https://github.com/tgstation/tgstation/commit/0310aaa254607855d7273ec849c4ecad48477dd5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/equipped-HAND.png b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..5df5021ab5e Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/icon.png new file mode 100644 index 00000000000..608b3cc0803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/meta.json new file mode 100644 index 00000000000..faa57f5ee57 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/NCRgloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/equipped-HAND.png b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..01ba00b0218 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/icon.png new file mode 100644 index 00000000000..4b131d60ea5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/meta.json new file mode 100644 index 00000000000..faa57f5ee57 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Hands/Gloves/patrolgloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..90015d6b3e4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/icon.png new file mode 100644 index 00000000000..bf28caa567d Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/meta.json similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/meta.json rename to Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/animalhat.rsi/meta.json diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/armycap.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/armycap.rsi/equipped-HELMET.png index 16c525b3cbb..5182005b58f 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/armycap.rsi/equipped-HELMET.png and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/armycap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/equipped-HELMET.png rename to Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/equipped-HELMET.png diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/icon.png similarity index 100% rename from Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi/icon.png rename to Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/icon.png diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/meta.json new file mode 100644 index 00000000000..718d9144279 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..7d2534ccdd2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/icon.png new file mode 100644 index 00000000000..3038fca4cae Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/meta.json new file mode 100644 index 00000000000..718d9144279 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/nightstalkerhat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Nukapop13 at commit https://github.com/SeeminglyTypicalUsername/Nukapop13/commit/fbb54ee986f6f321767cbe227dfbf1a9254a0a7a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2c863aba336 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/icon.png new file mode 100644 index 00000000000..e069cf0287c Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/meta.json new file mode 100644 index 00000000000..fbafdef7b42 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatB.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..546c3b1f368 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/icon.png new file mode 100644 index 00000000000..6147ee6b065 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/meta.json new file mode 100644 index 00000000000..fbafdef7b42 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..91cdb97dcac Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/icon.png new file mode 100644 index 00000000000..279f6be17cb Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/meta.json new file mode 100644 index 00000000000..fbafdef7b42 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..0869d6745eb Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/icon.png new file mode 100644 index 00000000000..a11e0968890 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/meta.json new file mode 100644 index 00000000000..fbafdef7b42 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/enclavehelmet.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/enclavehelmet.rsi/equipped-HELMET.png index e6ef77156b4..80ba3d153a6 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/enclavehelmet.rsi/equipped-HELMET.png and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/enclavehelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/equipped-HELMET.png index e8aa7aca49c..3bcfd7517c3 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/equipped-HELMET.png and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/icon.png index 2563fd78512..7223815bf7d 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/icon.png and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/policethelmet.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/equipped-HELMET.png index f74e329207d..d32993c3b4a 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/equipped-HELMET.png and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/icon.png index 8aab5d8883f..fa54c99dbdc 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/icon.png and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmet.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..edc58854b82 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/icon.png new file mode 100644 index 00000000000..d6de36d6944 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/meta.json new file mode 100644 index 00000000000..5c50a4fd549 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..51108a1edb4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/icon.png new file mode 100644 index 00000000000..2f92fe9ef19 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/meta.json new file mode 100644 index 00000000000..5c50a4fd549 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetelite.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d4a818aeb86 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/icon.png new file mode 100644 index 00000000000..d5b0c39ced5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/meta.json new file mode 100644 index 00000000000..5c50a4fd549 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..d7519536cad Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/icon.png new file mode 100644 index 00000000000..f927a27005a Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/meta.json new file mode 100644 index 00000000000..5c50a4fd549 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2307452fc85 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/icon.png new file mode 100644 index 00000000000..12e4f060fd9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/meta.json new file mode 100644 index 00000000000..4e8db4ee937 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/leathercloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "#234 https://github.com/Vault-Overseers/nuclear-14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..7a99f007373 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/icon.png new file mode 100644 index 00000000000..e7454a6c80e Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/meta.json new file mode 100644 index 00000000000..4e8db4ee937 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/ponchocloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "#234 https://github.com/Vault-Overseers/nuclear-14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/equipped-HELMET.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..a237c22e65e Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/icon.png new file mode 100644 index 00000000000..0583e4deae1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/meta.json new file mode 100644 index 00000000000..4e8db4ee937 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Head/FalloutHoods/rangercloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "#234 https://github.com/Vault-Overseers/nuclear-14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..ed308530a16 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/icon.png new file mode 100644 index 00000000000..f7fdf732994 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/meta.json new file mode 100644 index 00000000000..66c8019a82e --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..7ef0d6da36f Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/icon.png new file mode 100644 index 00000000000..6460b143c22 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/meta.json new file mode 100644 index 00000000000..66c8019a82e --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..3b61db07cec Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/icon.png new file mode 100644 index 00000000000..1a0828750d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/meta.json new file mode 100644 index 00000000000..66c8019a82e --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerelitegasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..37baa1b48ba Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/icon.png new file mode 100644 index 00000000000..c9c982afa80 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/meta.json new file mode 100644 index 00000000000..0b091591b3a --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangergasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..cac2ebe7cb7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/icon.png new file mode 100644 index 00000000000..323ebeed3f6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/meta.json new file mode 100644 index 00000000000..66c8019a82e --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..b34ac2b5621 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/icon.png new file mode 100644 index 00000000000..991e6b155a0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/meta.json new file mode 100644 index 00000000000..66c8019a82e --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/equipped-MASK.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..249bde3fcb2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/icon.png new file mode 100644 index 00000000000..b06ef5e1df5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/meta.json new file mode 100644 index 00000000000..66c8019a82e --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Mask/Gasmask/rangerweatheredgasmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/equipped-NECK.png b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/equipped-NECK.png new file mode 100644 index 00000000000..5d5e8db56d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/icon.png new file mode 100644 index 00000000000..af1c93505b8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/meta.json new file mode 100644 index 00000000000..5fef79c52bc --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangercape.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/equipped-NECK.png b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/equipped-NECK.png new file mode 100644 index 00000000000..6286c49dd88 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/icon.png new file mode 100644 index 00000000000..2bb7bebfb92 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/meta.json new file mode 100644 index 00000000000..5fef79c52bc --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Neck/NCRrangerponcho.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/equipped-NECK.png b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/equipped-NECK.png new file mode 100644 index 00000000000..a7ba39cb80d Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/icon.png new file mode 100644 index 00000000000..0c5399cdada Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/inhand-left.png new file mode 100644 index 00000000000..9811052dd95 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/inhand-right.png new file mode 100644 index 00000000000..bc2d7e017fa Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/meta.json new file mode 100644 index 00000000000..a3ef379b546 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Neck/yaoguai.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by brainfood1183 (github) for ss14, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..16ebf4ebc20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/icon.png new file mode 100644 index 00000000000..06143552f9a Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/inhand-left.png new file mode 100644 index 00000000000..460c6a390a0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/inhand-right.png new file mode 100644 index 00000000000..5dd01519b34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/meta.json new file mode 100644 index 00000000000..bee099c7415 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutchitinarmor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from DesertRose https://github.com/DesertRose2/desertrose", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7e75e84f2e8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/icon.png new file mode 100644 index 00000000000..fb9d4cd4ca4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/inhand-left.png new file mode 100644 index 00000000000..0e87b043701 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/inhand-right.png new file mode 100644 index 00000000000..02c77e79e0d Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/meta.json new file mode 100644 index 00000000000..37bcbbf9c89 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCR.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..24156e3a7cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/icon.png new file mode 100644 index 00000000000..fb9d4cd4ca4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/inhand-left.png new file mode 100644 index 00000000000..0e87b043701 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/inhand-right.png new file mode 100644 index 00000000000..02c77e79e0d Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/meta.json new file mode 100644 index 00000000000..37bcbbf9c89 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutcombatNCRmk2.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..3d924673e07 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/icon.png new file mode 100644 index 00000000000..b028f417cda Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/inhand-left.png new file mode 100644 index 00000000000..0e85dc1bdce Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/inhand-right.png new file mode 100644 index 00000000000..88f9e421f8b Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/meta.json new file mode 100644 index 00000000000..bee099c7415 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutlightmetal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from DesertRose https://github.com/DesertRose2/desertrose", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..90f8f638651 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/icon.png new file mode 100644 index 00000000000..739e0e826eb Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/inhand-left.png new file mode 100644 index 00000000000..51b08d95681 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/inhand-right.png new file mode 100644 index 00000000000..601da9f2073 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/meta.json new file mode 100644 index 00000000000..bee099c7415 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicecombat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from DesertRose https://github.com/DesertRose2/desertrose", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..8f3775fbadd Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/icon.png new file mode 100644 index 00000000000..b110b2ee3d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/inhand-left.png new file mode 100644 index 00000000000..51b08d95681 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/inhand-right.png new file mode 100644 index 00000000000..601da9f2073 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/meta.json new file mode 100644 index 00000000000..bee099c7415 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from DesertRose https://github.com/DesertRose2/desertrose", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..54b03f1a575 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/icon.png new file mode 100644 index 00000000000..efcb1a0dd20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/inhand-left.png new file mode 100644 index 00000000000..460c6a390a0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/inhand-right.png new file mode 100644 index 00000000000..5dd01519b34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/meta.json new file mode 100644 index 00000000000..bee099c7415 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutradarmor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from DesertRose https://github.com/DesertRose2/desertrose", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/equipped-OUTERCLOTHING.png index 01af67bd9e0..e437213dda2 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/icon.png index 216d4b676e6..d5938ae7014 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/icon.png and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercoat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d2eab462a23 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/icon.png new file mode 100644 index 00000000000..905fd8a5a6a Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/meta.json new file mode 100644 index 00000000000..a387f121b82 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangercombat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7aa7f8d00af Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/icon.png new file mode 100644 index 00000000000..7a8f44401bb Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/meta.json new file mode 100644 index 00000000000..a387f121b82 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerdesertcombat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..7e64c5b020f Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/icon.png new file mode 100644 index 00000000000..c2ba92a8cd9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/meta.json new file mode 100644 index 00000000000..a387f121b82 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerelite.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..808aed07681 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/icon.png new file mode 100644 index 00000000000..c7db6b46f06 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/meta.json new file mode 100644 index 00000000000..a387f121b82 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerfox.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..3257347c68f Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/icon.png new file mode 100644 index 00000000000..ecb981db440 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/meta.json new file mode 100644 index 00000000000..a387f121b82 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerspider.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangersuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangersuit.rsi/equipped-OUTERCLOTHING.png index a9689d80e96..dd646f7ffd6 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangersuit.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangersuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangervest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangervest.rsi/equipped-OUTERCLOTHING.png index c122f3999f9..dfac9e90aeb 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangervest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangervest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..681287d99a5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/icon.png new file mode 100644 index 00000000000..2b27851eb6c Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/meta.json new file mode 100644 index 00000000000..293ea56c0bd --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutrangerweathered.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": null, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..ec64fa8cb6d Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/icon.png new file mode 100644 index 00000000000..8762580ffb9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/inhand-left.png new file mode 100644 index 00000000000..51b08d95681 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/inhand-right.png new file mode 100644 index 00000000000..601da9f2073 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/meta.json new file mode 100644 index 00000000000..bee099c7415 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/falloutsheriffvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from DesertRose https://github.com/DesertRose2/desertrose", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/equipped-OUTERCLOTHING.png index 5909447c1e7..5d81e624edd 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/icon.png index 07a46b75d25..5017b0872d9 100644 Binary files a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/icon.png and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Armor/fallouttribal.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..263e50b848c Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/icon.png new file mode 100644 index 00000000000..a23ae65121a Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/meta.json new file mode 100644 index 00000000000..e8e4f65a235 --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/OuterClothing/Coats/falloutcombatduster.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..dcdd3acb819 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/icon.png new file mode 100644 index 00000000000..88288f3c237 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/meta.json new file mode 100644 index 00000000000..9d7a95894ce --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerblue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7f22cd2efe4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/icon.png new file mode 100644 index 00000000000..74c8470ffad Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/meta.json new file mode 100644 index 00000000000..9d7a95894ce --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangermodif.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a78a2a22b0f Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/icon.png new file mode 100644 index 00000000000..8f19bcf9bee Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/meta.json new file mode 100644 index 00000000000..9d7a95894ce --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerpatrol.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..65477dc3cb3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/icon.png new file mode 100644 index 00000000000..da697fd0a3a Binary files /dev/null and b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/meta.json new file mode 100644 index 00000000000..9d7a95894ce --- /dev/null +++ b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/rangerveteran.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BigIron github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/gammagulp.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/gammagulp.png new file mode 100644 index 00000000000..a0c24d2e74e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/gammagulp.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/meta.json new file mode 100644 index 00000000000..09887ca63e2 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by gary_mcgary for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "whisky" + }, + { + "name": "gammagulp" + }, + { + "name": "nappavalleywine" + }, + { + "name": "roentgen" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/nappavalleywine.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/nappavalleywine.png new file mode 100644 index 00000000000..787c499d91b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/nappavalleywine.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/roentgen.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/roentgen.png new file mode 100644 index 00000000000..2fdc6a49675 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/roentgen.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/whisky.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/whisky.png new file mode 100644 index 00000000000..e37b3c86091 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/alcohol.rsi/whisky.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/broken.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/broken.png new file mode 100644 index 00000000000..7c963a47adb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/broken.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/cherry.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/cherry.png new file mode 100644 index 00000000000..48813601036 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/cherry.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/cola.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/cola.png new file mode 100644 index 00000000000..25c061f0146 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/cola.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/empty.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/empty.png new file mode 100644 index 00000000000..65a132e2258 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/empty.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/grape.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/grape.png new file mode 100644 index 00000000000..e3a835399ef Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/grape.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/meta.json new file mode 100644 index 00000000000..1001cdf3d39 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by gary_mcgary for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wild" + }, + { + "name": "broken" + }, + { + "name": "cherry" + }, + { + "name": "cola" + }, + { + "name": "empty" + }, + { + "name": "grape" + }, + { + "name": "orange" + }, + { + "name": "piss" + }, + { + "name": "quantum" + }, + { + "name": "quartz" + }, + { + "name": "victory" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/orange.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/orange.png new file mode 100644 index 00000000000..865bce99135 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/orange.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/piss.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/piss.png new file mode 100644 index 00000000000..8eec70523fa Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/piss.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/quantum.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/quantum.png new file mode 100644 index 00000000000..cdda1e7ac0b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/quantum.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/quartz.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/quartz.png new file mode 100644 index 00000000000..66e9760e277 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/quartz.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/victory.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/victory.png new file mode 100644 index 00000000000..e3c5196ce1d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/victory.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/wild.png b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/wild.png new file mode 100644 index 00000000000..0ee1adeb8c8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Drinks/nuka_cola_new.rsi/wild.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/burnt-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/burnt-icon.png new file mode 100644 index 00000000000..f505337218e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK.png new file mode 100644 index 00000000000..3c5cad56f20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-icon.png new file mode 100644 index 00000000000..fbc6f033674 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..294f3267803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..3a4e9e8f9d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json new file mode 100644 index 00000000000..2f467ccaf4b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json @@ -0,0 +1,180 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "unlit-equipped-MASK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "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, + 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.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK.png new file mode 100644 index 00000000000..7524035609d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png new file mode 100644 index 00000000000..c7bc79f4d1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..e8bfce8645c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..4635cb206cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/burnt-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/burnt-icon.png new file mode 100644 index 00000000000..f505337218e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-equipped-MASK.png new file mode 100644 index 00000000000..3c5cad56f20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-icon.png new file mode 100644 index 00000000000..629bc3f21dd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..294f3267803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..3a4e9e8f9d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/meta.json new file mode 100644 index 00000000000..2f467ccaf4b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/meta.json @@ -0,0 +1,180 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "unlit-equipped-MASK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "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, + 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.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-equipped-MASK.png new file mode 100644 index 00000000000..7524035609d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-icon.png new file mode 100644 index 00000000000..8eff0628608 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..e8bfce8645c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..4635cb206cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/kool.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/burnt-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/burnt-icon.png new file mode 100644 index 00000000000..f505337218e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-equipped-MASK.png new file mode 100644 index 00000000000..3c5cad56f20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-icon.png new file mode 100644 index 00000000000..4b7ff1c8c6c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..294f3267803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..3a4e9e8f9d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/meta.json new file mode 100644 index 00000000000..2f467ccaf4b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/meta.json @@ -0,0 +1,180 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "unlit-equipped-MASK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "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, + 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.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-equipped-MASK.png new file mode 100644 index 00000000000..7524035609d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-icon.png new file mode 100644 index 00000000000..f3d5c03be84 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..e8bfce8645c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..4635cb206cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/marl.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/burnt-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/burnt-icon.png new file mode 100644 index 00000000000..f505337218e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-equipped-MASK.png new file mode 100644 index 00000000000..3c5cad56f20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-icon.png new file mode 100644 index 00000000000..4919d95fa15 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..294f3267803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..3a4e9e8f9d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/meta.json new file mode 100644 index 00000000000..2f467ccaf4b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/meta.json @@ -0,0 +1,180 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "unlit-equipped-MASK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "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, + 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.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-equipped-MASK.png new file mode 100644 index 00000000000..7524035609d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-icon.png new file mode 100644 index 00000000000..67e6deee675 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..e8bfce8645c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..4635cb206cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/republic.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/burnt-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/burnt-icon.png new file mode 100644 index 00000000000..f505337218e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-equipped-MASK.png new file mode 100644 index 00000000000..3c5cad56f20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-icon.png new file mode 100644 index 00000000000..43e0d3f2c2d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..294f3267803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..3a4e9e8f9d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/meta.json new file mode 100644 index 00000000000..2f467ccaf4b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/meta.json @@ -0,0 +1,180 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "unlit-equipped-MASK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "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, + 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.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-equipped-MASK.png new file mode 100644 index 00000000000..7524035609d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-icon.png new file mode 100644 index 00000000000..5924c40dee7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..e8bfce8645c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..4635cb206cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/burnt-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/burnt-icon.png new file mode 100644 index 00000000000..f505337218e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-equipped-MASK.png new file mode 100644 index 00000000000..3c5cad56f20 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-icon.png new file mode 100644 index 00000000000..21ad1ce3c53 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..294f3267803 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..3a4e9e8f9d2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/meta.json new file mode 100644 index 00000000000..2f467ccaf4b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/meta.json @@ -0,0 +1,180 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "unlit-equipped-MASK", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "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, + 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.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "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, + 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.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-equipped-MASK.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-equipped-MASK.png new file mode 100644 index 00000000000..7524035609d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-icon.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-icon.png new file mode 100644 index 00000000000..2160629e1a4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..e8bfce8645c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..4635cb206cd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Cigarettes/winston.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/closed.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/closed.png new file mode 100644 index 00000000000..5b62b053000 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/closed.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d536d2de933 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/inhand-left.png new file mode 100644 index 00000000000..00bc2d564bd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/inhand-right.png new file mode 100644 index 00000000000..954a5f299c9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/meta.json new file mode 100644 index 00000000000..16c6610ee22 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Closed and Open Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi, all other states by Peptide90", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/open.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/open.png new file mode 100644 index 00000000000..e0ef2c5215c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/trash.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/trash.png new file mode 100644 index 00000000000..32bec826061 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/custom.rsi/trash.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/closed.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/closed.png new file mode 100644 index 00000000000..6188e95ae71 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/closed.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d49b6f112c0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/inhand-left.png new file mode 100644 index 00000000000..27f428832ad Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/inhand-right.png new file mode 100644 index 00000000000..c4007a33551 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/meta.json new file mode 100644 index 00000000000..d304c6d040a --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/open.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/open.png new file mode 100644 index 00000000000..fb75247a95a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/trash.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/trash.png new file mode 100644 index 00000000000..65470ecb3f4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/kool.rsi/trash.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/closed.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/closed.png new file mode 100644 index 00000000000..7c8d17e8ad0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/closed.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d49b6f112c0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/inhand-left.png new file mode 100644 index 00000000000..683e37bb459 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/inhand-right.png new file mode 100644 index 00000000000..57468a3b1b5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/meta.json new file mode 100644 index 00000000000..d304c6d040a --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/open.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/open.png new file mode 100644 index 00000000000..e4b2f096508 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/trash.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/trash.png new file mode 100644 index 00000000000..d3ded3558d0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/marlboro.rsi/trash.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/meta.json new file mode 100644 index 00000000000..8f3e462201c --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "overlay_lucky" + }, + { + "name": "overlay_cig_8" + }, + { + "name": "overlay_cig_7" + }, + { + "name": "overlay_cig_6" + }, + { + "name": "overlay_cig_5" + }, + { + "name": "overlay_cig_4" + }, + { + "name": "overlay_cig_3" + }, + { + "name": "overlay_cig_2" + }, + { + "name": "overlay_cig_1" + }, + { + "name": "overlay_cig_0" + }, + { + "name": "overlay_rolled_8" + }, + { + "name": "overlay_rolled_7" + }, + { + "name": "overlay_rolled_6" + }, + { + "name": "overlay_rolled_5" + }, + { + "name": "overlay_rolled_4" + }, + { + "name": "overlay_rolled_3" + }, + { + "name": "overlay_rolled_2" + }, + { + "name": "overlay_rolled_1" + }, + { + "name": "overlay_rolled_0" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_0.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_0.png new file mode 100644 index 00000000000..06aaaa93284 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_1.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_1.png new file mode 100644 index 00000000000..36e8648bd38 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_2.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_2.png new file mode 100644 index 00000000000..a9096d8f93b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_3.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_3.png new file mode 100644 index 00000000000..51d7253d3e8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_4.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_4.png new file mode 100644 index 00000000000..f401ae6d91a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_5.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_5.png new file mode 100644 index 00000000000..7cf56ac1824 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_6.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_6.png new file mode 100644 index 00000000000..873d82f18c9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_7.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_7.png new file mode 100644 index 00000000000..7ddc41e648a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_7.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_8.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_8.png new file mode 100644 index 00000000000..cbf998837a8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_cig_8.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_lucky.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_lucky.png new file mode 100644 index 00000000000..f2fd3ea698f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_lucky.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_0.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_0.png new file mode 100644 index 00000000000..35f10564434 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_1.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_1.png new file mode 100644 index 00000000000..83c43e538fa Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_2.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_2.png new file mode 100644 index 00000000000..87cf207893b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_3.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_3.png new file mode 100644 index 00000000000..cef4c5ec4b4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_4.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_4.png new file mode 100644 index 00000000000..025d30dc2c4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_5.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_5.png new file mode 100644 index 00000000000..a5d31f75bbc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_6.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_6.png new file mode 100644 index 00000000000..925f6a151de Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_7.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_7.png new file mode 100644 index 00000000000..5d582cc7eba Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_7.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_8.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_8.png new file mode 100644 index 00000000000..cf41e4e03bc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/overlays.rsi/overlay_rolled_8.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/closed.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/closed.png new file mode 100644 index 00000000000..0971764a9a6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/closed.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d536d2de933 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/inhand-left.png new file mode 100644 index 00000000000..ce8915cae95 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/inhand-right.png new file mode 100644 index 00000000000..fcf198ba520 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/meta.json new file mode 100644 index 00000000000..16c6610ee22 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Closed and Open Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi, all other states by Peptide90", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/open.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/open.png new file mode 100644 index 00000000000..cc44070a563 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/trash.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/trash.png new file mode 100644 index 00000000000..e036c21cb67 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi/trash.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/closed.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/closed.png new file mode 100644 index 00000000000..4e112cdaf93 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/closed.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d49b6f112c0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/inhand-left.png new file mode 100644 index 00000000000..27f428832ad Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/inhand-right.png new file mode 100644 index 00000000000..c4007a33551 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/meta.json new file mode 100644 index 00000000000..d304c6d040a --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/open.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/open.png new file mode 100644 index 00000000000..2aeb7b3e085 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/trash.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/trash.png new file mode 100644 index 00000000000..65470ecb3f4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/salem.rsi/trash.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/closed.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/closed.png new file mode 100644 index 00000000000..03d5222ed3b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/closed.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d49b6f112c0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/inhand-left.png new file mode 100644 index 00000000000..683e37bb459 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/inhand-right.png new file mode 100644 index 00000000000..57468a3b1b5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/meta.json new file mode 100644 index 00000000000..d304c6d040a --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad/mojave/icons/objects/smokeables/smokeables_inventory.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/open.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/open.png new file mode 100644 index 00000000000..30888ba4452 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/trash.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/trash.png new file mode 100644 index 00000000000..d3ded3558d0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/Packs/winston.rsi/trash.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/brocflower_dried_1.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/brocflower_dried_1.png new file mode 100644 index 00000000000..60d390fd348 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/brocflower_dried_1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/brocflower_dried_2.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/brocflower_dried_2.png new file mode 100644 index 00000000000..8ac2d68dea6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/brocflower_dried_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/cut_xander_dried_1.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/cut_xander_dried_1.png new file mode 100644 index 00000000000..f273e428645 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/cut_xander_dried_1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/cut_xander_dried_2.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/cut_xander_dried_2.png new file mode 100644 index 00000000000..0134f3cea0f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/cut_xander_dried_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/meta.json new file mode 100644 index 00000000000..680c614dce1 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/44c55f5fb654c42b9de4c6d9c2329500446b05ad", + "size": { + "x": 40, + "y": 32 + }, + "states": [ + { + "name": "tobacco_dried_2" + }, + { + "name": "brocflower_dried_1" + }, + { + "name": "brocflower_dried_2" + }, + { + "name": "cut_xander_dried_1" + }, + { + "name": "cut_xander_dried_2" + }, + { + "name": "rollie_paper" + }, + { + "name": "tobacco_dried_1" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/rollie_paper.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/rollie_paper.png new file mode 100644 index 00000000000..62a5fe80ed4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/rollie_paper.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/tobacco_dried_1.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/tobacco_dried_1.png new file mode 100644 index 00000000000..aba75c11088 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/tobacco_dried_1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/tobacco_dried_2.png b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/tobacco_dried_2.png new file mode 100644 index 00000000000..0f3465a10e3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Consumable/Smokeables/smokeables.rsi/tobacco_dried_2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole.png new file mode 100644 index 00000000000..55fe3307c1c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_legion.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_legion.png new file mode 100644 index 00000000000..4062e38e866 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_legion.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_ncr.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_ncr.png new file mode 100644 index 00000000000..1bda12020ae Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_ncr.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_usa.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_usa.png new file mode 100644 index 00000000000..943b20dbed8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/flagpole_usa.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/lamp-on.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/lamp-on.png new file mode 100644 index 00000000000..a1c53c78db2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/lamp-on.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/lamp.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/lamp.png new file mode 100644 index 00000000000..c074adf0b43 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/lamp.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/map.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/map.png new file mode 100644 index 00000000000..545e39bb3d5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/map.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/meta.json new file mode 100644 index 00000000000..103372b6782 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/meta.json @@ -0,0 +1,93 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/8d1f05764a2c6444c84f01b13c6499e1850e1ad6/mojave/icons/objects/clutter/clutter_inventory.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "flagpole" + }, + { + "name": "flagpole_legion" + }, + { + "name": "flagpole_usa" + }, + { + "name": "flagpole_ncr" + }, + { + "name": "rug" + }, + { + "name": "rug_rubber" + }, + { + "name": "lamp" + }, + { + "name": "lamp-on" + }, + { + "name": "map" + }, + { + "name": "trifold" + }, + { + "name": "paper" + }, + { + "name": "paper_words" + }, + { + "name": "paperplane_onfire_overlay", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "paper_bin0" + }, + { + "name": "paper_bin1" + }, + { + "name": "paperslip" + }, + { + "name": "paperslip_words" + }, + { + "name": "paper_stamp-ok" + }, + { + "name": "paper_stamp-deny" + }, + { + "name": "pen" + }, + { + "name": "pencil" + }, + { + "name": "pen-fountain" + }, + { + "name": "stamp-deny" + }, + { + "name": "stamp-ok" + }, + { + "name": "papercutter" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper.png new file mode 100644 index 00000000000..1b65acc9d5e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_bin0.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_bin0.png new file mode 100644 index 00000000000..35ffa4cf850 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_bin0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_bin1.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_bin1.png new file mode 100644 index 00000000000..a48aa053bb8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_bin1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_stamp-deny.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_stamp-deny.png new file mode 100644 index 00000000000..2f89c09f4a7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_stamp-deny.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_stamp-ok.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_stamp-ok.png new file mode 100644 index 00000000000..f2f6b53e43a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_stamp-ok.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_words.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_words.png new file mode 100644 index 00000000000..b3006cac3e6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paper_words.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/papercutter.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/papercutter.png new file mode 100644 index 00000000000..dec511682e1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/papercutter.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperplane_onfire_overlay.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperplane_onfire_overlay.png new file mode 100644 index 00000000000..85ab1e660c5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperplane_onfire_overlay.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperslip.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperslip.png new file mode 100644 index 00000000000..31e8a1e1f34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperslip.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperslip_words.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperslip_words.png new file mode 100644 index 00000000000..9bc8efa5736 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/paperslip_words.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pen-fountain.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pen-fountain.png new file mode 100644 index 00000000000..3d55513e43c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pen-fountain.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pen.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pen.png new file mode 100644 index 00000000000..3f2fd2e8dbe Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pen.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pencil.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pencil.png new file mode 100644 index 00000000000..4edf2eeb8dd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/pencil.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/rug.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/rug.png new file mode 100644 index 00000000000..204c3479380 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/rug.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/rug_rubber.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/rug_rubber.png new file mode 100644 index 00000000000..15df9b5c698 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/rug_rubber.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/stamp-deny.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/stamp-deny.png new file mode 100644 index 00000000000..5c2049573d7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/stamp-deny.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/stamp-ok.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/stamp-ok.png new file mode 100644 index 00000000000..c927550f89e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/stamp-ok.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/trifold.png b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/trifold.png new file mode 100644 index 00000000000..43ef5a20645 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/clutter.rsi/trifold.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/meta.json index f9fece06902..9678a7bce57 100644 --- a/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/aca39d820a24b8f3ca4850d49ba263f40f6a4a96", + "copyright": "Taken from MS13 at commit https://github.com/Mojave-Sun/mojave-sun-13/commit/aca39d820a24b8f3ca4850d49ba263f40f6a4a96, moneybag and moneypouch from Nukapop13, see storage.rsi", "size": { "x": 32, "y": 32 @@ -66,6 +66,12 @@ }, { "name": "caps3" + }, + { + "name": "moneypouch" + }, + { + "name": "moneybag" } ] } \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/moneybag.png b/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/moneybag.png new file mode 100644 index 00000000000..d0348b5f585 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/moneybag.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/moneypouch.png b/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/moneypouch.png new file mode 100644 index 00000000000..f71e71f21e9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/currency.rsi/moneypouch.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/fuel-rusty.png b/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/fuel-rusty.png new file mode 100644 index 00000000000..0e7f132a2ec Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/fuel-rusty.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/fuel.png b/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/fuel.png new file mode 100644 index 00000000000..f8fa46dcc04 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/fuel.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/meta.json new file mode 100644 index 00000000000..12473b1b34e --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Misc/handyfuel.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by gary_mcgary for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fuel-rusty" + }, + { + "name": "fuel" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_yaoguai.png similarity index 100% rename from Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/skin_human.png rename to Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/hide_yaoguai.png diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json index 68c262a3241..83d3c94862e 100644 --- a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/meta.json @@ -26,7 +26,7 @@ "name": "hide_deathclaw" }, { - "name": "skin_human" + "name": "hide_yaoguai" }, { "name": "skin_human_2" @@ -34,6 +34,9 @@ { "name": "skin_human_3" }, + { + "name": "rad_exo" + }, { "name": "chitin" }, diff --git a/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/rad_exo.png b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/rad_exo.png new file mode 100644 index 00000000000..1282f44143c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Misc/mob_drops.rsi/rad_exo.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json index 821870bf819..f27f90d92cc 100644 --- a/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/meta.json @@ -69,6 +69,12 @@ }, { "name": "medx0" + }, + { + "name": "smellingsalts" + }, + { + "name": "smellingsalts0" } ] } \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/smellingsalts.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/smellingsalts.png new file mode 100644 index 00000000000..8defaa82f62 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/smellingsalts.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/smellingsalts0.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/smellingsalts0.png new file mode 100644 index 00000000000..8121d8c2db3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/drugs.rsi/smellingsalts0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid.png new file mode 100644 index 00000000000..e388b36daa9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_both.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_both.png new file mode 100644 index 00000000000..20915991073 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_both.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_brute.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_brute.png new file mode 100644 index 00000000000..2bbb543cd9d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_brute.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_burn.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_burn.png new file mode 100644 index 00000000000..b2e60e25ed7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bandaid_burn.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beaker.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beaker.png new file mode 100644 index 00000000000..b600b54922f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beaker.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakergold.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakergold.png new file mode 100644 index 00000000000..a460de93df0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakergold.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakerlarge.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakerlarge.png new file mode 100644 index 00000000000..09bba217b2b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakerlarge.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakerwhite.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakerwhite.png new file mode 100644 index 00000000000..317268b985e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/beakerwhite.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle.png new file mode 100644 index 00000000000..64bda7e37de Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle1.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle1.png new file mode 100644 index 00000000000..ad23632aff7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle10.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle10.png new file mode 100644 index 00000000000..1f47e62be18 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle10.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle11.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle11.png new file mode 100644 index 00000000000..da80a40449f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle11.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle12.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle12.png new file mode 100644 index 00000000000..69c43b7e4c1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle12.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle13.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle13.png new file mode 100644 index 00000000000..926a572413e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle13.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle14.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle14.png new file mode 100644 index 00000000000..0fb604ddb0e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle14.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle15.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle15.png new file mode 100644 index 00000000000..141156641ee Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle15.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle16.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle16.png new file mode 100644 index 00000000000..002e72bfa1f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle16.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle17.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle17.png new file mode 100644 index 00000000000..a5137a24132 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle17.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle18.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle18.png new file mode 100644 index 00000000000..6e74448b167 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle18.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle19.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle19.png new file mode 100644 index 00000000000..131487b5636 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle19.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle2.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle2.png new file mode 100644 index 00000000000..1669894ef81 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle20.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle20.png new file mode 100644 index 00000000000..06cd2575fbf Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle20.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle3.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle3.png new file mode 100644 index 00000000000..e74df3cb083 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle4.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle4.png new file mode 100644 index 00000000000..219a81b1de8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle5.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle5.png new file mode 100644 index 00000000000..26ceb23c56c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle6.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle6.png new file mode 100644 index 00000000000..8647d1556ba Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle7.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle7.png new file mode 100644 index 00000000000..da506f65e03 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle7.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle8.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle8.png new file mode 100644 index 00000000000..e594c19dc59 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle8.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle9.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle9.png new file mode 100644 index 00000000000..7184ef3be7c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/bottle9.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/brutegel.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/brutegel.png new file mode 100644 index 00000000000..95e57993ec4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/brutegel.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/burngel.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/burngel.png new file mode 100644 index 00000000000..fcfdbe982bf Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/burngel.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/chempuff.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/chempuff.png new file mode 100644 index 00000000000..4a524642da0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/chempuff.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/dropper0.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/dropper0.png new file mode 100644 index 00000000000..4a9e9f35322 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/dropper0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/liquid.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/liquid.png new file mode 100644 index 00000000000..7d4d1928f88 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/liquid.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_blue.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_blue.png new file mode 100644 index 00000000000..8241de65357 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_blue.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_cyan.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_cyan.png new file mode 100644 index 00000000000..2378ca60183 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_cyan.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_green.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_green.png new file mode 100644 index 00000000000..6022aa12d35 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_green.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_orange.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_orange.png new file mode 100644 index 00000000000..9ebe06c66c2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_orange.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_purple.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_purple.png new file mode 100644 index 00000000000..be1b546ea49 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_purple.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_red.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_red.png new file mode 100644 index 00000000000..450942acc13 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/medigel_red.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/meta.json new file mode 100644 index 00000000000..a404d082e3f --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/meta.json @@ -0,0 +1,322 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from mojave-sun-13 at https://github.com/Mojave-Sun/mojave-sun-13/blob/326db99eb59c57ec41120acdffd5db30e44de51e/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bottle" + }, + { + "name": "beaker" + }, + { + "name": "beakerlarge" + }, + { + "name": "beakerwhite" + }, + { + "name": "beakergold" + }, + { + "name": "pill" + }, + { + "name": "pill1" + }, + { + "name": "pill2" + }, + { + "name": "pill3" + }, + { + "name": "pill4" + }, + { + "name": "pill5" + }, + { + "name": "pill6" + }, + { + "name": "pill7" + }, + { + "name": "pill8" + }, + { + "name": "pill9" + }, + { + "name": "pill10" + }, + { + "name": "pill11" + }, + { + "name": "pill12" + }, + { + "name": "pill13" + }, + { + "name": "pill14" + }, + { + "name": "pill15" + }, + { + "name": "pill16" + }, + { + "name": "pill17" + }, + { + "name": "pill18" + }, + { + "name": "pill19" + }, + { + "name": "pill20" + }, + { + "name": "pill21" + }, + { + "name": "pill0" + }, + { + "name": "pill22" + }, + { + "name": "pill_syndie" + }, + { + "name": "pill_happy" + }, + { + "name": "bottle1" + }, + { + "name": "bottle2" + }, + { + "name": "bottle3" + }, + { + "name": "bottle4" + }, + { + "name": "bottle5" + }, + { + "name": "bottle6" + }, + { + "name": "bottle7" + }, + { + "name": "bottle8" + }, + { + "name": "bottle9" + }, + { + "name": "bottle10" + }, + { + "name": "bottle11" + }, + { + "name": "bottle12" + }, + { + "name": "bottle13" + }, + { + "name": "bottle14" + }, + { + "name": "bottle15" + }, + { + "name": "bottle16" + }, + { + "name": "bottle17" + }, + { + "name": "bottle18" + }, + { + "name": "bottle19" + }, + { + "name": "bottle20" + }, + { + "name": "pill_canister" + }, + { + "name": "solid" + }, + { + "name": "liquid" + }, + { + "name": "vapour" + }, + { + "name": "mixer0b" + }, + { + "name": "mixer1b" + }, + { + "name": "vial0" + }, + { + "name": "vial1" + }, + { + "name": "vial-blue" + }, + { + "name": "vial-green" + }, + { + "name": "dropper0" + }, + { + "name": "chempuff", + "directions": 4, + "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 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "weedpuff", + "directions": 4, + "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 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "waitlight" + }, + { + "name": "bandaid" + }, + { + "name": "bandaid_brute" + }, + { + "name": "bandaid_burn" + }, + { + "name": "bandaid_both" + }, + { + "name": "brutegel" + }, + { + "name": "burngel" + }, + { + "name": "synthgel" + }, + { + "name": "pestle" + }, + { + "name": "mortar" + }, + { + "name": "sprayer_med_red" + }, + { + "name": "sprayer_med_yellow" + }, + { + "name": "sprayer_med_blue" + }, + { + "name": "medigel_blue" + }, + { + "name": "medigel_cyan" + }, + { + "name": "medigel_green" + }, + { + "name": "medigel_red" + }, + { + "name": "medigel_orange" + }, + { + "name": "medigel_purple" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mixer0b.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mixer0b.png new file mode 100644 index 00000000000..d633eca2b34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mixer0b.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mixer1b.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mixer1b.png new file mode 100644 index 00000000000..5c7d037196c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mixer1b.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mortar.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mortar.png new file mode 100644 index 00000000000..bed02ae3ab9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/mortar.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pestle.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pestle.png new file mode 100644 index 00000000000..1f997307ec0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pestle.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill.png new file mode 100644 index 00000000000..2d26f84a00c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill0.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill0.png new file mode 100644 index 00000000000..584b83ee538 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill1.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill1.png new file mode 100644 index 00000000000..2d26f84a00c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill10.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill10.png new file mode 100644 index 00000000000..cb0dc48cff4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill10.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill11.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill11.png new file mode 100644 index 00000000000..9456b654354 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill11.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill12.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill12.png new file mode 100644 index 00000000000..d2b7d81bf41 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill12.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill13.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill13.png new file mode 100644 index 00000000000..9d0d1ae8a2d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill13.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill14.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill14.png new file mode 100644 index 00000000000..500899624a3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill14.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill15.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill15.png new file mode 100644 index 00000000000..65766440c6b Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill15.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill16.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill16.png new file mode 100644 index 00000000000..be6f784bf17 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill16.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill17.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill17.png new file mode 100644 index 00000000000..aca324ffb1f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill17.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill18.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill18.png new file mode 100644 index 00000000000..584b83ee538 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill18.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill19.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill19.png new file mode 100644 index 00000000000..8b7a2e0cf82 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill19.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill2.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill2.png new file mode 100644 index 00000000000..fbd5affdcf6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill20.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill20.png new file mode 100644 index 00000000000..fddb5206fcd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill20.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill21.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill21.png new file mode 100644 index 00000000000..c0bc33c2963 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill21.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill22.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill22.png new file mode 100644 index 00000000000..9864393da61 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill22.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill3.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill3.png new file mode 100644 index 00000000000..4aba5a4f1c4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill4.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill4.png new file mode 100644 index 00000000000..2e280fcd081 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill5.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill5.png new file mode 100644 index 00000000000..a975c7985f7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill6.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill6.png new file mode 100644 index 00000000000..abea862a634 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill7.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill7.png new file mode 100644 index 00000000000..667a88f42f5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill7.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill8.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill8.png new file mode 100644 index 00000000000..e47ed068bcc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill8.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill9.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill9.png new file mode 100644 index 00000000000..e8ee134b152 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill9.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_canister.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_canister.png new file mode 100644 index 00000000000..708cc1299ba Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_canister.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_happy.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_happy.png new file mode 100644 index 00000000000..4b80b293b93 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_happy.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_syndie.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_syndie.png new file mode 100644 index 00000000000..edb1ff1ed93 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/pill_syndie.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/solid.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/solid.png new file mode 100644 index 00000000000..2422b86f450 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/solid.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_blue.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_blue.png new file mode 100644 index 00000000000..b705ed727aa Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_blue.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_red.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_red.png new file mode 100644 index 00000000000..727cbe83565 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_red.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_yellow.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_yellow.png new file mode 100644 index 00000000000..266d2589ba0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/sprayer_med_yellow.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/synthgel.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/synthgel.png new file mode 100644 index 00000000000..6cdef789678 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/synthgel.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vapour.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vapour.png new file mode 100644 index 00000000000..609df538127 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vapour.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial-blue.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial-blue.png new file mode 100644 index 00000000000..458fea073d3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial-blue.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial-green.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial-green.png new file mode 100644 index 00000000000..d3652c607b5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial-green.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial0.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial0.png new file mode 100644 index 00000000000..18ab8931c36 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial0.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial1.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial1.png new file mode 100644 index 00000000000..458fea073d3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/vial1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/waitlight.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/waitlight.png new file mode 100644 index 00000000000..f7d93f793e9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/waitlight.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/weedpuff.png b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/weedpuff.png new file mode 100644 index 00000000000..814a3487c99 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Specific/Medical/ss13_chemical.rsi/weedpuff.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi/base.png new file mode 100644 index 00000000000..fd7b7f2799e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi/meta.json new file mode 100644 index 00000000000..c06f0a92adf --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Boxes/45-70.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by patogrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-1.png new file mode 100644 index 00000000000..de7dac54343 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-2.png new file mode 100644 index 00000000000..85c6221363a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-3.png new file mode 100644 index 00000000000..ee32e9d5c68 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-4.png new file mode 100644 index 00000000000..d9ecf699fb0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-5.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-5.png new file mode 100644 index 00000000000..301667d85c2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-6.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-6.png new file mode 100644 index 00000000000..da466176e34 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base-6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base.png new file mode 100644 index 00000000000..38e951172dc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/icon.png new file mode 100644 index 00000000000..ac1e5ab1c81 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/meta.json new file mode 100644 index 00000000000..6e590a48822 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/10mmloader.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-1.png new file mode 100644 index 00000000000..ef50f43b8c9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-2.png new file mode 100644 index 00000000000..f78202f7092 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-3.png new file mode 100644 index 00000000000..8deadee7b60 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-4.png new file mode 100644 index 00000000000..b34aee55dea Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-5.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-5.png new file mode 100644 index 00000000000..0738652b96d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-6.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-6.png new file mode 100644 index 00000000000..07340e0cc64 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base-6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base.png new file mode 100644 index 00000000000..f0c8c69b409 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/icon.png new file mode 100644 index 00000000000..e06ed609071 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/meta.json new file mode 100644 index 00000000000..6e590a48822 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/44loader.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-1.png new file mode 100644 index 00000000000..522ae9c6e68 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-2.png new file mode 100644 index 00000000000..9c56b35fb27 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-3.png new file mode 100644 index 00000000000..053e1c661ce Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-4.png new file mode 100644 index 00000000000..0b6f383ca38 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-5.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-5.png new file mode 100644 index 00000000000..5dd2df64235 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-6.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-6.png new file mode 100644 index 00000000000..87162f412ea Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base-6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base.png new file mode 100644 index 00000000000..d0ca8f87b8d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/icon.png new file mode 100644 index 00000000000..c55063b6512 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/meta.json new file mode 100644 index 00000000000..6e590a48822 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/45_70loader.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-1.png new file mode 100644 index 00000000000..d59f4f4ea1a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-2.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-2.png new file mode 100644 index 00000000000..959132ae31c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-2.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-3.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-3.png new file mode 100644 index 00000000000..46bc9b5f47d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-3.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-4.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-4.png new file mode 100644 index 00000000000..25a8654aa6c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-4.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-5.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-5.png new file mode 100644 index 00000000000..26d7ce55b2f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-5.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-6.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-6.png new file mode 100644 index 00000000000..f11868f8c7c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base-6.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base.png new file mode 100644 index 00000000000..eeef100e7b1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/icon.png new file mode 100644 index 00000000000..b2247061797 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/meta.json new file mode 100644 index 00000000000..6e590a48822 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Ammunition/Speedloaders/9mmloader.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-BACKPACK.png index f5a20800ab4..a7226770366 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..a7226770366 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/meta.json index 845772aae38..b037741a72b 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/autorifle.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-BACKPACK.png index 0446ce27729..301622594a4 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..301622594a4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/meta.json index 845772aae38..b037741a72b 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/LMGs/lmg.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/base.png new file mode 100644 index 00000000000..9d100a018e0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/bolt-open.png new file mode 100644 index 00000000000..9d100a018e0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ed27af7defb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/icon.png new file mode 100644 index 00000000000..9d100a018e0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/inhand-left.png new file mode 100644 index 00000000000..459cd70f991 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/inhand-right.png new file mode 100644 index 00000000000..4fe5c7bb63f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/meta.json new file mode 100644 index 00000000000..80656f43403 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/10mmrevolver.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/base.png index c7df2ea9d42..babbc9791bc 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/base.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/bolt-open.png index 3d4891d5345..babbc9791bc 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/bolt-open.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/icon.png index c7df2ea9d42..babbc9791bc 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/icon.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-left.png index def85defae4..d0f4444ed13 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-right.png index 2aa960b9497..e4d2c49cc30 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/hunt_revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/base.png new file mode 100644 index 00000000000..ad40ac860f4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/bolt-open.png new file mode 100644 index 00000000000..ad40ac860f4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ed27af7defb Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/icon.png new file mode 100644 index 00000000000..ad40ac860f4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/inhand-left.png new file mode 100644 index 00000000000..00acf5742a4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/inhand-right.png new file mode 100644 index 00000000000..a7ff4d441c4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/meta.json new file mode 100644 index 00000000000..80656f43403 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/ranger_sequoia.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png index 5671ea337e9..04d9077be0a 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..04d9077be0a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json index 845772aae38..98879fb90c1 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-BACKPACK.png index 5671ea337e9..f50bf4b9ccc 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f50bf4b9ccc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/meta.json index 573b3137e79..fb4bb75f1ac 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/battlerifle.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png index 5671ea337e9..606b124aab0 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..606b124aab0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index 573b3137e79..fb4bb75f1ac 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-BACKPACK.png index 8606d478603..df012c1cbfe 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..df012c1cbfe Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json index 845772aae38..98879fb90c1 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-BACKPACK.png index e667ac68779..4fb7eec267e 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..4fb7eec267e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json index 44184a28a6f..a108190504f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png index 28883c06588..517cf7286a0 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..517cf7286a0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json index f234f886fee..ee8054a7b1f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-BACKPACK.png index 30b20b64d96..829d53eec85 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-BACKPACK.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..829d53eec85 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json index 845772aae38..98879fb90c1 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Rifles/servicerifle.rsi/meta.json @@ -38,6 +38,10 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5b6cadf7875 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..5b6cadf7875 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json index 8fa69134340..3af1ebbf250 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..b3189a0f300 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..b3189a0f300 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json index 1f00eadf458..b8ad7ac2d14 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/10mmSMG.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..7880d1b23aa Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..7880d1b23aa Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json index 8fa69134340..3af1ebbf250 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..b3189a0f300 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..b3189a0f300 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json index cb26b44b9ab..d4dde4a407f 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/12mmSMG.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f6acb8859c2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f6acb8859c2 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/meta.json index 1f00eadf458..b8ad7ac2d14 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/45SMG.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..fdd3c08fe47 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..fdd3c08fe47 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/meta.json index 1f00eadf458..b8ad7ac2d14 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/9mmSMG.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5962e6b349c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..5962e6b349c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json index 387cb77287b..e5b6d5a39c6 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/SMGs/advance12mm.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..d360c69ca87 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..d360c69ca87 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json index da5c0f8502f..cf3ff7abbab 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/caravan_shotgun.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..3887da93e2a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..3887da93e2a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json index eb37d9c72e7..dbb405c2d95 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/combat_shotgun.rsi/meta.json @@ -34,6 +34,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5145e9f38e1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..5145e9f38e1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json index b346585e857..03a68bf883a 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/double_shotgun.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..a3298420b6c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..a3298420b6c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json index da1a03d8cc5..0997cf6f1cd 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/lever_shotgun.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..e296dc74c7e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..e296dc74c7e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index b346585e857..03a68bf883a 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ec1f80a83ef Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ec1f80a83ef Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json index e70d1b35784..6ba4320a04c 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi/meta.json @@ -31,6 +31,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/base.png new file mode 100644 index 00000000000..1ca1df80c96 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/bolt-open.png new file mode 100644 index 00000000000..1ca1df80c96 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f0060e293f0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f0060e293f0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/inhand-left.png new file mode 100644 index 00000000000..71d97f1fdf3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/inhand-right.png new file mode 100644 index 00000000000..0d376ecb8ad Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/meta.json new file mode 100644 index 00000000000..dd95e9b6843 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..f6e286a47a1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..aa440bf7e5f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/50ncrrifle.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..fccf4be59a9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..fccf4be59a9 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json index 358d5416b0b..dd95e9b6843 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/antimateriel.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/base.png new file mode 100644 index 00000000000..3b60554a153 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/bolt-open.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/bolt-open.png new file mode 100644 index 00000000000..f9c8ec2b7ac Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..d25cea021b6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..d25cea021b6 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/inhand-left.png new file mode 100644 index 00000000000..1d27b89986d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/inhand-right.png new file mode 100644 index 00000000000..62c4840494d Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/meta.json new file mode 100644 index 00000000000..dd95e9b6843 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..499602dbbe8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..f81c3098636 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/brushgun.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..5a41dfa4f71 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..5a41dfa4f71 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json index b2d629d84a0..0621c947111 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/hunting.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..aab1bf8e39c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..aab1bf8e39c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json index 358d5416b0b..dd95e9b6843 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/levercarbine.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..e3acafd2778 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..e3acafd2778 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json index 358d5416b0b..dd95e9b6843 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/leverrifle.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..9e8d5339bb7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..9e8d5339bb7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json index 358d5416b0b..dd95e9b6843 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ee361e1956a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..ee361e1956a Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/meta.json index b2d629d84a0..0621c947111 100644 --- a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/meta.json +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi/meta.json @@ -28,6 +28,14 @@ { "name": "wielded-inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..cb8ff3d7441 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/inhand-left.png new file mode 100644 index 00000000000..5b71cd30432 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/inhand-right.png new file mode 100644 index 00000000000..10de3c64e12 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/meta.json new file mode 100644 index 00000000000..4af5c5b2cf1 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/spear.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/spear.png new file mode 100644 index 00000000000..e6edc3eabc4 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/spear.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/spear1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/spear1.png new file mode 100644 index 00000000000..d9e1099d29f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/javelin.rsi/spear1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/equipped-BELT.png new file mode 100644 index 00000000000..dbd600edbb0 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/icon.png new file mode 100644 index 00000000000..ff0c11a9279 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/inhand-left.png new file mode 100644 index 00000000000..0460b1f467e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/inhand-right.png new file mode 100644 index 00000000000..2ea28f11a03 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/meta.json new file mode 100644 index 00000000000..5dabeba2508 --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/policebaton.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by PatoGrone for N14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png index 2b53f220e87..88a85ead776 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png index 9478cb69ada..3a287ea4c44 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/ripper.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-left-blade.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-left-blade.png new file mode 100644 index 00000000000..311988590bc Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-left-blade.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-left.png new file mode 100644 index 00000000000..867e3f99c75 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-right-blade.png new file mode 100644 index 00000000000..473ce47602c Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-right-blade.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-right.png new file mode 100644 index 00000000000..11ba473b6c1 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/base.png new file mode 100644 index 00000000000..b417da70419 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/base.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/baton.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/baton.png new file mode 100644 index 00000000000..6517318b4dd Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/baton.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/icon.png new file mode 100644 index 00000000000..4e5980394e3 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/secbaton.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-left.png index bd5013a9696..296907138b3 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-left.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-right.png index 17e5b898617..817362c6ab9 100644 Binary files a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-right.png and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/icon.png new file mode 100644 index 00000000000..ee3eacaec06 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/inhand-left.png new file mode 100644 index 00000000000..4d6d36377d5 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/inhand-right.png new file mode 100644 index 00000000000..9507fdf51b8 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/meta.json new file mode 100644 index 00000000000..c2afa70db0b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalhatchet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/equipped-BELT.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/equipped-BELT.png new file mode 100644 index 00000000000..288f9fbce59 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/icon.png new file mode 100644 index 00000000000..8d873af5f1f Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/icon.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/inhand-left.png new file mode 100644 index 00000000000..b2f253c30b7 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/inhand-right.png new file mode 100644 index 00000000000..ac3aec22479 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/meta.json new file mode 100644 index 00000000000..08894a12a7b --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalknife.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/pull/378/commits/9e081bd2a0d7614be5a9dabbca34886ce204105d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/equipped-BACKPACK.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..cb8ff3d7441 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/inhand-left.png new file mode 100644 index 00000000000..b9f48a8c105 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/inhand-right.png new file mode 100644 index 00000000000..03643d4a028 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/inhand-right.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/meta.json new file mode 100644 index 00000000000..49209bf2dcd --- /dev/null +++ b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/spear.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/spear.png new file mode 100644 index 00000000000..ee965718a9e Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/spear.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/spear1.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/spear1.png new file mode 100644 index 00000000000..2fcf0ea5365 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/spear1.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/wielded-inhand-left.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..99771f9b959 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/wielded-inhand-right.png b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..cc70e34e704 Binary files /dev/null and b/Resources/Textures/Nuclear14/Objects/Weapons/Melee/tribalspear.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png index a6e953c7072..d08d7937a0a 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth.png and b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png index cbaaa6cd7a0..de87e90ca80 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png and b/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png index 5d2db38b704..adc22f1fb44 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png and b/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png index 59940f44ca4..24a7e64da42 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png and b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png index 2132190ad45..594638d00ea 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png and b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_on.png differ