From 9e04bcd9b03f3e601c49de3d3f31df0f653882f2 Mon Sep 17 00:00:00 2001
From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:29:37 +0200
Subject: [PATCH] New personal item: Jotty's Pet Rock 'Bobby' (#83)

* Initial commit to create draft. Not complete.

* Commit and ready for full PR.

* Change attribution

---------

Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
---
 .../_Umbra/Entities/Objects/Fun/bobby.yml     |  13 +++++++++++
 .../Loadouts/Miscellaneous/personal_items.yml |  14 ++++++++++++
 .../_Umbra/Loadouts/loadout_groups.yml        |   3 +++
 .../_Umbra/Objects/Fun/bobby.rsi/bobby.png    | Bin 0 -> 585 bytes
 .../_Umbra/Objects/Fun/bobby.rsi/meta.json    |  21 ++++++++++++++++++
 5 files changed, 51 insertions(+)
 create mode 100644 Resources/Prototypes/_Umbra/Entities/Objects/Fun/bobby.yml
 create mode 100644 Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/bobby.png
 create mode 100644 Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/meta.json

diff --git a/Resources/Prototypes/_Umbra/Entities/Objects/Fun/bobby.yml b/Resources/Prototypes/_Umbra/Entities/Objects/Fun/bobby.yml
new file mode 100644
index 000000000000..c889a7ea9db2
--- /dev/null
+++ b/Resources/Prototypes/_Umbra/Entities/Objects/Fun/bobby.yml
@@ -0,0 +1,13 @@
+- type: entity
+  name: Bobby
+  parent: BaseItem
+  id: PetRockBobby
+  description: "Is Bobby!!"
+  suffix: PersonalItem
+  components:
+  - type: Sprite
+    sprite: _Umbra/Objects/Fun/bobby.rsi
+    state: bobby
+  - type: Item
+    size: Small
+    sprite: _Umbra/Objects/Fun/bobby.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_Umbra/Loadouts/Miscellaneous/personal_items.yml b/Resources/Prototypes/_Umbra/Loadouts/Miscellaneous/personal_items.yml
index 0551f6af5b53..d7b773deb5ba 100644
--- a/Resources/Prototypes/_Umbra/Loadouts/Miscellaneous/personal_items.yml
+++ b/Resources/Prototypes/_Umbra/Loadouts/Miscellaneous/personal_items.yml
@@ -138,6 +138,20 @@
     back:
     - ClothingHeadHatRainbowFlowerJasmi
 
+# Jotty's Pet Rock
+- type: loadout
+  id: PetRockBobby
+  equipment: PetRockBobby
+  effects:
+  - !type:PersonalItemLoadoutEffect
+    character: Joetta-Beedell
+
+- type: startingGear
+  id: PetRockBobby
+  storage:
+    back:
+    - PetRockBobby   
+    
 # Jasmi's Deeja-Wujeeta plushie
 - type: loadout
   id: PlushieDeeja
diff --git a/Resources/Prototypes/_Umbra/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Umbra/Loadouts/loadout_groups.yml
index f5c817a59ede..7a6cb249a6a5 100644
--- a/Resources/Prototypes/_Umbra/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_Umbra/Loadouts/loadout_groups.yml
@@ -32,6 +32,7 @@
   - ClothingHeadHatRainbowFlowerJasmi
   - ClothingHeadBorgsBeret
   - ClothingNeckBorgsScarf
+  - PetRockBobby
 
 # Personal items specialised for Warden
 - type: loadoutGroup
@@ -60,6 +61,7 @@
   - ClothingHeadHatRainbowFlowerJasmi
   - ClothingHeadBorgsBeret
   - ClothingNeckBorgsScarf
+  - PetRockBobby
 
 # Personal items specialised for Detective
 - type: loadoutGroup
@@ -88,3 +90,4 @@
   - ClothingHeadHatRainbowFlowerJasmi
   - ClothingHeadBorgsBeret
   - ClothingNeckBorgsScarf
+  - PetRockBobby
\ No newline at end of file
diff --git a/Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/bobby.png b/Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/bobby.png
new file mode 100644
index 0000000000000000000000000000000000000000..f883a0288e2c8145567b0ed592570078779ce8a2
GIT binary patch
literal 585
zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3HGX9;gjrU|{0+ba4#HaDF>Y(f_c6$no`M
zp2Bw~r52@ao_mzH(LquD2geE4=G1BYhK&w694y5*uI0ritW=9Mat-<sUoriXLDBW=
z-xgG+Z&Q2y_x<0x@9)GkB;z<);x4PkbTXWu?ZDE(aGu5HxHmg?db9O{`|s25=7p<z
z9-6nBr~CiBc&R86SILI2Rko&5y;qVpUieeCJNBhzEXx+v`;ymk%uZi>y>*t4TGr;9
z89#m;@wgl!%g4U;Zr<GITU+mMt5FZon3o{D;c8aujo#zQx(WO5U%$keduF>>!?fdt
z!7OseH*z&Oq(&~=&A6D4asN|g;cN-M_TDGKdv6r1nC~|8*IJebi=0oCScQK6d51w?
zkKw#TXt|@|{Dyk3pKJ?G)~soKb)LI$?R_tXw{~+r+Dp2>NH8!cXRumuihJkTpJ7Zd
z*30!N?8>m7+jsNrkAE9{t{%PFnR#5Rf8qXF|0V9etkR!6`_fly&I1>lK7RSMEb;QX
z^}=?aJRI!q&-nK%X!@VzpC_vA_FjMaetY;*^Z8R5qFf}}mgRXYXgqphWAM|9liPVX
zf7WQp?YFGon`g6s)vvXz6Ig1PT;wWZFLdvoqxabCsWs;b?+mVAhMc)4%f$j%l+N2Q
zDK#AL|GSMNLHUWV0#n7G8~NP~W={85a0tr_UN~<c7~HQ2Od$-Ou6{1-oD!NC0HW#%
A>Hq)$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/meta.json b/Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/meta.json
new file mode 100644
index 000000000000..b33889a2f9e6
--- /dev/null
+++ b/Resources/Textures/_Umbra/Objects/Fun/bobby.rsi/meta.json
@@ -0,0 +1,21 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/commit/2882ed8e1c4b2d6b059973004db40704055d7684, customised by Tych0theSynth",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+      "states": [
+          {
+              "name": "bobby",
+              "delays": [
+                [
+                 120,
+                 120,
+                 120
+                ]
+            ]
+          }
+      ]
+  }
\ No newline at end of file