diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/flora.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/flora.ftl new file mode 100644 index 00000000000..5d8e388be82 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/flora.ftl @@ -0,0 +1,4 @@ +ent-NewYearTree0 = большая ель + .desc = Ель, излучающая волшебную ауру. +ent-NewYearTree1 = новогодняя ёлка + .desc = Ты был хорошим мальчиком? diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/garlands.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/garlands.ftl new file mode 100644 index 00000000000..5d2e0102363 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/garlands.ftl @@ -0,0 +1,6 @@ +ent-GarlandsOff = гирлянды + .desc = Неработающие висюльки. Может они включатся когда что-то произойдет? + .suffix = Выключены +ent-Garlands = { ent-GarlandsOff } + .desc = Красивое... Смотря на это, вы чувствуете, как наполняетесь новогодним духом. + .suffix = Включены diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/presents.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/presents.ftl new file mode 100644 index 00000000000..9dc8c2babdb --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/prototypes/entities/objects/decoration/presents.ftl @@ -0,0 +1,11 @@ +ent-BasePresentBox = декоративный подарок + .desc = Красивая обёртка, разочаровывающая пустота внутри. +ent-BigPresentBox = { ent-BasePresentBox } + .desc = { ent-BasePresentBox.desc } + .suffix = Большой +ent-MediumPresentBox = { ent-BasePresentBox } + .desc = { ent-BasePresentBox.desc } + .suffix = Средний +ent-SmallPresentBox = { ent-BasePresentBox } + .desc = { ent-BasePresentBox.desc } + .suffix = Маленький diff --git a/Resources/Locale/ru-RU/corvax/prototypes/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/ru-RU/corvax/prototypes/entities/structures/wallmounts/signs/signs.ftl new file mode 100644 index 00000000000..721b773d5b7 --- /dev/null +++ b/Resources/Locale/ru-RU/corvax/prototypes/entities/structures/wallmounts/signs/signs.ftl @@ -0,0 +1,2 @@ +ent-SignNewYear = новогодний знак + .desc = Неоновый знак. Лицом в салат, и проснуться в Феврале. diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/flora.yml new file mode 100644 index 00000000000..ee7e1066caf --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/flora.yml @@ -0,0 +1,69 @@ +- type: entity + id: NewYearTree0 + name: big tree + description: A tree that radiates a magical aura. + components: + - type: SpriteFade + - type: Clickable + - type: Sprite + state: before + noRot: true + sprite: Corvax/Objects/Decoration/Flora/newyear_tree.yml + drawdepth: Overdoors + offset: 0, 1 + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.8,-0.4,0.8,0.4" + density: 4500 + layer: + - WallLayer + - type: Damageable # Да, я специально сделал неразрушаемым, но damageable. + - type: MeleeSound + soundGroups: + Brute: + path: /Audio/Effects/chop.ogg + params: + variation: 0.05 + +- type: entity + parent: NewYearTree0 + id: NewYearTree1 + suffix: PresentsGiver + name: new year tree + description: Have you been a good boy? + components: + - type: Sprite + layers: + - state: after + - state: lights + shader: unshaded + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.8,-1,0.8,0.5" + density: 4500 + layer: + - WallLayer + - type: PointLight + color: "#FFD66DFF" + energy: 2.5 + - type: LimitedItemGiver + spawnEntries: + - id: PresentRandom + orGroup: present + - id: PresentRandomCash + prob: 0.20 + orGroup: present + - id: PresentRandomAsh + prob: 0.05 + orGroup: present + receivedPopup: christmas-tree-got-gift + deniedPopup: christmas-tree-no-gift + requiredHoliday: FestiveSeason diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Decoration/garlands.yml b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/garlands.yml new file mode 100644 index 00000000000..bc45a0218f2 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/garlands.yml @@ -0,0 +1,50 @@ +- type: entity + id: GarlandsOff + name: garlands + description: "Non-working danglers. Maybe they will turn on when something happens?" + suffix: "Off" + placement: + mode: SnapgridCenter + components: + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmash + - type: Transform + anchored: true + - type: Clickable + - type: Sprite + sprite: Corvax/Objects/Decoration/garlands.yml + drawdepth: Overdoors + state: base + - type: SpriteFade + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 250 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + +- type: entity + parent: GarlandsOff + id: Garlands + description: "Beautiful... Looking at this, you are filled with a New Year's mood." + suffix: "On" + components: + - type: Sprite + layers: + - state: base + - state: lights + shader: unshaded + - type: PointLight + color: "#0000FF" + energy: 0.8 + radius: 5 + softness: 1 + - type: RgbLightController diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Decoration/presents.yml b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/presents.yml new file mode 100644 index 00000000000..3ec2ddfafe2 --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Objects/Decoration/presents.yml @@ -0,0 +1,112 @@ +- type: entity + id: BasePresentBox + name: decoration present + description: "Beautiful wrapper, disappointing emptiness inside." + abstract: true + placement: + mode: PlaceFree + components: + - type: Clickable + - type: Physics + bodyType: Static + - type: Damageable + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 250 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: BasePresentBox + id: BigPresentBox + suffix: Big + components: + - type: Sprite + sprite: Corvax/Objects/Decoration/Presents/big_present.yml + noRot: true + layers: + - state: base + map: [ "base" ] + - state: mask_null + map: [ "decor" ] + - state: ribbon + - type: RandomSprite + available: + - base: + base: Rainbow + decor: + decor_0: "" + decor_1: "" + decor_2: "" + mask_null: "" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.15 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + +- type: entity + parent: BasePresentBox + id: MediumPresentBox + suffix: Medium + components: + - type: Sprite + sprite: Corvax/Objects/Decoration/Presents/medium_present.yml + noRot: true + layers: + - state: base + map: [ "base" ] + - state: mask_null + map: [ "decor" ] + - state: ribbon + - type: RandomSprite + available: + - base: + base: Rainbow + decor: + decor_0: "" + decor_1: "" + decor_2: "" + mask_null: "" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.07 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + +- type: entity + parent: BasePresentBox + id: SmallPresentBox + suffix: Small + components: + - type: Sprite + sprite: Corvax/Objects/Decoration/Presents/small_present.yml + noRot: true + layers: + - state: base + map: [ "base" ] + - state: ribbon + - type: RandomSprite + available: + - base: + base: Rainbow + - type: Physics + bodyType: Static + canCollide: false diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/signs.yml new file mode 100644 index 00000000000..eb7fdbc0dce --- /dev/null +++ b/Resources/Prototypes/Corvax/Entities/Structures/Wallmounts/Signs/signs.yml @@ -0,0 +1,9 @@ +- type: entity + parent: BaseSign + id: SignNewYear + name: new year sign + description: "Neon sign. Face in salad and wake up in February." + components: + - type: Sprite + state: corvax_newyear + shader: unshaded diff --git a/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/after.png b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/after.png new file mode 100644 index 00000000000..edb82885c49 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/after.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/before.png b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/before.png new file mode 100644 index 00000000000..13f86d14ae2 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/before.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/lights.png b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/lights.png new file mode 100644 index 00000000000..7d76a38d928 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/lights.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/meta.json b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/meta.json new file mode 100644 index 00000000000..c84909358d2 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Decoration/Flora/newyear_tree.yml/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Ko4erga (discord)", + "size": { + "x": 96, + "y": 128 + }, + "states": [ + { + "name": "before" + }, + { + "name": "after" + }, + { + "name": "lights", + "delays": [ + [ + 1.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/base.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/base.png new file mode 100644 index 00000000000..245368e0ffc Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/base.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_0.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_0.png new file mode 100644 index 00000000000..0aa08cc38ff Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_0.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_1.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_1.png new file mode 100644 index 00000000000..7e3b1bea707 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_1.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_2.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_2.png new file mode 100644 index 00000000000..16b9fca4fd8 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/decor_2.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/mask_null.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/mask_null.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/mask_null.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/meta.json b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/meta.json new file mode 100644 index 00000000000..439a773edcd --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "ribbon" + }, + { + "name": "mask_null" + }, + { + "name": "decor_0" + }, + { + "name": "decor_1" + }, + { + "name": "decor_2" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/ribbon.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/ribbon.png new file mode 100644 index 00000000000..9f6353e7f9f Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/big_present.yml/ribbon.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/base.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/base.png new file mode 100644 index 00000000000..6319455b5ce Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/base.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_0.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_0.png new file mode 100644 index 00000000000..ee2b7d3e1c4 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_0.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_1.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_1.png new file mode 100644 index 00000000000..3b4119c3ea9 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_1.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_2.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_2.png new file mode 100644 index 00000000000..6c4fef808c5 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/decor_2.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/mask_null.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/mask_null.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/mask_null.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/meta.json b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/meta.json new file mode 100644 index 00000000000..439a773edcd --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "ribbon" + }, + { + "name": "mask_null" + }, + { + "name": "decor_0" + }, + { + "name": "decor_1" + }, + { + "name": "decor_2" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/ribbon.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/ribbon.png new file mode 100644 index 00000000000..5e079ac5be7 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/medium_present.yml/ribbon.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/base.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/base.png new file mode 100644 index 00000000000..2b683ced8df Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/base.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/meta.json b/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/meta.json new file mode 100644 index 00000000000..3ceba438d99 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "ribbon" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/ribbon.png b/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/ribbon.png new file mode 100644 index 00000000000..b07a91827cb Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/Presents/small_present.yml/ribbon.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/base.png b/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/base.png new file mode 100644 index 00000000000..4652d40eba9 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/base.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/lights.png b/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/lights.png new file mode 100644 index 00000000000..9de09f9c665 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/lights.png differ diff --git a/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/meta.json b/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/meta.json new file mode 100644 index 00000000000..1cdcb4fd6c2 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Decoration/garlands.yml/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "lights", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/corvax_newyear.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/corvax_newyear.png new file mode 100644 index 00000000000..d427ff4f8e8 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/corvax_newyear.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 92b67d8e2ad..4158f09a7db 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law' & 'psychology' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison; Job signs localized by kaiserGans (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'ntmining' modified by Ko4erga", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law' & 'psychology' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison; Job signs localized by kaiserGans (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'ntmining' modified by Ko4erga, 'corvax_newyear' by Ko4erga", "states": [ { "name": "ai" @@ -499,6 +499,21 @@ }, { "name": "ntmining" + }, + { + "name": "corvax_newyear", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] } ] }