From 10fe11939dfd7707ad687d6c4093e9896e2571d3 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 6 Jul 2024 18:59:31 +0200 Subject: [PATCH 01/23] ItemBase --- .../Floof/Entities/Clothing/Uniforms/misc.yml | 14 ++++++++++++++ .../Clothing/Uniforms/permit-nude.rsi/icon.png | Bin 0 -> 198 bytes .../Clothing/Uniforms/permit-nude.rsi/meta.json | 14 ++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml new file mode 100644 index 00000000000..91b1f9321dd --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingUniformBase + id: ClothingUniformNudePermit + name: public nudity permit + description: This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide. + components: + - type: Item + size: Small + - type: Sprite + sprite: Floof/Clothing/Uniforms/permit-nude.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/permit-nude.rsi + equipDelay: 0 + unequipDelay: 0 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..728c50b647d8c48df86eb2891bc919813d79dc23 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LKS0JrnmTXP_;|(b1)aZ?^+gFqQ=Q1v5B2yO9Rugn7C+hG4@fk8`P8XGfXK;x%Rn?4n#F!G4X%F0U0O6JPuT7;gNW0`yF p%*>gWmpu$RD8OEJ&}22WQ%mvv4FO#qDJH^cw{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json new file mode 100644 index 00000000000..29892515189 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/VOREStation/VOREStation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} From 4af960e81b2e912ff8359f8999f71ed1d4fcfe72 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 6 Jul 2024 19:11:07 +0200 Subject: [PATCH 02/23] Access --- .../Catalog/VendingMachines/Inventories/clothesmate.yml | 1 + Resources/Prototypes/Loadouts/uniform.yml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 2c4c27137f0..092cdd8b996 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -111,6 +111,7 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 + ClothingUniformNudePermit: 5 # FloofStation contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index 5afdd303c0b..d6d2478917f 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -259,3 +259,11 @@ exclusive: true items: - ClothingUniformColorRainbow + +- type: loadout # FloofStation + id: LoadoutUniformNudePermit + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformNudePermit From 21b3577c2b624c696da14256e180b1c98d6e3ba0 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sun, 7 Jul 2024 13:20:37 +0200 Subject: [PATCH 03/23] Floof Directory and merge conflict fix --- Resources/Prototypes/Floof/Loadouts/uniform.yml | 7 +++++++ Resources/Prototypes/Loadouts/uniform.yml | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/Floof/Loadouts/uniform.yml diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml new file mode 100644 index 00000000000..afe869c5059 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -0,0 +1,7 @@ +- type: loadout + id: LoadoutUniformNudePermit + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformNudePermit diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index d6d2478917f..5afdd303c0b 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -259,11 +259,3 @@ exclusive: true items: - ClothingUniformColorRainbow - -- type: loadout # FloofStation - id: LoadoutUniformNudePermit - category: Uniform - cost: 2 - exclusive: true - items: - - ClothingUniformNudePermit From 4922b3ae35fc316fa44717ed442e7fd2a79a5338 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Fri, 12 Jul 2024 12:50:16 +0200 Subject: [PATCH 04/23] LoinCloth --- .../VendingMachines/Inventories/clothesmate.yml | 2 +- .../Floof/Entities/Clothing/Uniforms/misc.yml | 10 +++++----- Resources/Prototypes/Floof/Loadouts/uniform.yml | 4 ++-- .../Clothing/Uniforms/loincloth.rsi/icon.png | Bin 0 -> 864 bytes .../{permit-nude.rsi => loincloth.rsi}/meta.json | 0 .../Clothing/Uniforms/permit-nude.rsi/icon.png | Bin 198 -> 0 bytes 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png rename Resources/Textures/Floof/Clothing/Uniforms/{permit-nude.rsi => loincloth.rsi}/meta.json (100%) delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 092cdd8b996..aadb05df8e7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -111,7 +111,7 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 - ClothingUniformNudePermit: 5 # FloofStation + ClothingUniformLoinCloth: 5 # FloofStation contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 91b1f9321dd..e5c76890ba5 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -1,14 +1,14 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformNudePermit - name: public nudity permit - description: This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide. + id: ClothingUniformLoinCloth + name: loin cloth + description: A piece of cloth wrapped around the waist. components: - type: Item size: Small - type: Sprite - sprite: Floof/Clothing/Uniforms/permit-nude.rsi + sprite: Floof/Clothing/Uniforms/loincloth.rsi - type: Clothing - sprite: Floof/Clothing/Uniforms/permit-nude.rsi + sprite: Floof/Clothing/Uniforms/loincloth.rsi equipDelay: 0 unequipDelay: 0 diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml index afe869c5059..35c197603f9 100644 --- a/Resources/Prototypes/Floof/Loadouts/uniform.yml +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -1,7 +1,7 @@ - type: loadout - id: LoadoutUniformNudePermit + id: LoadoutUniformLoinCloth category: Uniform cost: 2 exclusive: true items: - - ClothingUniformNudePermit + - ClothingUniformLoinCloth diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4518ffb941430a57e7d486c9b64882bacdbf2f GIT binary patch literal 864 zcmV-m1E2hfP)T2?c4l^xW}CP{L@!!U@IMf|EVg}Fzk_tF>l zh3p7;eda|Qx_v@FCk!2`EWtJV$kLjc5`Wal(@PEtS70H57o&BFNgQ0?^2X^y_O1DA zJ0i9PoIUx1ZHAkShY@w9(YXh&a8PT4wzlz8|2Kk`P9uX%D4S8C4UfjHFRM zYs(v0Rnyu(IXGZ?`mkMG{C2BdXJ38Z7G{Y@9(scH^>w;;Q-aV(sfvd0lIOWxOQ$4s z##)-q33{D^UN@t*sU##}pM-XKZF6uyU75eGf9-70_9m#!9SKxH+>;ShijgRy-z#uj znY~63C5|3t=~gWHClj_$5>lgAx=ATBqbAlOM7CHyBm@;)j_)zV`C7GINZFM(7#pi-op30KZYM)z5cgF z7cPDG$4E|1*{UvibaFpwKapR>>g{#Ohfl2&qE^UHKmQ`#c$kF`uJ7H8=w7|^=llMZ zV@Ir32~R$LkRne>t6U&mlG5eim2b8nr(Slg@2Avto4LzBJh+e1 qy}J0}wST?oo&ff$hJYbp2>2Z&Ej~#dSSXDE0000P_;|(b1)aZ?^+gFqQ=Q1v5B2yO9Rugn7C+hG4@fk8`P8XGfXK;x%Rn?4n#F!G4X%F0U0O6JPuT7;gNW0`yF p%*>gWmpu$RD8OEJ&}22WQ%mvv4FO#qDJH^cw{ From 9865d8a68011a0d1bb2b938b9bad8988935e1d00 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Fri, 12 Jul 2024 12:07:51 -0500 Subject: [PATCH 05/23] Added A new drink! --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../en-US/reagents/floofstation/drinks.ftl | 2 ++ .../VendingMachines/Inventories/soda.yml | 3 ++- .../Objects/Consumable/Drinks/drinks_cans.yml | 19 +++++++++++++ .../FloofStation/Flavors/flavors.yml | 4 +++ .../FloofStation/Reagents/Drinks/drinks.yml | 20 ++++++++++++++ .../Consumable/Drinks/nnn_can.rsi/icon.png | Bin 0 -> 444 bytes .../Drinks/nnn_can.rsi/icon_open.png | Bin 0 -> 449 bytes .../Drinks/nnn_can.rsi/inhand-left.png | Bin 0 -> 430 bytes .../Drinks/nnn_can.rsi/inhand-right.png | Bin 0 -> 422 bytes .../Consumable/Drinks/nnn_can.rsi/meta.json | 25 ++++++++++++++++++ 11 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/reagents/floofstation/drinks.ftl create mode 100644 Resources/Prototypes/FloofStation/Flavors/flavors.yml create mode 100644 Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/meta.json diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 35de5555a29..b69f4934a92 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -210,6 +210,7 @@ flavor-complex-milk = like milk flavor-complex-tea = like tea flavor-complex-ice = like ice flavor-complex-mopwata = like stagnant, dirty water +flavor-complex-nikkonectar = like creamy blueberries. ## Cocktails flavor-complex-long-island = suspiciously like iced tea diff --git a/Resources/Locale/en-US/reagents/floofstation/drinks.ftl b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl new file mode 100644 index 00000000000..0f77ef58b6b --- /dev/null +++ b/Resources/Locale/en-US/reagents/floofstation/drinks.ftl @@ -0,0 +1,2 @@ +reagent-name-NNN = Nikko's Naughty Nectar +reagent-desc-NNN = A sticky, musky white liquid that tastes of blueberries. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 494f05f6a31..f6624966b62 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SodaInventory startingInventory: DrinkColaCan: 3 @@ -7,6 +7,7 @@ DrinkIcedTeaCan: 3 DrinkLemonLimeCan: 3 DrinkFourteenLokoCan: 3 + DrinkNNNCan: 3 emaggedInventory: DrinkNukieCan: 3 DrinkChangelingStingCan: 3 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 38ebc132c9f..f8ada34e648 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -499,3 +499,22 @@ sprite: Objects/Consumable/Drinks/wine_can.rsi - type: Item sprite: Objects/Consumable/Drinks/wine_can.rsi + +#Floof +- type: entity + parent: DrinkCanBaseFull + id: DrinkNNNCan + name: Nikkos Naughty Nectar + description: A can of Nikko's Naughty Nectar! Best not to ask how it's made... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: NikkosNaughtyNectar + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/nnn_can.rsi + - type: Item + sprite: Objects/Consumable/Drinks/nnn_can.rsi diff --git a/Resources/Prototypes/FloofStation/Flavors/flavors.yml b/Resources/Prototypes/FloofStation/Flavors/flavors.yml new file mode 100644 index 00000000000..e9a75f2231f --- /dev/null +++ b/Resources/Prototypes/FloofStation/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: nikkonectar + flavorType: Complex + description: flavor-complex-nikkonectar diff --git a/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml new file mode 100644 index 00000000000..cf39c6e3191 --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reagents/Drinks/drinks.yml @@ -0,0 +1,20 @@ +- type: reagent + id: NikkosNaughtyNectar + name: reagent-name-NNN + parent: BaseDrink + desc: reagent-desc-NNN + physicalDesc: reagent-physical-desc-creamy + flavor: nikkonectar + color: "#deebff" + recognizable: true + viscosity: 0.15 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + #TO-DO Lust+ + footstepSound: + collection: FootstepSticky + params: + volume: 3 diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..85275913d59c252c72fac32e6c862160f43e3071 GIT binary patch literal 444 zcmV;t0YmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0Z~arK~z{rWBmXB zKf^!*CMZ2%VAKJl4j6U7fIEP!f+#wx^S`o!U)q!0l4+{{>+L0wsnVezW{U@;h9Ut68Q!7+s4=9S$f zg#^iIAk5DdOoJ>&2CFvhhO$Tm=s|)H+Z!tV2SovT@PncR6b0If5 zW;a-vg6UcLl?>IckhDQ6AS(ofl=M+(N&s07cz5q2l!XWdasgS1ux||{5q`OQ7fkt+r mPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0ai&wK~z{rWBmXB zKf^!*CMZ2%VAKJl4j6U7fIEP!f+#wx6GfAmu`-y>PYw|PQXjz_A_2(`09hUz=E$J0 ztq$g|+O!)?PwSt_aP!J;Mlgp2KvEQdEQk5l!7&7kK^B9+f&FV3)OB1*4o;HOK$xE^ zn9eFp2h$*+t}F)+36cRQ3W&w_hD!gVGCTf1d-VYYZ{L6NznZqoe{Dqxpfc=wabc3u zfP<0p|CH6c7`FGWfr=o&;pZn9_%5DcxN`3~N$G&BY(^kKZi$eZVCXpj7W~u#Bst)~xx0*fD`&yu9t0?fe-I$6ItC?1D3jsMhi_n- r9Lqs~EC)~%jOKz-2aI$FFfafBGBnlT(>WGr00000NkvXXu0mjf#yGQ7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea78e1b319a7a86f8853afafce025de3af472e25 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB24_zf$B>G+x3dhhm>eZq(`_5XHVS$!)@+Vb z$UR{Ff^(8uYF|Q7Wrxh630@wl;u~V6xo0mq!8+$j{JaTfKXlr@+fB&7^CID#mUZlV|NQuNZ%z8)#H%_S zd#;ogPyT#+_LiIPGK-mC2^-9_S@P~(_piszGsKIN?WD6B`kyM*#>G95o<2kR^UVwK zjRwCBdELVQ9@ZDF-d5h47%9Ur?I>dckV?DI*4-qzfLWZ?_<(tg$Uk)sT6fd4 PVa(v^>gTe~DWM4f*yyTr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/nnn_can.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ea0b1987719a73a48603007700457eca48344592 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB25V0j$B>G+x3dh-F*-`LrN=h9xikmuIB?(V zPNVPz4Ozyi&K4{`wL87kFaDan|3U%l>Ft%=y>H%RrG47xuXKJ^M~`}1_gv3QCZ%UW z5~4&Hmbo%wr5^P6EMI**ul`J2S?@yyP2=$O>Q1vytNy-_^x^Tj`s*svJQMO(&pTJo zfAi~(yWeIlzb>>vfA!z{vGo>*J!ahalQVCh{k;$S*ze2=Ex)zyqn=Mro!NP%3VV^Q z`=?ueQBBY@a<>(2%M4_gA;#K39JNE>{qGNpPa3`2yY*6a^Ts)nCl-GZ>Ues_K`#C- zbCQMegyZ42AMf>h{86d1lJi9kgHJcpfh`(vs;k(a$31(~$qM Date: Fri, 12 Jul 2024 19:29:02 +0200 Subject: [PATCH 06/23] Add #Floofstation comment to SodaInv. Making upstream merge more easy that way. --- .../Prototypes/Catalog/VendingMachines/Inventories/soda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index f6624966b62..d3de4d8dd8d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -7,7 +7,7 @@ DrinkIcedTeaCan: 3 DrinkLemonLimeCan: 3 DrinkFourteenLokoCan: 3 - DrinkNNNCan: 3 + DrinkNNNCan: 3 #Floofstation emaggedInventory: DrinkNukieCan: 3 DrinkChangelingStingCan: 3 From b68171a6a5fa8c61be5b276acff7690f7adb90f7 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 13 Jul 2024 14:16:02 +0200 Subject: [PATCH 07/23] Oops --- Resources/Prototypes/Entities/Mobs/Species/human.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 5b3295b96cb..e00e06279e5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -23,6 +23,7 @@ - SolCommon understands: - GalacticCommon + - SolCommon - type: entity parent: BaseSpeciesDummy From 2ce0bcb4124ff3af5f1a660112d7584bc30c8b03 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow Date: Sat, 13 Jul 2024 14:32:37 -0400 Subject: [PATCH 08/23] pomegranate & aphrodisiacs --- .../aphrodisiacs/aphrodisiacs.ftl | 28 ++++ .../aphrodisiacs/meta/medicine.ftl | 5 + .../aphrodisiacs/meta/narcotics.ftl | 2 + Resources/Locale/en-US/seeds/seeds.ftl | 2 + .../Catalog/Fills/Crates/botany.yml | 1 + .../VendingMachines/Inventories/seeds.yml | 1 + .../Random/Food_Drinks/food_produce.yml | 1 + .../Objects/Consumable/Food/produce.yml | 29 ++++ .../Objects/Specific/Hydroponics/seeds.yml | 11 ++ .../FloofStation/Reactions/chemicals.yml | 15 ++ .../FloofStation/Reactions/medicine.yml | 14 ++ .../Reagents/Aphrodisiacs/medicine.yml | 130 ++++++++++++++++++ .../Reagents/Aphrodisiacs/narcotics.yml | 50 +++++++ Resources/Prototypes/Hydroponics/seeds.yml | 27 ++++ .../Markers/Spawners/Random/seeds.yml | 1 + .../Objects/Specific/Mail/mail_civilian.yml | 2 + .../Guidebook/Medical/Botanicals.xml | 1 + .../Specific/Hydroponics/apple.rsi.zip | Bin 0 -> 5234 bytes .../Hydroponics/pomegranate.rsi/dead.png | Bin 0 -> 390 bytes .../Hydroponics/pomegranate.rsi/harvest.png | Bin 0 -> 800 bytes .../Hydroponics/pomegranate.rsi/meta.json | 41 ++++++ .../Hydroponics/pomegranate.rsi/produce.png | Bin 0 -> 905 bytes .../Hydroponics/pomegranate.rsi/seed.png | Bin 0 -> 467 bytes .../Hydroponics/pomegranate.rsi/stage-1.png | Bin 0 -> 148 bytes .../Hydroponics/pomegranate.rsi/stage-2.png | Bin 0 -> 172 bytes .../Hydroponics/pomegranate.rsi/stage-3.png | Bin 0 -> 203 bytes .../Hydroponics/pomegranate.rsi/stage-4.png | Bin 0 -> 265 bytes .../Hydroponics/pomegranate.rsi/stage-5.png | Bin 0 -> 499 bytes .../Hydroponics/pomegranate.rsi/stage-6.png | Bin 0 -> 584 bytes 29 files changed, 361 insertions(+) create mode 100644 Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl create mode 100644 Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl create mode 100644 Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl create mode 100644 Resources/Prototypes/FloofStation/Reactions/chemicals.yml create mode 100644 Resources/Prototypes/FloofStation/Reactions/medicine.yml create mode 100644 Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml create mode 100644 Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl new file mode 100644 index 00000000000..d02640f1200 --- /dev/null +++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl @@ -0,0 +1,28 @@ +reagent-effect-aphrodisiac-mild1 = You feel a tingling in your chest. +reagent-effect-aphrodisiac-mild2 = Your body feels warm. +reagent-effect-aphrodisiac-mild3 = You feel slightly aroused. +reagent-effect-aphrodisiac-mild4 = You can feel your southern blood pumping. +reagent-effect-aphrodisiac-mild5 = You begin to have inklings of fantasies. +reagent-effect-aphrodisiac-mildoverdose = You feel nauseous. + +reagent-effect-aphrodisiac-normal1 = Your entire body is hot. +reagent-effect-aphrodisiac-normal2 = Everyone is looking at you. They want you. +reagent-effect-aphrodisiac-normal3 = You feel incredibly lustful. +reagent-effect-aphrodisiac-normal4 = Your body buzzes with pleasure. +reagent-effect-aphrodisiac-normal5 = Your clothes feel tight. Why not take them off... +reagent-effect-aphrodisiac-normaloverdose1 = You forget what you were doing. +reagent-effect-aphrodisiac-normaloverdose2 = Your mind feels clouded. +reagent-effect-aphrodisiac-normaloverdose3 = Your heart is pounding. +reagent-effect-aphrodisiac-normaloverdose4 = You feel the need for a nap +reagent-effect-aphrodisiac-normaloverdose5 = Your eyes feel heavy. +reagent-effect-aphrodisiac-normaloverdose6 = You lose your train of thought. + +reagent-effect-aphrodisiac-strong1 = You can't look at someone without wanting to fuck them. +reagent-effect-aphrodisiac-strong2 = You need someone to breed with. +reagent-effect-aphrodisiac-strong3 = Fuck them. Now. +reagent-effect-aphrodisiac-strongoverdose1 = STRIP STRIP STRIP +reagent-effect-aphrodisiac-strongoverdose2 = YOU NEED IT. +reagent-effect-aphrodisiac-strongoverdose3 = FUCK THEM ALL. +reagent-effect-aphrodisiac-strongoverdose4 = YOU HAVE TO BREED AT ALL COSTS. + +reagent-effect-aphrodisiac-fade = Your inhibitions begin to normalize... diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl new file mode 100644 index 00000000000..20cd4df96ff --- /dev/null +++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/medicine.ftl @@ -0,0 +1,5 @@ +reagent-name-pomelustine = pomelustine +reagent-desc-pomelustine = A mild aphrodisiac, present naturally within certain fruits such as pomegranate, usually in too small of a dose to do too much harm. + +reagent-name-philterex = philterex +reagent-desc-philterex = A strong aphrodisiac, not yet regulated by Space Law. It is known for its high use in particular sectors. diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl new file mode 100644 index 00000000000..627d6137252 --- /dev/null +++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/meta/narcotics.ftl @@ -0,0 +1,2 @@ +reagent-name-libidozenithizine = libidozenithizine +reagent-desc-libidozenithizine = An incredibly potent aphrodisiac. A controlled substance under space law, with ample punishment if abused. It will cause even the most reserved to lose their inhibition. Overdose is known to cause Nymphomania. diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index b3983782883..6d843d73403 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -77,6 +77,8 @@ seeds-lily-name = lily seeds-lily-display-name = lily seeds-lingzhi-name = lingzhi seeds-lingzhi-display-name = lingzhi +seeds-pomegranate-name = pomegranate +seeds-pomegranate-display-name = pomegranate seeds-ambrosiavulgaris-name = ambrosia vulgaris seeds-ambrosiavulgaris-display-name = ambrosia vulgaris seeds-ambrosiadeus-name = ambrosia deus diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index f10fd010f64..3b47eb99353 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -95,3 +95,4 @@ - id: GrapeSeeds - id: WatermelonSeeds - id: PeaSeeds + - id: PomegranateSeeds diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 05e3ae0eb0e..2f9b8d529ec 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -22,6 +22,7 @@ OnionSeeds: 5 OnionRedSeeds: 5 OrangeSeeds: 5 + PomegranateSeeds: 3 PoppySeeds: 3 PotatoSeeds: 5 PumpkinSeeds: 5 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index 6edf341e108..d1e7d9f6d42 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -38,6 +38,7 @@ - FoodAloe - FoodPoppy - FoodLingzhi + - FoodPomegranate - FoodAmbrosiaVulgaris - RiceBushel - FoodSoybeans diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index eec7711d4af..95687811ed9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1822,3 +1822,32 @@ - type: Tag tags: - ClothMade + +- type: entity + name: pomegranate + parent: FoodProduceBase + id: FoodPomegranate + description: A delicious, sweet fruit, believed to have special properties. + components: + - type: FlavorProfile + flavors: + - sweet + - spooky + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Pomelustine + Quantity: 30 + - ReagentId: Nutriment + Quantity: 10 + - type: Sprite + sprite: Objects/Specific/Hydroponics/pomegranate.rsi + - type: Produce + seedId: pomegranate + - type: Extractable + grindableSolutionName: food + - type: Tag + tags: + - Fruit diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 2b232d643d3..f5306b1653c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -373,6 +373,17 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/lingzhi.rsi +- type: entity + parent: SeedBase + name: packet of pomegranate seeds + description: "The Fruit of the Underworld" + id: PomegranateSeeds + components: + - type: Seed + seedId: pomegranate + - type: Sprite + sprite: Objects/Specific/Hydroponics/pomegranate.rsi + - type: entity parent: SeedBase name: packet of ambrosia vulgaris seeds diff --git a/Resources/Prototypes/FloofStation/Reactions/chemicals.yml b/Resources/Prototypes/FloofStation/Reactions/chemicals.yml new file mode 100644 index 00000000000..e0e9caed66f --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reactions/chemicals.yml @@ -0,0 +1,15 @@ +- type: reaction + minTemp: 369 + id: Libidozenithizine + impact: High + reactants: + Pomelustine: + amount: 5 + Philterex: + amount: 5 + Impedrezene: + amount: 5 + Silicon: + amount: 5 + products: + Libidozenithizine: 5 diff --git a/Resources/Prototypes/FloofStation/Reactions/medicine.yml b/Resources/Prototypes/FloofStation/Reactions/medicine.yml new file mode 100644 index 00000000000..858a56a8e28 --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reactions/medicine.yml @@ -0,0 +1,14 @@ +- type: reaction + id: Philterex + impact: Medium + reactants: + Inaprovaline: + amount: 2 + Saline: + amount: 1 + Ephedrine: + amount: 1 + Benzene: + amount: 1 + products: + Philterex: 5 diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml new file mode 100644 index 00000000000..10e77d2fdaf --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml @@ -0,0 +1,130 @@ +- type: reagent + id: Pomelustine + name: reagent-name-pomelustine + group: Medicine + desc: reagent-desc-pomelustine + physicalDesc: reagent-physical-desc-sticky + flavor: fruity + color: "#45072f" + metabolisms: + Medicine: + metabolismRate : 0.03 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-aphrodisiac-mild1" + - "reagent-effect-aphrodisiac-mild2" + - "reagent-effect-aphrodisiac-mild3" + - "reagent-effect-aphrodisiac-mild4" + - "reagent-effect-aphrodisiac-mild5" + probability: 0.035 + conditions: + - !type:ReagentThreshold + max: 50 + - !type:PopupMessage # Overdose causes nausea and vomiting + type: Local + visualType: Medium + messages: + - "reagent-effect-aphrodisiac-mildoverdose" + probablity: 0.06 + conditions: + - !type:ReagentThreshold + min: 50 + - !type:Drunk + conditions: + - !type:ReagentThreshold + min: 50 + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 60 + probability: 0.05 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-aphrodisiac-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.35 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Philterex + name: reagent-name-philterex + group: Medicine + desc: reagent-desc-philterex + physicalDesc: reagent-physical-desc-syrupy + flavor: sweet + color: "#ae0072" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-aphrodisiac-normal1" + - "reagent-effect-aphrodisiac-normal2" + - "reagent-effect-aphrodisiac-normal3" + - "reagent-effect-aphrodisiac-normal4" + - "reagent-effect-aphrodisiac-normal5" + probability: 0.04 + conditions: + - !type:ReagentThreshold + max: 16.5 + - !type:PopupMessage + type: Local + visualType: MediumCaution + messages: + - "reagent-effect-aphrodisiac-normaloverdose1" # overdose makes you tired and forgetful + - "reagent-effect-aphrodisiac-normaloverdose2" + - "reagent-effect-aphrodisiac-normaloverdose3" + - "reagent-effect-aphrodisiac-normaloverdose4" + - "reagent-effect-aphrodisiac-normaloverdose5" + - "reagent-effect-aphrodisiac-normaloverdose6" + probability: 0.06 + conditions: + - !type:ReagentThreshold + min: 16.5 + - !type:Emote + conditions: + - !type:ReagentThreshold + min: 16.5 + emote: Yawn + showInChat: true + probability: 0.02 + - !type:MovespeedModifier + walkSpeedModifier: 0.8 + sprintSpeedModifier: 0.8 + conditions: + - !type:ReagentThreshold + min: 16.5 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 30.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.1 + - !type:HealthChange # poisons you if you take way too much + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: + Poison: 1 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-aphrodisiac-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.32 + conditions: + - !type:ReagentThreshold + max: 0.1 diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml new file mode 100644 index 00000000000..702bd1593a3 --- /dev/null +++ b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/narcotics.yml @@ -0,0 +1,50 @@ +- type: reagent + id: Libidozenithizine + name: reagent-name-libidozenithizine + group: Narcotics + desc: reagent-desc-libidozenithizine + physicalDesc: reagent-physical-desc-milky + flavor: spooky + color: "#c90084" + metabolisms: + Narcotic: + effects: + - !type:PopupMessage + type: Local + visualType: Medium + probability: 0.10 + messages: + - reagent-effect-aphrodisiac-strong1 + - reagent-effect-aphrodisiac-strong2 + - reagent-effect-aphrodisiac-strong3 + conditions: + - !type:ReagentThreshold + max: 10.0 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 10.0 + damage: + types: + Poison: 0.05 + - !type:PopupMessage + type: Local + visualType: LargeCaution + probability: 0.2 + messages: + - reagent-effect-aphrodisiac-strongoverdose1 + - reagent-effect-aphrodisiac-strongoverdose2 + - reagent-effect-aphrodisiac-strongoverdose3 + - reagent-effect-aphrodisiac-strongoverdose4 + conditions: + - !type:ReagentThreshold + min: 10.0 + - !type:PopupMessage + type: Local + visualType: Small + probability: 0.2 + messages: + - "reagent-effect-aphrodisiac-fade" + conditions: + - !type:ReagentThreshold + max: 0.1 diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 82a3fba5b41..c61c85ae86b 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1032,6 +1032,33 @@ Max: 20 PotencyDivisor: 5 +- type: seed + id: pomegranate + name: seeds-pomegranate-name + noun: seeds-noun-seeds + displayName: seeds-pomegranate-display-name + plantRsi: Objects/Specific/Hydroponics/pomegranate.rsi + packetPrototype: PomegranateSeeds + productPrototypes: + - FoodPomegranate + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + waterConsumption: 0.60 + chemicals: + Pomelustine: + Min: 5 + Max: 30 + PotencyDivisor: 10 + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 25 + - type: seed id: ambrosiaVulgaris name: seeds-ambrosiavulgaris-name diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml index 0c3370890c8..83a20623c8c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml @@ -33,6 +33,7 @@ - AloeSeeds - PoppySeeds - LingzhiSeeds + - PomegranateSeeds - AmbrosiaVulgarisSeeds - GalaxythistleSeeds - FlyAmanitaSeeds diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml index a41fac14ffa..75be319559d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -57,6 +57,8 @@ orGroup: Seeds - id: LingzhiSeeds orGroup: Seeds + - id: PomegranateSeeds + orGroup: Seeds - id: OatSeeds orGroup: Seeds - id: OnionSeeds diff --git a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml index 60153e87e8c..35668bc6cc8 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Botanicals.xml @@ -6,6 +6,7 @@ Botany and Chemistry can often work together to produce better medicine (or recr + diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip new file mode 100644 index 0000000000000000000000000000000000000000..fa07018ef005889f96b97898307e832c0c5126ed GIT binary patch literal 5234 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 Z;#-0=)(7o$1px-~)kDstp{zUq{s(#rL)8EP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..817c0f4bff16fee612ea7c54b594e29462015f5f GIT binary patch literal 390 zcmV;10eSw3P)6gV^dr>h0X{IwZWvK-kUY(By!Pc_StEx~6fvcqT^>@#Dq8xFIS=5Y?Q1e-%> z7W~)@E^ub}U*OE}|Kc3){|pScLxySqW;x7aWQWX*K^4R1c$$F_BZTGXK~L4Fz~>Y6 zP@%fz$QEJCj@TTB%~2EsTm=$(uAoW0!kq$qwl8)P@^$agO)@BV`Q#&pu>e=-$P^h#dT`S`amcEewq3YZ(4VnL+f@exXbwvBLs$J!8x%E|5wM^Vd%kS4g&*;+3YAX9X8WNB|8RBvx=!KdMT00083 zNklJUO?(V;(3 z9Ynnp1mYp8J&1@18Ab>pQ60)Il9jgv{}4-}yP%t!I~{&L*Mw5v6Q%H7=FJSueCGT8 z&dht7Qi|1lw0|C;pi@(CPbf_>xT!bOcg!q;3d6A9Sb%Y%Z9d1WP7N z4nn#YocYoRkX4TIENZkw*12FautQ!R` zV>iS`!ICZgx*CQ7e6^agy5M>b+}$T~0z^k3$pZ1%4Cotpo(4b1MJZ=KM2Dr%lmebg zOVERw$OuOP(kmM<*Caq*wJ0z-2=OSm12P#v ztpijXR1CJ1OM7Dx9B+g6{Q_Xx0#Bu;v}91zP!WQsg^7TDvBASQJZQJ$FD+wFevqjU zSY3%Qnzmqm5NkT5P0vHP7mDkw)Vpl>sv=ljiCu8(yny*~f(t_Y5#YsEhw_(}vE32G zk^#^T^j&BTT@ za6A(*&sdO(5OiN$od1hD2|bmXatGi@AN04w`)!i+QF5zN!e-ebDs@0l5sh-xj~>WxI}jwVLuimiN}rOTUUu0W_V}R96pRht?0q zCN~98?w$DtSXBV~jQlGNFjsyijQejGVD9R{9E2eNEpSy48BH{#XQ5i^R(2Px{THkO etO5Kt0KWi}MsUz;0AjZQ0000YAX9X8WNB|8RBvx=!KdMT0009N zNkla%ixI>SdFuc_5aTI})ymF@ei9dtSG>wi7)y?R%Ttpe}9^}J-eJ&wZ^!L4;J zh904Y&)W$AuT2Hu1f6J7Igd^+W}};&3G$zS_pd!CtxSp+H}3LS{gAp9G~j@5ItlO0 zm+0*!ti1jT$>vY2|F%u5(*fYs-`i>|ci_fLOY*{2gHr6Vr4lk8e07p=CFcXM^29l& zpI*kMv$(BIYP&V=HTU_pbuv^HhWZSz7X!JH^ZD#J2H@>#fum-JBygmCp9>3BrZXXK zw#vb;KU3R3WbgQxA0j&tF%WRQ7(58*XI;o+NVffc~w2CS_270$NU((*e$hFz{KLEt3ucv{G~m^Q^CZ4KT0@Lj&?!F&Fvh zv?Z{HU1vG(g-BjFiF#BE)8xaDY&wN=jvw#sVx1dUg@J(8N?PWOqWf2vr=V;!o>LgB zv4MTimic0V)a9$RZrx_LxkDGlMyowKV99yxJK;zK(ZZrO6s@7IEl-v_nw=P>6!|bs zFjJw|sI%9NIE)kiurfNJq!kBFn9_YAX9X8WNB|8RBvx=!KdMT0004A zNklwm3H_KN2!w`~=E9-Y{s@PtwU&bB zz$xgZA&D|4%S8}eqR5PD33{(d>CKe)mG`ZNyXA)GxaV{C+#RO~A^6LtNPq-LfCN|t zBm)T%^GDIk8JhI~k(*V;6~OxF3b|sQ$m|5!lZ(1u3x&xQ^R^JSN{|dBL{RN+7+)Nj z1F(f?2{7Ob{unP*N+yIWfS5mu77EwJs;dTSrEnCG9o`q!$pMaT=Xrd42ViYXH$hwj zRFiL2meC3i^m-Jgm*QNeju{_Jna1y2AFy$^?F``i>NnFa5 zoyZmQ=;e&FfUkAmy^7JLDtrJ#YC9gUhxE(y?*Rbz&S&WK8ayc~K4B1#oSM#oqkv|o zztL@Q1z@!mDkVzBy>kFN2s_DJdWfuyvzlD~2P8lOB;a2FJ^>wq6VL}XL#F@$002ov JPDHLkV1m*Y#m@i$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..97245d27f2f3a08dc02d24b43da44d76e47ebbae GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXipc%kcv6U2@(|PS92R5vlZL=AqpH*3ofx%r?aM{jpw@rc8FnGH9xvXR!SWfr>~)Bsx2z{p_0A+CJ+ SKd%?idInEdKbLh*2~7a-c{?ru literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..37bd6d53d116718c2ecafc38c3300360fa6e44a6 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNuDl_Ar*6y6C_v{Cy4Yk1sYsw zd>YpFpE+&g!#RwbWNr#hnRU>mbLr*2;4E87K8tr}4^-@9yZpSwpZj^X#J|HbO=lfT z7>$z!`V_<`$gsXRu%WfF&_UKgbHNG5>+|^+FsB`JcqHdGnfpZ7ex`IEZ}m5-=XJ!2 xOne3OQWJjs;Zr=IedNG_3%-4U5bF;xFf?^(gycWwZ3nuJ!PC{xWt~$(69D*&OQrw- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png new file mode 100644 index 0000000000000000000000000000000000000000..8667357c88a00bb887b013ff128085dee45a9c27 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3!W~HAr*6y6C_v{H!v0KYkTzI?C9Eg@Olf@h*}8>cy#O<_v-!?Epz{+%dI}gALUk*uPrT`x0`wb$ Mr>mdKI;Vst0022+{r~^~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2100edd39f83efe9b6f64278bd4f7cadb730bf GIT binary patch literal 499 zcmVC!f=^~t_8g|1Vf<6O&xK508jhQ^E%pS>WFNGfT|Rrk(T88 z161~;n70%69ax?AGFe9)-9jk=#T0@oXyzrE>PE|wdpEX6&${Wv2x2wcT;qOoacMf` ze05GU2G_ITN@22&=)B6-uZ3afLdKhUx$atU`Yes>H0R7IP%w4*In;OVS~fXIgB%r_jndkxpv@A&u(0HG3{-^#KO+tC= p7=mARV0{xf^QvKqC6@T-_yOBF!+5?w`f&gN002ovPDHLkV1m4G=*<8C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..be279f7c12c5bff3102e8e81ab4567eb0c386c7a GIT binary patch literal 584 zcmV-O0=NB%P)|VsTiUMZilD4^o&SSS4U#ca2uZ zR%(5XSS+kpSp<|VRumSCWt+8l4zt0S{gFTl?=|0<9cI4o`@V1H4wkqeT#qattHP<9 zbl$gn^U3FZ9M>aDLTI!!uSLKdde#A*eX?d(<0Q1-(+HYf7|mdJ6M~)M0tSjD0w|`?n%RD8rsPL%BR zLs(yx)UmHNw8u)GMrujklx1)(Q`aLK%~X}?^`vJd9|j_2$fS{VzUz_2e(_DH)Pj5> z6F~}1dKx!c)vjTshsfN5eDBv+mCO*_JE`V_QXX(UvbT@O+GCqM_O+Hz-t1}~`{keJ zLIQaoe0i)2K`mJPFQZbKR4U5G#)oqe+V?=?RBQ17hT1dg}K7NOek=2QK1O5K99u&DUr zT{;0!^;bgRc-!9bjT=`$!1NvzpWLhWe-Pk$olS?gp2Erx`(f=S@S-keOi literal 0 HcmV?d00001 From 70a23e02c38b2b66d1889ce6c2c1188527293be5 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:31:26 -0400 Subject: [PATCH 09/23] Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index f5306b1653c..b240a792992 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -373,7 +373,7 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/lingzhi.rsi -- type: entity +- type: entity # Floofstation parent: SeedBase name: packet of pomegranate seeds description: "The Fruit of the Underworld" From 03b7a45e5f29d599ab7b08aa1b97718a479c4cd1 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:31:40 -0400 Subject: [PATCH 10/23] Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 95687811ed9..f8c938cfefa 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1823,7 +1823,7 @@ tags: - ClothMade -- type: entity +- type: entity # Floofttation name: pomegranate parent: FoodProduceBase id: FoodPomegranate From fcf0daac230f7eb5f65e867841c969b1ba9677dc Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:31:46 -0400 Subject: [PATCH 11/23] Update Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Prototypes/Catalog/VendingMachines/Inventories/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 2f9b8d529ec..c732fa5268c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -22,7 +22,7 @@ OnionSeeds: 5 OnionRedSeeds: 5 OrangeSeeds: 5 - PomegranateSeeds: 3 + PomegranateSeeds: 3 # Floofstation PoppySeeds: 3 PotatoSeeds: 5 PumpkinSeeds: 5 From 78e317da673bf40e3e7a03c54d679bfd95251abf Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:31:52 -0400 Subject: [PATCH 12/23] Update Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Markers/Spawners/Random/Food_Drinks/food_produce.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index d1e7d9f6d42..5286c3f6fb9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -38,7 +38,7 @@ - FoodAloe - FoodPoppy - FoodLingzhi - - FoodPomegranate + - FoodPomegranate # Floofstation - FoodAmbrosiaVulgaris - RiceBushel - FoodSoybeans From e384d5f32a0d112226e9f827a177c8c630e229cc Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:31:59 -0400 Subject: [PATCH 13/23] Update Resources/Prototypes/Hydroponics/seeds.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- Resources/Prototypes/Hydroponics/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index c61c85ae86b..8d7a9e4e397 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1032,7 +1032,7 @@ Max: 20 PotencyDivisor: 5 -- type: seed +- type: seed # Floofstation id: pomegranate name: seeds-pomegranate-name noun: seeds-noun-seeds From 8b6d50b89940638a60465e2cae662e9cb1ba9f6e Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:32:05 -0400 Subject: [PATCH 14/23] Update Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml index 83a20623c8c..2c2afb9eff6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml @@ -33,7 +33,7 @@ - AloeSeeds - PoppySeeds - LingzhiSeeds - - PomegranateSeeds + - PomegranateSeeds # Floofstation - AmbrosiaVulgarisSeeds - GalaxythistleSeeds - FlyAmanitaSeeds From f581fc8d306b9daca183464118e6b2e8a6313522 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:32:10 -0400 Subject: [PATCH 15/23] Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Entities/Objects/Specific/Mail/mail_civilian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml index 75be319559d..fb6dc343a1d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -57,7 +57,7 @@ orGroup: Seeds - id: LingzhiSeeds orGroup: Seeds - - id: PomegranateSeeds + - id: PomegranateSeeds # Floofstation orGroup: Seeds - id: OatSeeds orGroup: Seeds From 8445eff1b57ee69d4d8508f9d597cd6e514d4cff Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 13 Jul 2024 21:44:28 +0200 Subject: [PATCH 16/23] Remove Apple.rsi.zip --- .../Objects/Specific/Hydroponics/apple.rsi.zip | Bin 5234 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi.zip deleted file mode 100644 index fa07018ef005889f96b97898307e832c0c5126ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5234 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 Z;#-0=)(7o$1px-~)kDstp{zUq{s(#rL)8EP From d4e66f7e4819c00fe8813974012c9e8e6369ed76 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow Date: Sat, 13 Jul 2024 16:37:12 -0400 Subject: [PATCH 17/23] moved Pomegranate Sprites. --- .../Hydroponics/pomegranate.rsi/dead.png | Bin .../Hydroponics/pomegranate.rsi/harvest.png | Bin .../Hydroponics/pomegranate.rsi/meta.json | 0 .../Hydroponics/pomegranate.rsi/produce.png | Bin .../Hydroponics/pomegranate.rsi/seed.png | Bin .../Hydroponics/pomegranate.rsi/stage-1.png | Bin .../Hydroponics/pomegranate.rsi/stage-2.png | Bin .../Hydroponics/pomegranate.rsi/stage-3.png | Bin .../Hydroponics/pomegranate.rsi/stage-4.png | Bin .../Hydroponics/pomegranate.rsi/stage-5.png | Bin .../Hydroponics/pomegranate.rsi/stage-6.png | Bin .../Textures/Floof/pomegranate.rsi/dead.png | Bin 0 -> 390 bytes .../Floof/pomegranate.rsi/harvest.png | Bin 0 -> 800 bytes .../Textures/Floof/pomegranate.rsi/meta.json | 41 ++++++++++++++++++ .../Floof/pomegranate.rsi/produce.png | Bin 0 -> 905 bytes .../Textures/Floof/pomegranate.rsi/seed.png | Bin 0 -> 467 bytes .../Floof/pomegranate.rsi/stage-1.png | Bin 0 -> 148 bytes .../Floof/pomegranate.rsi/stage-2.png | Bin 0 -> 172 bytes .../Floof/pomegranate.rsi/stage-3.png | Bin 0 -> 203 bytes .../Floof/pomegranate.rsi/stage-4.png | Bin 0 -> 265 bytes .../Floof/pomegranate.rsi/stage-5.png | Bin 0 -> 499 bytes .../Floof/pomegranate.rsi/stage-6.png | Bin 0 -> 584 bytes 22 files changed, 41 insertions(+) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png (100%) rename Resources/Textures/{ => Floof}/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png (100%) create mode 100644 Resources/Textures/Floof/pomegranate.rsi/dead.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/harvest.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/meta.json create mode 100644 Resources/Textures/Floof/pomegranate.rsi/produce.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/seed.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-1.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-2.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-3.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-4.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-5.png create mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-6.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/dead.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/harvest.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/meta.json diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/produce.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/seed.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-1.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-2.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-3.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-4.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-5.png diff --git a/Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png b/Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png similarity index 100% rename from Resources/Textures/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png rename to Resources/Textures/Floof/Objects/Specific/Hydroponics/pomegranate.rsi/stage-6.png diff --git a/Resources/Textures/Floof/pomegranate.rsi/dead.png b/Resources/Textures/Floof/pomegranate.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..817c0f4bff16fee612ea7c54b594e29462015f5f GIT binary patch literal 390 zcmV;10eSw3P)6gV^dr>h0X{IwZWvK-kUY(By!Pc_StEx~6fvcqT^>@#Dq8xFIS=5Y?Q1e-%> z7W~)@E^ub}U*OE}|Kc3){|pScLxySqW;x7aWQWX*K^4R1c$$F_BZTGXK~L4Fz~>Y6 zP@%fz$QEJCj@TTB%~2EsTm=$(uAoW0!kq$qwl8)P@^$agO)@BV`Q#&pu>e=-$P^h#dT`S`amcEewq3YZ(4VnL+f@exXbwvBLs$J!8x%E|5wM^Vd%kS4g&*;+3YAX9X8WNB|8RBvx=!KdMT00083 zNklJUO?(V;(3 z9Ynnp1mYp8J&1@18Ab>pQ60)Il9jgv{}4-}yP%t!I~{&L*Mw5v6Q%H7=FJSueCGT8 z&dht7Qi|1lw0|C;pi@(CPbf_>xT!bOcg!q;3d6A9Sb%Y%Z9d1WP7N z4nn#YocYoRkX4TIENZkw*12FautQ!R` zV>iS`!ICZgx*CQ7e6^agy5M>b+}$T~0z^k3$pZ1%4Cotpo(4b1MJZ=KM2Dr%lmebg zOVERw$OuOP(kmM<*Caq*wJ0z-2=OSm12P#v ztpijXR1CJ1OM7Dx9B+g6{Q_Xx0#Bu;v}91zP!WQsg^7TDvBASQJZQJ$FD+wFevqjU zSY3%Qnzmqm5NkT5P0vHP7mDkw)Vpl>sv=ljiCu8(yny*~f(t_Y5#YsEhw_(}vE32G zk^#^T^j&BTT@ za6A(*&sdO(5OiN$od1hD2|bmXatGi@AN04w`)!i+QF5zN!e-ebDs@0l5sh-xj~>WxI}jwVLuimiN}rOTUUu0W_V}R96pRht?0q zCN~98?w$DtSXBV~jQlGNFjsyijQejGVD9R{9E2eNEpSy48BH{#XQ5i^R(2Px{THkO etO5Kt0KWi}MsUz;0AjZQ0000YAX9X8WNB|8RBvx=!KdMT0009N zNkla%ixI>SdFuc_5aTI})ymF@ei9dtSG>wi7)y?R%Ttpe}9^}J-eJ&wZ^!L4;J zh904Y&)W$AuT2Hu1f6J7Igd^+W}};&3G$zS_pd!CtxSp+H}3LS{gAp9G~j@5ItlO0 zm+0*!ti1jT$>vY2|F%u5(*fYs-`i>|ci_fLOY*{2gHr6Vr4lk8e07p=CFcXM^29l& zpI*kMv$(BIYP&V=HTU_pbuv^HhWZSz7X!JH^ZD#J2H@>#fum-JBygmCp9>3BrZXXK zw#vb;KU3R3WbgQxA0j&tF%WRQ7(58*XI;o+NVffc~w2CS_270$NU((*e$hFz{KLEt3ucv{G~m^Q^CZ4KT0@Lj&?!F&Fvh zv?Z{HU1vG(g-BjFiF#BE)8xaDY&wN=jvw#sVx1dUg@J(8N?PWOqWf2vr=V;!o>LgB zv4MTimic0V)a9$RZrx_LxkDGlMyowKV99yxJK;zK(ZZrO6s@7IEl-v_nw=P>6!|bs zFjJw|sI%9NIE)kiurfNJq!kBFn9_YAX9X8WNB|8RBvx=!KdMT0004A zNklwm3H_KN2!w`~=E9-Y{s@PtwU&bB zz$xgZA&D|4%S8}eqR5PD33{(d>CKe)mG`ZNyXA)GxaV{C+#RO~A^6LtNPq-LfCN|t zBm)T%^GDIk8JhI~k(*V;6~OxF3b|sQ$m|5!lZ(1u3x&xQ^R^JSN{|dBL{RN+7+)Nj z1F(f?2{7Ob{unP*N+yIWfS5mu77EwJs;dTSrEnCG9o`q!$pMaT=Xrd42ViYXH$hwj zRFiL2meC3i^m-Jgm*QNeju{_Jna1y2AFy$^?F``i>NnFa5 zoyZmQ=;e&FfUkAmy^7JLDtrJ#YC9gUhxE(y?*Rbz&S&WK8ayc~K4B1#oSM#oqkv|o zztL@Q1z@!mDkVzBy>kFN2s_DJdWfuyvzlD~2P8lOB;a2FJ^>wq6VL}XL#F@$002ov JPDHLkV1m*Y#m@i$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-1.png b/Resources/Textures/Floof/pomegranate.rsi/stage-1.png new file mode 100644 index 0000000000000000000000000000000000000000..97245d27f2f3a08dc02d24b43da44d76e47ebbae GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXipc%kcv6U2@(|PS92R5vlZL=AqpH*3ofx%r?aM{jpw@rc8FnGH9xvXR!SWfr>~)Bsx2z{p_0A+CJ+ SKd%?idInEdKbLh*2~7a-c{?ru literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-3.png b/Resources/Textures/Floof/pomegranate.rsi/stage-3.png new file mode 100644 index 0000000000000000000000000000000000000000..37bd6d53d116718c2ecafc38c3300360fa6e44a6 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNuDl_Ar*6y6C_v{Cy4Yk1sYsw zd>YpFpE+&g!#RwbWNr#hnRU>mbLr*2;4E87K8tr}4^-@9yZpSwpZj^X#J|HbO=lfT z7>$z!`V_<`$gsXRu%WfF&_UKgbHNG5>+|^+FsB`JcqHdGnfpZ7ex`IEZ}m5-=XJ!2 xOne3OQWJjs;Zr=IedNG_3%-4U5bF;xFf?^(gycWwZ3nuJ!PC{xWt~$(69D*&OQrw- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-4.png b/Resources/Textures/Floof/pomegranate.rsi/stage-4.png new file mode 100644 index 0000000000000000000000000000000000000000..8667357c88a00bb887b013ff128085dee45a9c27 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3!W~HAr*6y6C_v{H!v0KYkTzI?C9Eg@Olf@h*}8>cy#O<_v-!?Epz{+%dI}gALUk*uPrT`x0`wb$ Mr>mdKI;Vst0022+{r~^~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-5.png b/Resources/Textures/Floof/pomegranate.rsi/stage-5.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2100edd39f83efe9b6f64278bd4f7cadb730bf GIT binary patch literal 499 zcmVC!f=^~t_8g|1Vf<6O&xK508jhQ^E%pS>WFNGfT|Rrk(T88 z161~;n70%69ax?AGFe9)-9jk=#T0@oXyzrE>PE|wdpEX6&${Wv2x2wcT;qOoacMf` ze05GU2G_ITN@22&=)B6-uZ3afLdKhUx$atU`Yes>H0R7IP%w4*In;OVS~fXIgB%r_jndkxpv@A&u(0HG3{-^#KO+tC= p7=mARV0{xf^QvKqC6@T-_yOBF!+5?w`f&gN002ovPDHLkV1m4G=*<8C literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-6.png b/Resources/Textures/Floof/pomegranate.rsi/stage-6.png new file mode 100644 index 0000000000000000000000000000000000000000..be279f7c12c5bff3102e8e81ab4567eb0c386c7a GIT binary patch literal 584 zcmV-O0=NB%P)|VsTiUMZilD4^o&SSS4U#ca2uZ zR%(5XSS+kpSp<|VRumSCWt+8l4zt0S{gFTl?=|0<9cI4o`@V1H4wkqeT#qattHP<9 zbl$gn^U3FZ9M>aDLTI!!uSLKdde#A*eX?d(<0Q1-(+HYf7|mdJ6M~)M0tSjD0w|`?n%RD8rsPL%BR zLs(yx)UmHNw8u)GMrujklx1)(Q`aLK%~X}?^`vJd9|j_2$fS{VzUz_2e(_DH)Pj5> z6F~}1dKx!c)vjTshsfN5eDBv+mCO*_JE`V_QXX(UvbT@O+GCqM_O+Hz-t1}~`{keJ zLIQaoe0i)2K`mJPFQZbKR4U5G#)oqe+V?=?RBQ17hT1dg}K7NOek=2QK1O5K99u&DUr zT{;0!^;bgRc-!9bjT=`$!1NvzpWLhWe-Pk$olS?gp2Erx`(f=S@S-keOi literal 0 HcmV?d00001 From be620a4c3033c117999e4d2dd992e7aa4492cc14 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 16:55:58 -0400 Subject: [PATCH 18/23] Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Consumable/Food/produce.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index f8c938cfefa..8eb36c71b51 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1843,7 +1843,7 @@ - ReagentId: Nutriment Quantity: 10 - type: Sprite - sprite: Objects/Specific/Hydroponics/pomegranate.rsi + sprite: Floof/Objects/Specific/Hydroponics/pomegranate.rsi - type: Produce seedId: pomegranate - type: Extractable From 2e094218d92553160f8f900292d74b637d1bf185 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 16:56:46 -0400 Subject: [PATCH 19/23] Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index b240a792992..b8a19d5add5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -382,7 +382,7 @@ - type: Seed seedId: pomegranate - type: Sprite - sprite: Objects/Specific/Hydroponics/pomegranate.rsi + sprite: Floof/Objects/Specific/Hydroponics/pomegranate.rsi - type: entity parent: SeedBase From 966d9b5b3e4da480fa1fdd92aa86ec81262a517a Mon Sep 17 00:00:00 2001 From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com> Date: Sat, 13 Jul 2024 16:56:53 -0400 Subject: [PATCH 20/23] Update Resources/Prototypes/Hydroponics/seeds.yml Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- Resources/Prototypes/Hydroponics/seeds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 8d7a9e4e397..851c3c14bf1 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1037,7 +1037,7 @@ name: seeds-pomegranate-name noun: seeds-noun-seeds displayName: seeds-pomegranate-display-name - plantRsi: Objects/Specific/Hydroponics/pomegranate.rsi + plantRsi: Floof/Objects/Specific/Hydroponics/pomegranate.rsi packetPrototype: PomegranateSeeds productPrototypes: - FoodPomegranate From f57772e2b5de95927fbb0f502c8cc4a7a3688674 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow Date: Sat, 13 Jul 2024 17:00:12 -0400 Subject: [PATCH 21/23] deleted duplicates --- .../Textures/Floof/pomegranate.rsi/dead.png | Bin 390 -> 0 bytes .../Floof/pomegranate.rsi/harvest.png | Bin 800 -> 0 bytes .../Textures/Floof/pomegranate.rsi/meta.json | 41 ------------------ .../Floof/pomegranate.rsi/produce.png | Bin 905 -> 0 bytes .../Textures/Floof/pomegranate.rsi/seed.png | Bin 467 -> 0 bytes .../Floof/pomegranate.rsi/stage-1.png | Bin 148 -> 0 bytes .../Floof/pomegranate.rsi/stage-2.png | Bin 172 -> 0 bytes .../Floof/pomegranate.rsi/stage-3.png | Bin 203 -> 0 bytes .../Floof/pomegranate.rsi/stage-4.png | Bin 265 -> 0 bytes .../Floof/pomegranate.rsi/stage-5.png | Bin 499 -> 0 bytes .../Floof/pomegranate.rsi/stage-6.png | Bin 584 -> 0 bytes 11 files changed, 41 deletions(-) delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/dead.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/harvest.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/meta.json delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/produce.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/seed.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-1.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-2.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-3.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-4.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-5.png delete mode 100644 Resources/Textures/Floof/pomegranate.rsi/stage-6.png diff --git a/Resources/Textures/Floof/pomegranate.rsi/dead.png b/Resources/Textures/Floof/pomegranate.rsi/dead.png deleted file mode 100644 index 817c0f4bff16fee612ea7c54b594e29462015f5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmV;10eSw3P)6gV^dr>h0X{IwZWvK-kUY(By!Pc_StEx~6fvcqT^>@#Dq8xFIS=5Y?Q1e-%> z7W~)@E^ub}U*OE}|Kc3){|pScLxySqW;x7aWQWX*K^4R1c$$F_BZTGXK~L4Fz~>Y6 zP@%fz$QEJCj@TTB%~2EsTm=$(uAoW0!kq$qwl8)P@^$agO)@BV`Q#&pu>e=-$P^h#dT`S`amcEewq3YZ(4VnL+f@exXbwvBLs$J!8x%E|5wM^Vd%kS4g&*;+3YAX9X8WNB|8RBvx=!KdMT00083 zNklJUO?(V;(3 z9Ynnp1mYp8J&1@18Ab>pQ60)Il9jgv{}4-}yP%t!I~{&L*Mw5v6Q%H7=FJSueCGT8 z&dht7Qi|1lw0|C;pi@(CPbf_>xT!bOcg!q;3d6A9Sb%Y%Z9d1WP7N z4nn#YocYoRkX4TIENZkw*12FautQ!R` zV>iS`!ICZgx*CQ7e6^agy5M>b+}$T~0z^k3$pZ1%4Cotpo(4b1MJZ=KM2Dr%lmebg zOVERw$OuOP(kmM<*Caq*wJ0z-2=OSm12P#v ztpijXR1CJ1OM7Dx9B+g6{Q_Xx0#Bu;v}91zP!WQsg^7TDvBASQJZQJ$FD+wFevqjU zSY3%Qnzmqm5NkT5P0vHP7mDkw)Vpl>sv=ljiCu8(yny*~f(t_Y5#YsEhw_(}vE32G zk^#^T^j&BTT@ za6A(*&sdO(5OiN$od1hD2|bmXatGi@AN04w`)!i+QF5zN!e-ebDs@0l5sh-xj~>WxI}jwVLuimiN}rOTUUu0W_V}R96pRht?0q zCN~98?w$DtSXBV~jQlGNFjsyijQejGVD9R{9E2eNEpSy48BH{#XQ5i^R(2Px{THkO etO5Kt0KWi}MsUz;0AjZQ0000YAX9X8WNB|8RBvx=!KdMT0009N zNkla%ixI>SdFuc_5aTI})ymF@ei9dtSG>wi7)y?R%Ttpe}9^}J-eJ&wZ^!L4;J zh904Y&)W$AuT2Hu1f6J7Igd^+W}};&3G$zS_pd!CtxSp+H}3LS{gAp9G~j@5ItlO0 zm+0*!ti1jT$>vY2|F%u5(*fYs-`i>|ci_fLOY*{2gHr6Vr4lk8e07p=CFcXM^29l& zpI*kMv$(BIYP&V=HTU_pbuv^HhWZSz7X!JH^ZD#J2H@>#fum-JBygmCp9>3BrZXXK zw#vb;KU3R3WbgQxA0j&tF%WRQ7(58*XI;o+NVffc~w2CS_270$NU((*e$hFz{KLEt3ucv{G~m^Q^CZ4KT0@Lj&?!F&Fvh zv?Z{HU1vG(g-BjFiF#BE)8xaDY&wN=jvw#sVx1dUg@J(8N?PWOqWf2vr=V;!o>LgB zv4MTimic0V)a9$RZrx_LxkDGlMyowKV99yxJK;zK(ZZrO6s@7IEl-v_nw=P>6!|bs zFjJw|sI%9NIE)kiurfNJq!kBFn9_YAX9X8WNB|8RBvx=!KdMT0004A zNklwm3H_KN2!w`~=E9-Y{s@PtwU&bB zz$xgZA&D|4%S8}eqR5PD33{(d>CKe)mG`ZNyXA)GxaV{C+#RO~A^6LtNPq-LfCN|t zBm)T%^GDIk8JhI~k(*V;6~OxF3b|sQ$m|5!lZ(1u3x&xQ^R^JSN{|dBL{RN+7+)Nj z1F(f?2{7Ob{unP*N+yIWfS5mu77EwJs;dTSrEnCG9o`q!$pMaT=Xrd42ViYXH$hwj zRFiL2meC3i^m-Jgm*QNeju{_Jna1y2AFy$^?F``i>NnFa5 zoyZmQ=;e&FfUkAmy^7JLDtrJ#YC9gUhxE(y?*Rbz&S&WK8ayc~K4B1#oSM#oqkv|o zztL@Q1z@!mDkVzBy>kFN2s_DJdWfuyvzlD~2P8lOB;a2FJ^>wq6VL}XL#F@$002ov JPDHLkV1m*Y#m@i$ diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-1.png b/Resources/Textures/Floof/pomegranate.rsi/stage-1.png deleted file mode 100644 index 97245d27f2f3a08dc02d24b43da44d76e47ebbae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJXipc%kcv6U2@(|PS92R5vlZL=AqpH*3ofx%r?aM{jpw@rc8FnGH9xvXR!SWfr>~)Bsx2z{p_0A+CJ+ SKd%?idInEdKbLh*2~7a-c{?ru diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-3.png b/Resources/Textures/Floof/pomegranate.rsi/stage-3.png deleted file mode 100644 index 37bd6d53d116718c2ecafc38c3300360fa6e44a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNuDl_Ar*6y6C_v{Cy4Yk1sYsw zd>YpFpE+&g!#RwbWNr#hnRU>mbLr*2;4E87K8tr}4^-@9yZpSwpZj^X#J|HbO=lfT z7>$z!`V_<`$gsXRu%WfF&_UKgbHNG5>+|^+FsB`JcqHdGnfpZ7ex`IEZ}m5-=XJ!2 xOne3OQWJjs;Zr=IedNG_3%-4U5bF;xFf?^(gycWwZ3nuJ!PC{xWt~$(69D*&OQrw- diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-4.png b/Resources/Textures/Floof/pomegranate.rsi/stage-4.png deleted file mode 100644 index 8667357c88a00bb887b013ff128085dee45a9c27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3!W~HAr*6y6C_v{H!v0KYkTzI?C9Eg@Olf@h*}8>cy#O<_v-!?Epz{+%dI}gALUk*uPrT`x0`wb$ Mr>mdKI;Vst0022+{r~^~ diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-5.png b/Resources/Textures/Floof/pomegranate.rsi/stage-5.png deleted file mode 100644 index 9a2100edd39f83efe9b6f64278bd4f7cadb730bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVC!f=^~t_8g|1Vf<6O&xK508jhQ^E%pS>WFNGfT|Rrk(T88 z161~;n70%69ax?AGFe9)-9jk=#T0@oXyzrE>PE|wdpEX6&${Wv2x2wcT;qOoacMf` ze05GU2G_ITN@22&=)B6-uZ3afLdKhUx$atU`Yes>H0R7IP%w4*In;OVS~fXIgB%r_jndkxpv@A&u(0HG3{-^#KO+tC= p7=mARV0{xf^QvKqC6@T-_yOBF!+5?w`f&gN002ovPDHLkV1m4G=*<8C diff --git a/Resources/Textures/Floof/pomegranate.rsi/stage-6.png b/Resources/Textures/Floof/pomegranate.rsi/stage-6.png deleted file mode 100644 index be279f7c12c5bff3102e8e81ab4567eb0c386c7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NB%P)|VsTiUMZilD4^o&SSS4U#ca2uZ zR%(5XSS+kpSp<|VRumSCWt+8l4zt0S{gFTl?=|0<9cI4o`@V1H4wkqeT#qattHP<9 zbl$gn^U3FZ9M>aDLTI!!uSLKdde#A*eX?d(<0Q1-(+HYf7|mdJ6M~)M0tSjD0w|`?n%RD8rsPL%BR zLs(yx)UmHNw8u)GMrujklx1)(Q`aLK%~X}?^`vJd9|j_2$fS{VzUz_2e(_DH)Pj5> z6F~}1dKx!c)vjTshsfN5eDBv+mCO*_JE`V_QXX(UvbT@O+GCqM_O+Hz-t1}~`{keJ zLIQaoe0i)2K`mJPFQZbKR4U5G#)oqe+V?=?RBQ17hT1dg}K7NOek=2QK1O5K99u&DUr zT{;0!^;bgRc-!9bjT=`$!1NvzpWLhWe-Pk$olS?gp2Erx`(f=S@S-keOi From f90e9078ba0b64d74de0cf1c0cad83ef380ae311 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 13 Jul 2024 23:46:12 +0200 Subject: [PATCH 22/23] Fix --- Resources/Locale/en-US/traits/traits.ftl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 2f59d322282..a23fd18f675 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -32,6 +32,23 @@ trait-description-SocialAnxiety = You are anxious when you speak and stutter. trait-name-Snoring = Snoring trait-description-Snoring = You will snore while sleeping. +trait-name-LatentPsychic = Latent Psychic +trait-description-LatentPsychic = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy. + Thus, you are eligible for potentially receiving psychic powers. + It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret. + +trait-name-PsionicInsulation = χ Waveform Misalignment +trait-description-PsionicInsulation = Through a quirk of fate, your brainwaves are permanently out of phase with the noösphere + You are immune to both positive and negative effects of nearly all psychic powers, + But you can never be a psionic yourself in this life. This trait is incompatible with + all other psychic traits. + +trait-name-NaturalTelepath = Natural Telepath +trait-description-NaturalTelepath = As a naturally occuring Telepath, you are capable of fluent telepathic communication, regardless of + whether or not you possess any notable psychic powers. This offers all of the same benefits and + drawbacks of Latent Psychic, except that you are guaranteed to start with full Telepathy. You may + still gain powers as normal for a Latent Psychic. + trait-name-NormalVisionHarpy = Trichromat Modification trait-description-NormalVisionHarpy = Your eyes have been modified by means of advanced medicine to see in the standard colors of Red, Green, and Blue. From 194a8a04e85710e72608da894f23ae50c7d1f738 Mon Sep 17 00:00:00 2001 From: SleepyScarecrow Date: Sun, 14 Jul 2024 11:31:54 -0400 Subject: [PATCH 23/23] Adjusted Metabolic rates, Flavour Text, Cure --- .../aphrodisiacs/aphrodisiacs.ftl | 4 ++-- .../Reagents/Aphrodisiacs/medicine.yml | 4 ++-- Resources/Prototypes/Reagents/elements.yml | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl index d02640f1200..e600b25134b 100644 --- a/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl +++ b/Resources/Locale/en-US/reagents/floofstation/aphrodisiacs/aphrodisiacs.ftl @@ -9,7 +9,7 @@ reagent-effect-aphrodisiac-normal1 = Your entire body is hot. reagent-effect-aphrodisiac-normal2 = Everyone is looking at you. They want you. reagent-effect-aphrodisiac-normal3 = You feel incredibly lustful. reagent-effect-aphrodisiac-normal4 = Your body buzzes with pleasure. -reagent-effect-aphrodisiac-normal5 = Your clothes feel tight. Why not take them off... +reagent-effect-aphrodisiac-normal5 = Everyone's musk smells stronger. reagent-effect-aphrodisiac-normaloverdose1 = You forget what you were doing. reagent-effect-aphrodisiac-normaloverdose2 = Your mind feels clouded. reagent-effect-aphrodisiac-normaloverdose3 = Your heart is pounding. @@ -20,7 +20,7 @@ reagent-effect-aphrodisiac-normaloverdose6 = You lose your train of thought. reagent-effect-aphrodisiac-strong1 = You can't look at someone without wanting to fuck them. reagent-effect-aphrodisiac-strong2 = You need someone to breed with. reagent-effect-aphrodisiac-strong3 = Fuck them. Now. -reagent-effect-aphrodisiac-strongoverdose1 = STRIP STRIP STRIP +reagent-effect-aphrodisiac-strongoverdose1 = FIND SOMEONE. reagent-effect-aphrodisiac-strongoverdose2 = YOU NEED IT. reagent-effect-aphrodisiac-strongoverdose3 = FUCK THEM ALL. reagent-effect-aphrodisiac-strongoverdose4 = YOU HAVE TO BREED AT ALL COSTS. diff --git a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml index 10e77d2fdaf..cd5e90316c6 100644 --- a/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml +++ b/Resources/Prototypes/FloofStation/Reagents/Aphrodisiacs/medicine.yml @@ -8,7 +8,7 @@ color: "#45072f" metabolisms: Medicine: - metabolismRate : 0.03 + metabolismRate : 0.5 effects: - !type:PopupMessage type: Local @@ -61,7 +61,7 @@ color: "#ae0072" metabolisms: Medicine: - metabolismRate : 0.02 + metabolismRate : 0.5 effects: - !type:PopupMessage type: Local diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index b3a7fe1bb0a..9310b1b2c44 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -8,6 +8,30 @@ color: "#848789" boilingPoint: 2327.0 meltingPoint: 660.0 + metabolisms: #Floofstation, wipes aphrodisiacs + Medicine: + effects: + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Pomelustine + min: 1 + reagent: Pomelustine + amount: -5 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Philterex + min: 1 + reagent: Philterex + amount: -5 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Libidozenithizine + min: 1 + reagent: Libidozenithizine + amount: -3 - type: reagent id: Carbon