Add Offset Canes + Trinket Canes Group (#39272)

* Added offset cane

* Added offset cane colors

* Added canes to the trinkets menu

* added color to names instead of suffix

* removes some stripes from the mime cane icon

* update file organization

* standard -> standard.rsi, stop making commits at nearly 3 in the morning.

* updated comment to be more explicit in what doesnt work

* Cane refactor :godo:

* git makes me very upset sometimes (fixed cane yaml)

* wooden->wood

* apparently this didnt push

* Standardize comments

* Removed comment

* Removed comment

* Adds red accents to mime cane

* Indent fixes

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml
new file mode 100644 (file)
index 0000000..1d2081f
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml
@@ -0,0 +1,85 @@
+- type: entity
+  parent: BaseItem
+  id: OffsetCane
+  name: standard offset cane
+  description: A standard offset cane, essential for getting around when your legs aren't up to the task. May or may not grant you the wisdom of the elderly.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/standard.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Weapons/Melee/offset_canes/standard.rsi
+#  - type: RandomSprite # Ideally I'd rather these be their own selectable item instead of randomly picked.
+#    available:
+#    - color: "#91949C"  # standard gray
+#    - color: "#000000"  # black
+#    - color: "#406BDE"  # blue
+#    - color: "#00FFFF"  # cyan
+#    - color: "#00FF00"  # green
+#    - color: "#FF69B4"  # pink
+#    - color: "#800080"  # purple
+#    - color: "#FF0000"  # red
+#    - color: "#FFFF00"  # yellow
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Blunt: 5
+  - type: StaminaDamageOnHit
+    damage: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 3
+  - type: UseDelay
+    delay: 1
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneClown
+  name: rainbow offset cane
+  description: A rainbow offset cane, perfect for clowns and those who enjoy a splash of color in their lives.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/clown.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/clown.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneMime
+  name: striped offset cane
+  description: A black and white striped cane, perfect for silent performances.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/mime.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/mime.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneNT
+  name: nanotrasen offset cane
+  description: A nanotrasen standard issue offset cane with the NT logo, favored by those who prefer a more corporate look.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/nanotrasen.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/nanotrasen.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneWood
+  name: wooden offset cane
+  description: A wooden offset cane, a classic choice for those who appreciate natural materials and a sturdy grip.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/wood.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/wood.rsi

diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 2649dfa95809021c07755136af587aeba7ee2ec5..ccaf3abe428856cdb96133c5a2ec6c73c4ce16c6 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -233,6 +233,74 @@
     - ClothingNeckGenderfluidPin
   groupBy: "pin"
 
+# Canes
+# The white cane is intentionally not included here. Thats for the blind.
+- type: loadout
+  id: OffsetCane
+  storage:
+    back:
+    - OffsetCane
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneWood
+  storage:
+    back:
+    - OffsetCaneWood
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneClown
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobClown
+      time: 3600 # 1hr
+  storage:
+    back:
+    - OffsetCaneClown
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneMime
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobMime
+      time: 3600 # 1hr
+  storage:
+    back:
+    - OffsetCaneMime
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneNT
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Command
+      time: 18000 # 5hr
+  storage:
+    back:
+    - OffsetCaneNT
+  groupBy: "canes"
+
+- type: loadout
+  id: Cane
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobLibrarian
+      time: 3600 # 1hr same as Jamjar.
+  storage:
+    back:
+    - Cane
+  groupBy: "canes"
+
 # Towels
 - type: loadout
   id: TowelColorWhite

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 32f73bbf8333ed468a59848a8c83f2888ee3f835..333d9142255c4561c3ab0ac0e0d5d4b199d7f17d 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -36,6 +36,12 @@
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
   - ClothingNeckGoldAutismPin
+  - OffsetCane
+  - OffsetCaneWood
+  - OffsetCaneClown
+  - OffsetCaneMime
+  - OffsetCaneNT
+  - Cane
   - TowelColorBlack
   - TowelColorDarkBlue
   - TowelColorDarkGreen

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 6e855f393d508a58f05553689a24ea8e0bb36f62..0b6cccf78b3b812d5a98d31f33f4c9d8c29ffb39 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -44,6 +44,8 @@
   - DiseaseSwab
   - BodyBag
   - WhiteCane
+  - OffsetCane
+  - OffsetCaneWood
 
 - type: latheRecipePack
   id: RollerBedsStatic

diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 2f968893b15b1a6259854136821aedee7cbf8955..bd3ee3773d7f630cfa33104f831af182fd6551f6 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -217,6 +217,22 @@
     Steel: 100
     Plastic: 100
 
+- type: latheRecipe
+  id: OffsetCane
+  result: OffsetCane
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
+
+- type: latheRecipe
+  id: OffsetCaneWood
+  result: OffsetCaneWood
+  completetime: 2
+  materials:
+    Steel: 100
+    Wood: 100
+
 - type: latheRecipe
   id: LauncherSyringe
   result: LauncherSyringe

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png
new file mode 100644 (file)
index 0000000..de4d746
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..1b40dce
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..5cb35c7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json
new file mode 100644 (file)
index 0000000..374d6f5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..3d344d5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..0225536
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png
new file mode 100644 (file)
index 0000000..3ec82b7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..5dc2b7a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..8167b11
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json
new file mode 100644 (file)
index 0000000..374d6f5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..ac06155
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..9774684
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png
new file mode 100644 (file)
index 0000000..6b72ff6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..aebfbf9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..285aa55
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json
new file mode 100644 (file)
index 0000000..374d6f5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..2bec441
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..069f7b6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png
new file mode 100644 (file)
index 0000000..2b989d4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..37c5475
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..8514143
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json
new file mode 100644 (file)
index 0000000..374d6f5
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..0e2843d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..18929e8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png
new file mode 100644 (file)
index 0000000..abb71c7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..4a6f784
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7388db8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json
new file mode 100644 (file)
index 0000000..8bfbd31
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart, inspiration from ps3moira#9488 on discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..c7cd397
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..1fbea1b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png differ