]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Banana Clown Outfit (#22068)
authorbrainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Mon, 4 Dec 2023 23:12:02 +0000 (23:12 +0000)
committerGitHub <noreply@github.com>
Mon, 4 Dec 2023 23:12:02 +0000 (16:12 -0700)
* Banana Clown Outfit

* Update SkatesComponent.cs

27 files changed:
Content.Shared/Clothing/Components/SkatesComponent.cs
Resources/Prototypes/Entities/Clothing/Masks/masks.yml
Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/clothing.yml
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
Resources/Prototypes/SoundCollections/footsteps.yml
Resources/Prototypes/tags.yml
Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-hamster.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/clown_banana.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json [new file with mode: 0644]

index b8bc00442ab407d0fa761544041020eb4af5ce6b..04b4c722ec17a735e93df30b8d45fc3859bd7f26 100644 (file)
@@ -11,45 +11,47 @@ public sealed partial class SkatesComponent : Component
     /// <summary>
     /// the levels of friction the wearer is subected to, higher the number the more friction.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float Friction = 2.5f;
 
     /// <summary>
     /// Determines the turning ability of the wearer, Higher the number the less control of their turning ability.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float? FrictionNoInput = 2.5f;
 
     /// <summary>
     /// Sets the speed in which the wearer accelerates to full speed, higher the number the quicker the acceleration.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float Acceleration = 5f;
 
     /// <summary>
     /// The minimum speed the wearer needs to be traveling to take damage from collision.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float MinimumSpeed = 3f;
 
     /// <summary>
     /// The length of time the wearer is stunned for on collision.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float StunSeconds = 3f;
 
+
     /// <summary>
     /// The time duration before another collision can take place.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float DamageCooldown = 2f;
 
     /// <summary>
     /// The damage per increment of speed on collision.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float SpeedDamage = 1f;
 
+
     /// <summary>
     /// Defaults for MinimumSpeed, StunSeconds, DamageCooldown and SpeedDamage.
     /// </summary>
index 4909d6e39378b3c282643925c276c31f1b835dee..556de937376da3d0e6420666dbe0ec27eff62db8 100644 (file)
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingMaskClown
+  id: ClothingMaskClownBanana
+  name: banana clown wig and mask
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/clown_banana.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/clown_banana.rsi
+  - type: Construction
+    graph: BananaClownMask
+    node: mask
+
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskJoy
index cc194af5d6f9b7235f92003783b5add04c0c000d..4a49c804cdb1e56ee0066bfed01a12433794ff92 100644 (file)
     - ClownShoes
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingShoesClown
+  id: ClothingShoesClownBanana
+  name: banana clown shoes
+  description: "When humor and footwear combine into new levels of absurdity."
+  components:
+  - type: Sprite
+    sprite: Clothing/Shoes/Specific/clown_banana.rsi
+  - type: Clothing
+    sprite: Clothing/Shoes/Specific/clown_banana.rsi
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepSlip
+  - type: Construction
+    graph: BananaClownShoes
+    node: shoes
+  - type: Skates
+    minimumSpeed: 20
+    acceleration: 5
+
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesBling
@@ -47,6 +67,7 @@
     energy: 2
     color: "#FFD800"
     netsync: false
+
 - type: entity
   parent: ClothingShoesBaseButcherable
   id: ClothingShoesCult
index 24e15ca8cbd71c99fc7ccac4caee40d010f6285f..ce8170a7b550b020b2e06a909293c283c0b89d20 100644 (file)
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
     femaleMask: UniformTop
+  - type: Tag
+    tags:
+    - ClownSuit
+
+- type: entity
+  parent: ClothingUniformJumpsuitClown
+  id: ClothingUniformJumpsuitClownBanana
+  name: banana clown suit
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi
+    femaleMask: UniformTop
+  - type: Construction
+    graph: BananaClownJumpsuit
+    node: jumpsuit
+  - type: Armor
+    modifiers:
+      coefficients:
+        Radiation: 0.8
 
 - type: entity
   parent: ClothingUniformBase
index ed5fccb793288cfb61fcdf6e164d0babc7accd0a..898791f6ff6ca42cf7fedca04c8573df66ae61f4 100644 (file)
     tags:
     - Recyclable
     - Trash
+    - BananaPeel
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
new file mode 100644 (file)
index 0000000..190293f
--- /dev/null
@@ -0,0 +1,113 @@
+- type: constructionGraph
+  id: BananaClownJumpsuit
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: jumpsuit
+          steps:
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - material: Bananium
+              amount: 1
+              doAfter: 1
+            - tag: ClownSuit
+              name: A Clown Suit
+              icon:
+                sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
+                state: icon
+              doAfter: 1
+    - node: jumpsuit
+      entity: ClothingUniformJumpsuitClownBanana
+
+- type: constructionGraph
+  id: BananaClownShoes
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: shoes
+          steps:
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - material: Bananium
+              amount: 1
+              doAfter: 1
+            - tag: ClownShoes
+              name: Clown Shoes
+              icon:
+                sprite: Clothing/Shoes/Specific/clown.rsi
+                state: icon
+              doAfter: 1
+    - node: shoes
+      entity: ClothingShoesClownBanana
+
+- type: constructionGraph
+  id: BananaClownMask
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: mask
+          steps:
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - tag: BananaPeel
+              name: A Banana Peel
+              icon:
+                sprite: Objects/Specific/Hydroponics/banana.rsi
+                state: peel
+              doAfter: 1
+            - material: Bananium
+              amount: 1
+              doAfter: 1
+            - tag: ClownMask
+              name: A Clown Mask
+              icon:
+                sprite: Clothing/Mask/clown.rsi
+                state: icon
+              doAfter: 1
+    - node: mask
+      entity: ClothingMaskClownBanana
index e8bd1b69385f04ebbb2eb4ee6079af36cc47843c..cd6321ae89d2a9296d34bbd373d78de66d5a630f 100644 (file)
   description: Helmet made of bones.
   icon: { sprite: Clothing/Head/Helmets/bone_helmet.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: banana clown mask
+  id: BananaClownMask
+  graph: BananaClownMask
+  startNode: start
+  targetNode: mask
+  category: construction-category-clothing
+  description: A clown mask upgraded with banana peels.
+  icon: { sprite: Clothing/Mask/clown_banana.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: banana clown suit
+  id: BananaClownJumpsuit
+  graph: BananaClownJumpsuit
+  startNode: start
+  targetNode: jumpsuit
+  category: construction-category-clothing
+  description: A clown suit upgraded with banana peels.
+  icon: { sprite: Clothing/Uniforms/Jumpsuit/clown_banana.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: banana clown shoes
+  id: BananaClownShoes
+  graph: BananaClownShoes
+  startNode: start
+  targetNode: shoes
+  category: construction-category-clothing
+  description: A pair of clown shoes upgraded with banana peels.
+  icon: { sprite: Clothing/Shoes/Specific/clown_banana.rsi, state: icon }
+  objectType: Item
\ No newline at end of file
index a787d456543ecc2fb17bd75a005d15f0330d5f15..85e9b634d6f48ca1ac6d9c453f2cdfb108a446d6 100644 (file)
     back: SpearBone
     head: ClothingHeadHelmetBone
     shoes: ClothingShoesCult
+
+#Banana Clown
+- type: startingGear
+  id: BananaClown
+  equipment:
+    shoes: ClothingShoesClownBanana
+    jumpsuit: ClothingUniformJumpsuitClownBanana
+    mask: ClothingMaskClownBanana
index d67d46009873c0636750ae885f43e59a96f30871..f0a273ec3afe4a25345d7492bc2e35eb11befd3d 100644 (file)
   - /Audio/Effects/Footsteps/bells3.ogg
   - /Audio/Effects/Footsteps/bells4.ogg
   - /Audio/Effects/Footsteps/bells5.ogg
+
+- type: soundCollection
+  id: FootstepSlip
+  files:
+  - /Audio/Effects/slip.ogg
index 3b35c8f75806bab90b95c9e06d88d400fb4d51f0..23c5019765c1680e3f9a7bed3eda1da9a1c356a1 100644 (file)
@@ -31,6 +31,9 @@
 - type: Tag
   id: Balloon
 
+- type: Tag
+  id: BananaPeel
+
 - type: Tag
   id: BaseballBat
 
 - type: Tag
   id: ClownShoes
 
+- type: Tag
+  id: ClownSuit
+
 - type: Tag
   id: CluwneHorn
 
diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-hamster.png
new file mode 100644 (file)
index 0000000..455b22e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-hamster.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK.png
new file mode 100644 (file)
index 0000000..cd12ea0
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/icon.png
new file mode 100644 (file)
index 0000000..923beb0
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..2136e54
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2ef4b94
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json
new file mode 100644 (file)
index 0000000..bde7a52
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by KREKS (ss14 discord) for ss14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png
new file mode 100644 (file)
index 0000000..486cc15
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png
new file mode 100644 (file)
index 0000000..c39f640
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..0bb56eb
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2876426
Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/clown_banana.rsi/meta.json
new file mode 100644 (file)
index 0000000..e443165
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by KREKS (ss14 discord) for ss14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..d305015
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..aae16e3
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/icon.png
new file mode 100644 (file)
index 0000000..5ba1ea0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..11ce676
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..d1a4a6d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json
new file mode 100644 (file)
index 0000000..d1f37ef
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by KREKS (ss14 discord) for ss14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}