diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index b62b8b6de1..0cb9b70fe6 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -35,7 +35,7 @@ clothingPrototype: ClothingHeadHelmetEVAGLAMOUR - type: ContainerContainer containers: - toggleable-clothing: !type:ContainerSlot { } + toggleable-clothing: !type:ContainerSlot {} - type: GiftIgnore - type: entity @@ -231,7 +231,7 @@ - type: PointLight radius: 2 energy: 2 - color: '#ff6bff' + color: "#ff6bff" - type: entity name: дубинка контрактника @@ -280,7 +280,7 @@ - type: Sprite sprite: Objects/Misc/books.rsi layers: - - state: summon_book + - state: summon_book - type: Item size: Small - type: Paper @@ -358,7 +358,6 @@ clothingPrototype: ClothingHeadHelmetHardsuitHskveezAtmos - type: GiftIgnore - #Hskveez Atmospherics Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase @@ -376,7 +375,7 @@ - state: light-overlay visible: false shader: unshaded - map: [ "light" ] + map: ["light"] - type: HandheldLight addPrefix: false - type: ToggleableLightVisuals @@ -449,14 +448,13 @@ description: Провонял сигаретами и разрушенными мечтами. components: - type: Sprite - sprite: White/Fluff/thechaotic/coat.rsi + sprite: White/Fluff/thechaotic/coat.rsi - type: Clothing - sprite: White/Fluff/thechaotic/coat.rsi + sprite: White/Fluff/thechaotic/coat.rsi - type: StorageFill contents: - id: SmokingPipeFilledTobacco - #6elblu - type: entity parent: ClothingNeckBase @@ -467,7 +465,6 @@ - type: Sprite sprite: White/Fluff/6elblu/white-cloak.rsi - #Serafim547 - type: entity parent: ClothingEyesBase @@ -506,3 +503,82 @@ - type: Sprite sprite: White/Fluff/Serafim547/vulp_coin.rsi state: coin_2 + +# Skrimex + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSkrimexCap + name: Сердце-переливающий плащ + description: "Плащ, в котором сердце переливается в центре, можно описать как впечатляющий и загадочный предмет одежды. Он выполнен из темной и непрозрачной ткани, создающей мистическую ауру вокруг носителя. Внутри плаща можно заметить нашивку с инициалами: Возгалова К. Д." + components: + - type: Sprite + sprite: White/Fluff/skrimex/heart-cap.rsi + - type: Clothing + sprite: White/Fluff/skrimex/heart-cap.rsi + +- type: entity + parent: FlippoLighter + id: ZippoLighterSkrimex + name: Золотой Zippo + description: "Золотое покрытие придает этой зажигалке особую элегантность и роскошность. Она может быть выполнена из разных оттенков золота - бледного, яркого или розового. Корпус зажигалки может быть гладким или украшенным гравировкой, что добавляет ей аристократический шик. А на заднем обороте заметна гравировка с инициалами: Возгалова К. Д." + components: + - type: Sprite + sprite: White/Fluff/skrimex/zippo-lighter.rsi + scale: 0.7, 0.7 + layers: + - state: base + map: ["enum.WelderLayers.Base"] + - state: light + map: ["enum.WelderLayers.Flame"] + shader: unshaded + visible: false + - type: Item + size: Tiny + sprite: White/Fluff/skrimex/zippo-ывфter.rsi + heldPrefix: off + - type: UseDelay + - type: ItemStatus + - type: RefillableSolution + solution: Welder + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 1 + maxVol: 1 + - type: MeleeWeapon + damage: + types: + Blunt: 0 #this feels hacky, but is needed for burn damage while active (i think) + - type: IgnitionSource + ignited: false + - type: ItemToggle + predictable: false + soundActivate: + collection: lighterOnSounds + soundDeactivate: + collection: lighterOffSounds + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Heat: 1 + - type: ItemToggleSize + activatedSize: Small + - type: ItemToggleHot + - type: Welder + fuelConsumption: 0 + fuelLitCost: 0 + tankSafe: true + - type: PointLight + enabled: false + radius: 1.5 #smallest possible + color: orange + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + light: + True: { visible: true } + False: { visible: false } diff --git a/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/equipped-NECK.png b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/equipped-NECK.png new file mode 100644 index 0000000000..a33109e750 Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/icon.png b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/icon.png new file mode 100644 index 0000000000..ce0d98f308 Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/inhand-left.png b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/inhand-left.png new file mode 100644 index 0000000000..571e31ea7d Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/inhand-right.png b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/inhand-right.png new file mode 100644 index 0000000000..81aeb2b814 Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/meta.json b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/meta.json new file mode 100644 index 0000000000..aab6affea6 --- /dev/null +++ b/Resources/Textures/White/Fluff/skrimex/heart-cap.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Skrimex", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4, + "delays": [ + [ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1 + ], + [ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1 + ], + [ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1 + ], + [ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/base.png b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/base.png new file mode 100644 index 0000000000..358c1b8f7f Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/base.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/icon.png b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/icon.png new file mode 100644 index 0000000000..1a6ab646d0 Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/light.png b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/light.png new file mode 100644 index 0000000000..4668a246ed Binary files /dev/null and b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/light.png differ diff --git a/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/meta.json b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/meta.json new file mode 100644 index 0000000000..cf6ce9487f --- /dev/null +++ b/Resources/Textures/White/Fluff/skrimex/zippo-lighter.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "light", + "delays": [[0.3, 0.3, 0.3, 0.3]] + }, + { + "name": "icon" + } + ] +}