diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl new file mode 100644 index 00000000000..b1d21ec4c1f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Materials/shards.ftl @@ -0,0 +1,5 @@ +ent-ADTShardGlassReinforcedPlasma = осколок закалённого плазменного стекла + .desc = Небольшой осколок плазменного стекла. + +ent-ADTShardGlassReinforcedUran = осколок закалённого уранового стекла + .desc = Небольшой осколок уранового стекла. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl index 087f0d3319f..29d324396ff 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl @@ -44,3 +44,19 @@ ent-SpearReinforcedPlasma = копьё из закалённой плазмы ent-ADTReinforcedPlasmaShiv = заточка из закалённой плазмы .desc = Заточка, созданная из осколка закалённой плазмы, имеющий тканевую основу, для более удобной нарезки ваших оппонентов. + +ent-ADTGlassDagger = стеклянный кинжал + .desc = Стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTPlasmaDagger = плазменный кинжал + .desc = Плазменный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTGlassReinDagger = кинжал из закалённого стекла + .desc = Закалённый, стеклянный самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTGlassUranDagger = урановый кинжал + .desc = Урановый самодельный кинжал. Хоть это и обычный осколок стекла прикреплённый к палке при помощи кабеля, это вполне неплохое оружие. + +ent-ADTWoodenSword = деревянный меч + .desc = Настоящий робаст нуждается в ежедневных тренировках. + .suffix = { "Тренировочное" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl index fab527195dc..828f6dd8e6d 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl @@ -32,3 +32,20 @@ ent-ADTHalloweenCarvedPumpkinCube = { ent-ADTHalloweenCarvedPumpkinSmile } ent-ADTHalloweenCarvedPumpkinWily = { ent-ADTHalloweenCarvedPumpkinSmile } .suffix = { ent-ADTHalloweenCarvedPumpkinSmile.suffix } .desc = { ent-ADTHalloweenCarvedPumpkinSmile.desc } + + +ent-ADTSnowballsCrate = телега со снегом + .suffix = New Year + .desc = Ради неё вовсе не разрушают чьи-то планеты... Вовсе нет. + +ent-ADTNewYearKatalka = зимние сани + .suffix = New Year + .desc = Такси бизнес-класса, потому что упряжка не рассчитана под стадо оленей. + +ent-ADTSnowball = снежок + .suffix = New Year + .desc = Снаряд опаснее всякой пули... БЕРЕГИСЬ! + +ent-ADTSlimeHappines = экстракт счастья + .suffix = New Year + .desc = Концентрация искреннего счастья слаймолюдов, полученная абсолютно гуманным путём diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml index 8e279c8bea9..39c4b105f86 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml @@ -18,3 +18,63 @@ #- type: ClothingSpeedModifier # walkModifier: 0.9 # sprintModifier: 1.2 + +#New Year + +- type: entity + parent: BaseItem + id: ADTSnowball + name: Snowball + description: yeayea. Snow? Balls! I love balls!! + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Fun/snowball.rsi + state: snowball + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: FootstepSnow + params: + variation: 0.125 + volume: 6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + ignoreResistances: true + damage: + types: + Blunt: 5 + - type: StaminaDamageOnCollide + damage: 5 + + +- type: entity + name: Slime Happines + parent: BaseItem + id: ADTSlimeHappines + description: Slimyy.. + components: + - type: Sprite + sprite: ADT/Objects/Misc/slimehappines.rsi + state: icon + + + +- type: entity + name: New Year gurney + id: ADTNewYearKatalka + parent: ChairBase + description: Yea. + components: + - type: Sprite + sprite: ADT/Structures/Specific/newyearkatalki.rsi + state: newyearkatalka diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyearkatalki.yml @@ -0,0 +1 @@ + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/slimehappines.yml @@ -0,0 +1 @@ + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml index c25945c8734..855fe33fed7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Shields/fullshield.yml @@ -44,7 +44,7 @@ - type: HeldSpeedModifier - type: Construction graph: ADTShield - node: start + node: ADTCompShield - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml index b907baf3069..284356bd79a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/shives.yml @@ -15,7 +15,7 @@ sprite: ADT/Objects/Weapons/Melee/Rplasma_shiv.rsi - type: Construction graph: ADTPShiv - node: start + node: ADTCompPlasmaShiv - type: entity name: reinforced uranium shiv @@ -35,4 +35,4 @@ sprite: ADT/Objects/Weapons/Melee/Ruranium_shiv.rsi - type: Construction graph: ADTUShiv - node: start + node: ADTCompUraniumShiv diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml index 86cf8957c9a..470020ae64c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/spear.yml @@ -10,14 +10,14 @@ wideAnimationRotation: -135 damage: types: - Piercing: 15 + Piercing: 25 - type: DamageOtherOnHit damage: types: - Piercing: 18 + Piercing: 28 - type: Construction - graph: ADTPSpear - node: start + graph: ADTPSpear + node: ADTCompPlasmaSpear - type: entity name: reinforced uranium spear @@ -31,7 +31,7 @@ wideAnimationRotation: -135 damage: types: - Piercing: 18 + Piercing: 12 Radiation: 9 - type: DamageOtherOnHit damage: @@ -40,4 +40,4 @@ Radiation: 9 - type: Construction graph: ADTUraniumSpear - node: start + node: ADTCompUraniumSpear diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index d5f78576d5d..5951f1a0334 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -88,6 +88,9 @@ id: ADTPlasmaDagger description: Dogor components: + - type: Construction + graph: ADTPDagger + node: ADTCompPlasmaDager - type: Tag tags: - Knife @@ -115,6 +118,9 @@ id: ADTGlassReinDagger description: Dogor components: + - type: Construction + graph: ADTGRDagger + node: ADTCompGlassRefDager - type: Tag tags: - Knife @@ -142,6 +148,9 @@ id: ADTGlassDagger description: Dogor components: + - type: Construction + graph: ADTGDagger + node: ADTCompGlassDager - type: Tag tags: - Knife @@ -169,6 +178,9 @@ id: ADTGlassUranDagger description: Dogor components: + - type: Construction + graph: ADTUDagger + node: ADTCompUranDager - type: Tag tags: - Knife @@ -190,4 +202,32 @@ types: Slash: 9 +- type: entity + name: wooden sword + parent: BaseItem + id: ADTWoodenSword + description: A true robust need training everyday. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/wooden_sword.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.2 + angle: 75 + damage: + types: + Blunt: 0.5 + soundHit: + collection: BoxingHit + - type: StaminaDamageOnHit + damage: 12 + #- type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 1 + - type: Item + size: Huge + - type: DisarmMalus + diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml new file mode 100644 index 00000000000..11cf63d02ab --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml @@ -0,0 +1,517 @@ +- type: entity + name: Snowballs crate + parent: BaseStructure + id: ADTSnowballsCrate + description: Mmm.. Crate full of BALLS!!! + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Specific/snowdispenser.rsi + state: icon + - type: Appearance + - type: ContainerContainer + containers: + bin-container: !type:Container + - type: Bin + maxItems: 500 + initialContents: + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml new file mode 100644 index 00000000000..87e28b684c4 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/daggers.yml @@ -0,0 +1,55 @@ +- type: constructionGraph + id: ADTGDagger + start: start + graph: + - node: start + edges: + - to: ADTCompGlassDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompGlassDager + entity: ADTGlassDagger + +- type: constructionGraph + id: ADTGRDagger + start: start + graph: + - node: start + edges: + - to: ADTCompGlassRefDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompGlassRefDager + entity: ADTGlassReinDagger + +- type: constructionGraph + id: ADTUDagger + start: start + graph: + - node: start + edges: + - to: ADTCompUranDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompUranDager + entity: ADTGlassUranDagger + +- type: constructionGraph + id: ADTPDagger + start: start + graph: + - node: start + edges: + - to: ADTCompPlasmaDager + steps: + - material: Cloth + amount: 1 + doAfter: 1 + - node: ADTCompPlasmaDager + entity: ADTPlasmaDagger diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml index 20e5715883a..a366b76ee4a 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shield.yml @@ -2,16 +2,18 @@ id: ADTShield start: start graph: - - node: start - edges: - - to: ADTCompShield - steps: - - material: Steel - amount: 20 - - material: ReinforcedGlass - amount: 10 - - material: Cable - amount: 2 - doAfter: 5 - - node: ADTCompShield - entity: ADTFullRiotShield + - node: start + edges: + - to: ADTCompShield + steps: + - material: Steel + amount: 20 + doAfter: 5 + - material: ReinforcedGlass + amount: 10 + doAfter: 5 + - material: Cable + amount: 2 + doAfter: 5 + - node: ADTCompShield + entity: ADTFullRiotShield \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml index 47f1153f3f2..49f25878c41 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/shives.yml @@ -7,7 +7,7 @@ - to: ADTCompPlasmaShiv steps: - tag: ADTRPlasmaShard - name: "Осколок плазменного стекла" + name: "Осколок закалённого плазменного стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 @@ -27,7 +27,7 @@ - to: ADTCompUraniumShiv steps: - tag: ADTRUranShard - name: "Осколок уранового стекла" + name: "Осколок закалённого уранового стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml index 68fa4861e7c..1c9057cfd72 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/spear.yml @@ -13,7 +13,7 @@ amount: 3 doAfter: 1 - tag: ADTRPlasmaShard - name: "Осколок плазменного стекла" + name: "Осколок закалённого плазменного стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 @@ -36,7 +36,7 @@ amount: 3 doAfter: 1 - tag: ADTRUranShard - name: "Осколок уранового стекла" + name: "Осколок закалённого уранового стекла" icon: sprite: Objects/Materials/Shards/shard.rsi state: shard1 diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index 8221f94dfda..01797e4f6fc 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -62,3 +62,55 @@ icon: sprite: ADT/Objects/Weapons/Melee/Rplasma_spear.rsi state: spear + +- type: construction + name: glass dagger + id: ADTDaggerGlass + graph: ADTGDagger + startNode: start + targetNode: ADTCompGlassDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/glassdagger.rsi + state: icon + +- type: construction + name: reinforced glass dagger + id: ADTDaggerRefGlass + graph: ADTGRDagger + startNode: start + targetNode: ADTCompGlassRefDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/reinforceddagger.rsi + state: icon + +- type: construction + name: plasma dagger + id: ADTDaggerPlasma + graph: ADTPDagger + startNode: start + targetNode: ADTCompPlasmaDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/plasmadagger.rsi + state: icon + +- type: construction + name: uranium dagger + id: ADTDaggerUranium + graph: ADTUDagger + startNode: start + targetNode: ADTCompUranDager + category: construction-category-weapons + objectType: Item + description: Dagger to cut your enemies. + icon: + sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi + state: icon \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json new file mode 100644 index 00000000000..76dfb6cb316 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "snowball" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png new file mode 100644 index 00000000000..de0566e0e3a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/snowball.rsi/snowball.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png new file mode 100644 index 00000000000..043a4fdabc5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json new file mode 100644 index 00000000000..d5603034a8b --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/slimehappines.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png new file mode 100644 index 00000000000..f5b3a28ed51 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json new file mode 100644 index 00000000000..a6d71cb4b1d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Specific/snowdispenser.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] + } diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png new file mode 100644 index 00000000000..6fc70d95455 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..d553d4185cc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..e2e1896b22f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json new file mode 100644 index 00000000000..aa1bde388e2 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/wooden_sword.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:m1and1b for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json new file mode 100644 index 00000000000..f096a63f544 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pangaari, Discord - @pangaari", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "newyearkatalka", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png new file mode 100644 index 00000000000..9b0af56d06c Binary files /dev/null and b/Resources/Textures/ADT/Structures/Specific/newyearkatalki.rsi/newyearkatalka.png differ