diff --git a/Resources/Locale/ru-RU/_white/items/ItemFunSnowglobe.ftl b/Resources/Locale/ru-RU/_white/items/ItemFunSnowglobe.ftl new file mode 100644 index 0000000000..af31da62c1 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/items/ItemFunSnowglobe.ftl @@ -0,0 +1,2 @@ +ent-ItemFunSnowglobe = снежный шар + .desc = Заключённая зима, вечно жаждущая свободы. diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/OuterClothing/reindeer_sweater.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/OuterClothing/reindeer_sweater.ftl new file mode 100644 index 0000000000..e9313508e7 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/clothing/OuterClothing/reindeer_sweater.ftl @@ -0,0 +1,2 @@ +ent-ClothingOuterReindeerSweater = свитер с оленями + .desc = Уютный свитер, созданный специально для поддержания праздничного настроения. diff --git a/Resources/Locale/ru-RU/_white/structures/christmas_lights.ftl b/Resources/Locale/ru-RU/_white/structures/christmas_lights.ftl new file mode 100644 index 0000000000..f31721ad5f --- /dev/null +++ b/Resources/Locale/ru-RU/_white/structures/christmas_lights.ftl @@ -0,0 +1,2 @@ +ent-ChristmasLights = новогодние гирлянды + .desc = Чувство праздника. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 9827517020..41545edd03 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -65,6 +65,7 @@ ClothingUniformJumpsuitHawaiYellow: 2 ClothingUniformJumpsuitFlannel: 2 #WD edit start + ClothingOuterReindeerSweater: 4 ClothingUniformJumpsuitCossack: 1 ClothingOuterCoatAdidasCostumeSemki: 1 ClothingOuterCoatBomber: 1 diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/reindeer_sweater.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/reindeer_sweater.yml new file mode 100644 index 0000000000..4ebbc34ffd --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/reindeer_sweater.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingOuterBase + id: ClothingOuterReindeerSweater + name: reindeer sweater + description: A cozy sweater designed to celebrate the holiday season. + components: + - type: Sprite + sprite: White/Clothing/OuterClothing/reindeer_sweater.rsi + - type: Clothing + sprite: White/Clothing/OuterClothing/reindeer_sweater.rsi + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/winter_stuff.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/winter_stuff.yml new file mode 100644 index 0000000000..bb025ad231 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/winter_stuff.yml @@ -0,0 +1,53 @@ +- type: entity + name: snowglobe + parent: BaseItem + id: ItemFunSnowglobe + description: Encased winter, always longing for freedom. + components: + - type: Sprite + sprite: White/Objects/Fun/snowglobe.rsi + state: icon + scale: 0.7, 0.7 + - type: Item + size: Tiny + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/drinkglass_drop.ogg + - type: StaticPrice + price: 500 + - type: DamageOnLand + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 3 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpillBehavior + solution: contents + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SolutionContainerManager + solutions: + contents: + reagents: + - ReagentId: Water + Quantity: 20 + - type: PhysicalComposition + materialComposition: + Glass: 50 diff --git a/Resources/Prototypes/_White/Entities/Structures/Decoration/christmas_lights.yml b/Resources/Prototypes/_White/Entities/Structures/Decoration/christmas_lights.yml new file mode 100644 index 0000000000..dd5255fddb --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Structures/Decoration/christmas_lights.yml @@ -0,0 +1,39 @@ +- type: entity + id: ChristmasLights + name: christmas lights + description: Feeling jolly. + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: Appearance + - type: Sprite + drawdepth: WallMountedItems + sprite: White/Structures/Decoration/christmas_lights.rsi + layers: + - state: icon + - state: unshaded + shader: unshaded + - type: Icon + sprite: White/Structures/Decoration/christmas_lights.rsi + state: icon + - type: Transform + anchored: true + - type: Damageable + damageContainer: StructuralInorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:DoActsBehavior + acts: ["Destruction"] + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" diff --git a/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..106f0e8644 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/icon.png new file mode 100644 index 0000000000..4370fa7ec3 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/icon.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/inhand-left.png b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/inhand-left.png new file mode 100644 index 0000000000..e39b676262 Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/inhand-right.png b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/inhand-right.png new file mode 100644 index 0000000000..0bb0c19c9c Binary files /dev/null and b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/meta.json new file mode 100644 index 0000000000..89c9856b0a --- /dev/null +++ b/Resources/Textures/White/Clothing/OuterClothing/reindeer_sweater.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "kxaotuk", + "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/White/Objects/Fun/snowglobe.rsi/icon.png b/Resources/Textures/White/Objects/Fun/snowglobe.rsi/icon.png new file mode 100644 index 0000000000..0a7c7e809d Binary files /dev/null and b/Resources/Textures/White/Objects/Fun/snowglobe.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Fun/snowglobe.rsi/meta.json b/Resources/Textures/White/Objects/Fun/snowglobe.rsi/meta.json new file mode 100644 index 0000000000..1bcf7286a8 --- /dev/null +++ b/Resources/Textures/White/Objects/Fun/snowglobe.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/icon.png b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/icon.png new file mode 100644 index 0000000000..05ddc057e4 Binary files /dev/null and b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/icon.png differ diff --git a/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/meta.json b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/meta.json new file mode 100644 index 0000000000..e337197eae --- /dev/null +++ b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "unshaded" + } + ] +} diff --git a/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/unshaded.png b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/unshaded.png new file mode 100644 index 0000000000..5813305f38 Binary files /dev/null and b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/unshaded.png differ