From ff93f5d3bfb4c4a90fd00981abaf7752010edbaf Mon Sep 17 00:00:00 2001 From: Zarra-0 <72447426+Zarra-0@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:35:15 +0100 Subject: [PATCH 1/5] Fixed furniture crafting tabs Recipes incorrectly listed under beds --- recipes/furniture1/fu_harpsichord.recipe | 2 +- recipes/furniture1/totempole1.recipe | 2 +- recipes/furniture1/totempole2.recipe | 2 +- recipes/furniture1/totempole3.recipe | 2 +- recipes/furniture1/woodenlectoral.recipe | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/furniture1/fu_harpsichord.recipe b/recipes/furniture1/fu_harpsichord.recipe index ae533493967..0d5331a6883 100644 --- a/recipes/furniture1/fu_harpsichord.recipe +++ b/recipes/furniture1/fu_harpsichord.recipe @@ -5,5 +5,5 @@ { "item" : "wire", "count" : 12 } ], "output" : { "item" : "fu_harpsichord", "count" : 1 }, - "groups" : [ "craftingfurniture", "beds", "all" ] + "groups" : [ "craftingfurniture", "decoration", "all" ] } diff --git a/recipes/furniture1/totempole1.recipe b/recipes/furniture1/totempole1.recipe index 854e59e0850..59027021828 100644 --- a/recipes/furniture1/totempole1.recipe +++ b/recipes/furniture1/totempole1.recipe @@ -7,5 +7,5 @@ "item" : "totempole1", "count" : 1 }, - "groups" : [ "craftingfurniture", "beds", "all" ] + "groups" : [ "craftingfurniture", "decoration", "all" ] } diff --git a/recipes/furniture1/totempole2.recipe b/recipes/furniture1/totempole2.recipe index add846df06d..9fada028a65 100644 --- a/recipes/furniture1/totempole2.recipe +++ b/recipes/furniture1/totempole2.recipe @@ -7,5 +7,5 @@ "item" : "totempole2", "count" : 1 }, - "groups" : [ "craftingfurniture", "beds", "all" ] + "groups" : [ "craftingfurniture", "decoration", "all" ] } diff --git a/recipes/furniture1/totempole3.recipe b/recipes/furniture1/totempole3.recipe index 7c8cec376da..5e1fba548ed 100644 --- a/recipes/furniture1/totempole3.recipe +++ b/recipes/furniture1/totempole3.recipe @@ -7,5 +7,5 @@ "item" : "totempole3", "count" : 1 }, - "groups" : [ "craftingfurniture", "beds", "all" ] + "groups" : [ "craftingfurniture", "decoration", "all" ] } diff --git a/recipes/furniture1/woodenlectoral.recipe b/recipes/furniture1/woodenlectoral.recipe index 6b9dae07059..4b2e3f9497d 100644 --- a/recipes/furniture1/woodenlectoral.recipe +++ b/recipes/furniture1/woodenlectoral.recipe @@ -7,5 +7,5 @@ "item" : "woodenlectoral", "count" : 1 }, - "groups" : [ "craftingfurniture", "beds", "all" ] + "groups" : [ "craftingfurniture", "decoration", "all" ] } From 9bdb8bc52d62092a000090e9df84fc375bf5cb37 Mon Sep 17 00:00:00 2001 From: Zarra-0 <72447426+Zarra-0@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:37:15 +0100 Subject: [PATCH 2/5] Capitalised Thorns status effect Vanilla effect --- stats/effects/thorns/nova.statuseffect.patch | 1 + 1 file changed, 1 insertion(+) create mode 100644 stats/effects/thorns/nova.statuseffect.patch diff --git a/stats/effects/thorns/nova.statuseffect.patch b/stats/effects/thorns/nova.statuseffect.patch new file mode 100644 index 00000000000..027e42f70a7 --- /dev/null +++ b/stats/effects/thorns/nova.statuseffect.patch @@ -0,0 +1 @@ +[{"op":"test","path":"/label","value":"thorns"},{"op":"replace","path":"/label","value":"Thorns"}] From 57ad270f3e9bd33c2666af2167970edcd44596c1 Mon Sep 17 00:00:00 2001 From: Zarra-0 <72447426+Zarra-0@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:18:42 +0100 Subject: [PATCH 3/5] Updated wooden storage containers Removed chest image from icons, updated imagePosition for some to make their left and right images symmetrical. --- .../farm/woodstorage/fufoodstorage.object | 2 +- .../farm/woodstorage/fufoodstorageicon.png | Bin 175 -> 163 bytes .../farm/woodstorage/fugoldstorageicon.png | Bin 146 -> 135 bytes .../farm/woodstorage/fulargewoodencrate2.object | 2 +- .../farm/woodstorage/fuwoodbarrels.object | 2 +- .../farm/woodstorage/fuwoodstorage.object | 2 +- .../farm/woodstorage/fuwoodstorageicon.png | Bin 212 -> 188 bytes 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/objects/generic/farm/woodstorage/fufoodstorage.object b/objects/generic/farm/woodstorage/fufoodstorage.object index c8eb0be4586..e684b943400 100644 --- a/objects/generic/farm/woodstorage/fufoodstorage.object +++ b/objects/generic/farm/woodstorage/fufoodstorage.object @@ -16,7 +16,7 @@ { "dualImage" : "fufoodstorage.png:", - "imagePosition" : [-2, 0], + "imagePosition" : [-12, 0], "frames" : 1, "animationCycle" : 1.0, diff --git a/objects/generic/farm/woodstorage/fufoodstorageicon.png b/objects/generic/farm/woodstorage/fufoodstorageicon.png index 52aef21516c10c6eab46cc9a7b45195cc80a10e4..02298c53593aea57a8e2bc74a799992d74e68bcf 100644 GIT binary patch delta 147 zcmZ3_xR`N*L_G^L0|Ud`yN`l^lth3}h%1mT*k|Fw%IDLhwp3E$rlHNt%nVISiT&oe zUO+j$W9J?) w%3HZGgXekxN3)}y9!XS-cOn(Cq8WEV` zzuPk2%P`` N002ovPDHLkV1jULIXM6T diff --git a/objects/generic/farm/woodstorage/fugoldstorageicon.png b/objects/generic/farm/woodstorage/fugoldstorageicon.png index bcd048fe7b2085a7eb997db79af1662270eef6c7..e3905353e997801f30656d2e830959e4fe649510 100644 GIT binary patch delta 118 zcmbQl*v>dXBA0E43GxeO zaCmkj4aiaRba4!+h)Y)B+puGYMT2BtQ0000V^Z#K0003D@L_t(|+G7|6*umWmhX1i)qBXyMdKW8R zme25?XaoM=&qKjL@u6-2!+*j53=_Cu7{bQ}fVQBAK1?%;3kVv5gkc6?r-=b@4M<=> j3_!yO1Bf;R0|Nm7Zk6G|Efe5<00000NkvXXu0mjf", - "imagePosition" : [-2, 0], + "imagePosition" : [-4, 0], "frames" : 1, "animationCycle" : 1.0, diff --git a/objects/generic/farm/woodstorage/fuwoodbarrels.object b/objects/generic/farm/woodstorage/fuwoodbarrels.object index 0c63727b94d..d14eeb2c017 100644 --- a/objects/generic/farm/woodstorage/fuwoodbarrels.object +++ b/objects/generic/farm/woodstorage/fuwoodbarrels.object @@ -16,7 +16,7 @@ { "dualImage" : "fuwoodbarrels.png:", - "imagePosition" : [-2, 0], + "imagePosition" : [-4, 0], "frames" : 1, "animationCycle" : 1.0, diff --git a/objects/generic/farm/woodstorage/fuwoodstorage.object b/objects/generic/farm/woodstorage/fuwoodstorage.object index 1acc18a62a5..8a0f7f594f7 100644 --- a/objects/generic/farm/woodstorage/fuwoodstorage.object +++ b/objects/generic/farm/woodstorage/fuwoodstorage.object @@ -16,7 +16,7 @@ { "dualImage" : "fuwoodstorage.png:", - "imagePosition" : [-2, 0], + "imagePosition" : [-12, 0], "frames" : 1, "animationCycle" : 1.0, diff --git a/objects/generic/farm/woodstorage/fuwoodstorageicon.png b/objects/generic/farm/woodstorage/fuwoodstorageicon.png index 433b4b4c41db3fed122821d16e2e19139df9ed55..3ca79d785238cbe2316a5e4b73212dcd0b89282b 100644 GIT binary patch delta 172 zcmcb@xQB6qL_G^L0|Ud`yN`l^lxToYh%1optnt~pI3+jPz|BHp>#|Ish}Bd3Bp}6D z666=m;PC858jus}>Eakt5tr=1n3EacwkU~d#=*3d6t*-KZEbG#238*4P=_8BM@7YS zg=XJK!w8loY8O2&2_z%NmY3{7?`M-5>3Wz4z zkpH>K1|ZESG)SCW%^+70We7G+aId&oNZ>U9=3f|w@DZBvx&US?LesKLnC%2L!<>rj z0%R}X)eJHngh86o4T5O=FZiEf0v8N}`RGnZ_z|HQ#7AgG0zK%4pa&F8GqUa2X(WIv yvTq0000 Date: Thu, 26 Oct 2023 23:18:32 +0100 Subject: [PATCH 4/5] Manip replacement tutorial radiomessage Tutorial message for replacing a player's matter manipulator, attached to all craftable FU manipulators and ERM's Shardbreaker. --- items/tools/centensbeamaxe.beamaxe.patch | 9 +++++++++ items/tools/fumastermanipulator.beamaxe | 4 +++- items/tools/mmgravgun.beamaxe | 4 +++- items/tools/mmgravgun2.beamaxe | 4 +++- items/tools/mmgravgun3.beamaxe | 4 +++- radiomessages/tutorial.radiomessages.patch | 8 ++++++++ 6 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 items/tools/centensbeamaxe.beamaxe.patch diff --git a/items/tools/centensbeamaxe.beamaxe.patch b/items/tools/centensbeamaxe.beamaxe.patch new file mode 100644 index 00000000000..ec5003114c8 --- /dev/null +++ b/items/tools/centensbeamaxe.beamaxe.patch @@ -0,0 +1,9 @@ +[ + [ + { "op": "test", "path": "/radioMessagesOnPickup", "inverse" : true }, + { "op": "add", "path": "/radioMessagesOnPickup", "value": [] } + ], + [ + { "op" : "add", "path" : "/radioMessagesOnPickup/-", "value" : "fu_pickupgravgun" } + ] +] diff --git a/items/tools/fumastermanipulator.beamaxe b/items/tools/fumastermanipulator.beamaxe index 97916041ada..7dfe1f07151 100644 --- a/items/tools/fumastermanipulator.beamaxe +++ b/items/tools/fumastermanipulator.beamaxe @@ -40,5 +40,7 @@ "minBeamLines" : 3, "maxBeamLines" : 5, - "rangeBonus" : 12 + "rangeBonus" : 12, + + "radioMessagesOnPickup" : [ "fu_pickupgravgun" ] } diff --git a/items/tools/mmgravgun.beamaxe b/items/tools/mmgravgun.beamaxe index 32619aa4f0b..2462a5d344f 100644 --- a/items/tools/mmgravgun.beamaxe +++ b/items/tools/mmgravgun.beamaxe @@ -41,5 +41,7 @@ "minBeamLines" : 1, "maxBeamLines" : 5, - "rangeBonus" : 1 + "rangeBonus" : 1, + + "radioMessagesOnPickup" : [ "fu_pickupgravgun" ] } diff --git a/items/tools/mmgravgun2.beamaxe b/items/tools/mmgravgun2.beamaxe index dcb1553bacc..5876524f1fa 100644 --- a/items/tools/mmgravgun2.beamaxe +++ b/items/tools/mmgravgun2.beamaxe @@ -41,5 +41,7 @@ "minBeamLines" : 1, "maxBeamLines" : 5, - "rangeBonus" : 2 + "rangeBonus" : 2, + + "radioMessagesOnPickup" : [ "fu_pickupgravgun" ] } diff --git a/items/tools/mmgravgun3.beamaxe b/items/tools/mmgravgun3.beamaxe index 7b120ece52c..4ee3c318d92 100644 --- a/items/tools/mmgravgun3.beamaxe +++ b/items/tools/mmgravgun3.beamaxe @@ -40,5 +40,7 @@ "minBeamLines" : 3, "maxBeamLines" : 5, - "rangeBonus" : 3 + "rangeBonus" : 3, + + "radioMessagesOnPickup" : [ "fu_pickupgravgun" ] } diff --git a/radiomessages/tutorial.radiomessages.patch b/radiomessages/tutorial.radiomessages.patch index 9adc80e199b..5bd1e2880d3 100644 --- a/radiomessages/tutorial.radiomessages.patch +++ b/radiomessages/tutorial.radiomessages.patch @@ -13,5 +13,13 @@ "op": "replace", "path": "/pickupmanipulatormodule/text", "value": "These useful gadgets are used to upgrade ^orange;tools^reset;, including your ^orange;Matter Manipulator^reset;, from the upgrade interface of your ^orange;Personal Tricorder^reset;. I suggest saving a few for when you build a ^green;Mining laser^reset;." + }, + { + "op": "add", + "path": "/fu_pickupgravgun", + "value": { + "type" : "tutorial", + "text" : "It appears you have obtained an upgrade to your ^cyan;Matter Manipulator^reset;. Using the ^orange;Shift + Secondary^reset; functionality of your ^green;Tricorder^reset;, you can replace your current device." + } } ] From da750f2dcd47e91245a2ff761fde7d2c98f12678 Mon Sep 17 00:00:00 2001 From: Zarra-0 <72447426+Zarra-0@users.noreply.github.com> Date: Fri, 27 Oct 2023 22:26:50 +0100 Subject: [PATCH 5/5] Madness consumable tooltips Changed '+X Madness' tooltips on foods and drugs to 'Madness Gain X' to clarify that the effect doesn't grant only X madness. Also adjusted formatting on some foods. --- .../generic/drinks/coffeemachine/chunkymeatcoffee.consumable | 2 +- items/generic/food/awfuloffalsmoothie.consumable | 2 +- items/generic/food/bloodyboogerbread.consumable | 4 ++-- items/generic/food/bloodycorpsewaffles.consumable | 2 +- items/generic/food/boogerbread.consumable | 2 +- items/generic/food/bowlofbrains.consumable | 2 +- items/generic/food/brainyummy.consumable | 2 +- items/generic/food/cthushi.consumable | 2 +- items/generic/food/eldurkey.consumable | 2 +- items/generic/food/erchiusomlette.consumable | 2 +- items/generic/food/gnomeandveggiesandwich.consumable | 2 +- items/generic/food/greghead.consumable | 2 +- items/generic/food/ictea.consumable | 2 +- items/generic/food/idiotsandwich.consumable | 2 +- items/generic/food/jarredfetus.consumable | 2 +- items/generic/food/leadandjsandwich.consumable | 2 +- items/generic/food/magicallunch.consumable | 2 +- items/generic/food/nightmarefuel.consumable | 2 +- items/generic/food/ocularoobleck.consumable | 4 ++-- items/generic/food/orphanpaste.consumable | 2 +- items/generic/food/plaguepestpancakes.consumable | 2 +- items/generic/food/putridpestpuree.consumable | 2 +- items/generic/food/severedheadplatter.consumable | 2 +- items/generic/food/sewerfrieswithbacon.consumable | 4 ++-- items/generic/food/yettas.consumable | 2 +- items/generic/loot/babyheadonastick.consumable | 2 +- items/generic/loot/devilsbargain.consumable | 2 +- items/generic/loot/faceskin.consumable | 2 +- items/generic/loot/feces.consumable | 2 +- items/generic/loot/fudeathstick.consumable | 2 +- items/generic/loot/fupilldrug.consumable | 2 +- items/generic/loot/fushroomspore.consumable | 2 +- items/generic/loot/futeltikparasite.consumable | 2 +- items/generic/loot/myphisinjector.consumable | 2 +- items/generic/loot/portaljuice.consumable | 2 +- items/generic/loot/powderednarcotics.consumable | 2 +- items/generic/loot/purecocainium.consumable | 2 +- items/generic/loot/serumstim.consumable | 2 +- items/generic/loot/thesauce.consumable | 2 +- items/generic/loot/uberstim.consumable | 2 +- items/generic/loot/ultrastim.consumable | 2 +- 41 files changed, 44 insertions(+), 44 deletions(-) diff --git a/items/generic/drinks/coffeemachine/chunkymeatcoffee.consumable b/items/generic/drinks/coffeemachine/chunkymeatcoffee.consumable index 41342da8ac6..5ce499d347e 100644 --- a/items/generic/drinks/coffeemachine/chunkymeatcoffee.consumable +++ b/items/generic/drinks/coffeemachine/chunkymeatcoffee.consumable @@ -4,7 +4,7 @@ "price" : 14, "category" : "drink", "inventoryIcon" : "chunkymeatcoffee.png", - "description" : "Please don't.\n^cyan;+^white;15% ^cyan;Run ^gray;(^white;1m^gray;)\n^cyan;Caffeinated ^gray;(^white;1m^gray;)\n^blue;+^white;1 ^blue;Madness^reset;", + "description" : "Please don't.\n^cyan;+^white;15% ^cyan;Run ^gray;(^white;1m^gray;)\n^cyan;Caffeinated ^gray;(^white;1m^gray;)\n^blue;Madness Gain^reset; 2", "shortdescription" : "Chunky Meat Coffee", "handPosition" : [0, -2], "effects" : [ [ diff --git a/items/generic/food/awfuloffalsmoothie.consumable b/items/generic/food/awfuloffalsmoothie.consumable index 3d63d803450..d74a00863b4 100644 --- a/items/generic/food/awfuloffalsmoothie.consumable +++ b/items/generic/food/awfuloffalsmoothie.consumable @@ -4,7 +4,7 @@ "price": 60, "category": "preparedFood", "inventoryIcon": "awfuloffalsmoothie.png", - "description": "Blended rotten food. The greatest invention of Dupont Dewpawnt. \n^cyan;-^red;5% Health ^reset; ^blue;+2^reset; Madness; ^red;15s Poison^reset; ^red;Type: Raw Meat Dairy Dessert^reset;", + "description": "Blended rotten food. The greatest invention of Dupont Dewpawnt. ^red;-^reset;5^red;% Health^reset; 15^red;s Poison^reset; ^blue;Madness Gain^reset; 3 ^red;Type: Raw Meat Dairy Dessert^reset;", "shortdescription": "Awful Offal Smoothie", "effects": [ ["madnessgain2", "meatr_dairy_dessert", diff --git a/items/generic/food/bloodyboogerbread.consumable b/items/generic/food/bloodyboogerbread.consumable index a80fcf9e9f1..9fbf7122686 100644 --- a/items/generic/food/bloodyboogerbread.consumable +++ b/items/generic/food/bloodyboogerbread.consumable @@ -4,13 +4,13 @@ "price": 35, "category": "preparedFood", "inventoryIcon": "bloodyboogerbread.png", - "description": "Whose twisted idea was this?! Revolting! \n^cyan;-^red;15% ^green;HP^reset;", + "description": "Whose twisted idea was this?! Revolting! \n^red;-^reset;15^red;% Health^reset; \n^blue;Madness Gain^reset; 2", "shortdescription": "Bloody Boogerbread", "effects": [ ["madnessgain", { "effect": "negativehealth15", - "duration": 60 + "duration": 60 } ] ], diff --git a/items/generic/food/bloodycorpsewaffles.consumable b/items/generic/food/bloodycorpsewaffles.consumable index 4b6ca863c69..357725d9bf7 100644 --- a/items/generic/food/bloodycorpsewaffles.consumable +++ b/items/generic/food/bloodycorpsewaffles.consumable @@ -4,7 +4,7 @@ "price" : 35, "category" : "preparedFood", "inventoryIcon" : "bloodycorpsewaffles.png", - "description" : "Clearly the breakfast of choice for a growing child.\n^cyan;+^white;10% ^cyan;HP ^gray;(^white;45s^gray;) ^blue;+^white;1 ^blue;Madness^reset; ^orange;Type: Cooked Meat^reset;", + "description" : "Clearly the breakfast of choice for a growing child.\n^cyan;+^white;10% ^cyan;HP ^gray;(^white;45s^gray;) ^blue;Madness Gain^reset; 2 ^orange;Type: Cooked Meat^reset;", "shortdescription" : "Bloody Corpse Waffles", "effects" : [ [ "madnessgain", diff --git a/items/generic/food/boogerbread.consumable b/items/generic/food/boogerbread.consumable index a8490f6295c..8252f494ef7 100644 --- a/items/generic/food/boogerbread.consumable +++ b/items/generic/food/boogerbread.consumable @@ -4,7 +4,7 @@ "price": 10, "category": "preparedFood", "inventoryIcon": "boogerbread.png", - "description": "What IS this disgusting creation?! \n^cyan;-^red;5% ^green;HP^reset;", + "description": "What IS this disgusting creation?! \n^red;-^reset;5^red;% Health^reset; \n^blue;Madness Gain^reset; 2", "shortdescription": "Boogerbread", "effects": [ ["madnessgain", diff --git a/items/generic/food/bowlofbrains.consumable b/items/generic/food/bowlofbrains.consumable index ad306921219..3dab25b84c4 100644 --- a/items/generic/food/bowlofbrains.consumable +++ b/items/generic/food/bowlofbrains.consumable @@ -4,7 +4,7 @@ "price" : 42, "category" : "preparedFood", "inventoryIcon" : "bowlofbrains.png", - "description" : "Looks like a nice, wholesome bowl of mashed brains matter. \n^blue;+^white;1 ^blue;Madness^reset; ^red;Type: Raw Meat^reset;", + "description" : "Looks like a nice, wholesome bowl of mashed brains matter. \n^blue;Madness Gain^reset; 2\n^red;Type: Raw Meat^reset;", "shortdescription" : "Bowl o' Brains", "effects" : [ [ "madnessgain", diff --git a/items/generic/food/brainyummy.consumable b/items/generic/food/brainyummy.consumable index aa7f9966f06..513794718ab 100644 --- a/items/generic/food/brainyummy.consumable +++ b/items/generic/food/brainyummy.consumable @@ -4,7 +4,7 @@ "price" : 42, "category" : "preparedFood", "inventoryIcon" : "brainyummy.png", - "description" : "You've gone ahead and cut the less tasty bits off. Nobody wants to eat cerebellum. ^red;-^white;10% ^red;HP ^gray;(^white;10s^gray;), ^blue;+^white;1 ^blue;Madness^reset; ^red;Type: Raw Meat^reset;", + "description" : "You've gone ahead and cut the less tasty bits off. Nobody wants to eat cerebellum. ^red;-^white;10% ^red;HP ^gray;(^white;10s^gray;), ^blue;Madness Gain^reset; 2 ^red;Type: Raw Meat^reset;", "shortdescription" : "Edible Brains", //"learnBlueprintsOnPickup" : [ "bowlofbrains" ], "effects" : [ [ diff --git a/items/generic/food/cthushi.consumable b/items/generic/food/cthushi.consumable index 59e73ad424f..5da03b5f97c 100644 --- a/items/generic/food/cthushi.consumable +++ b/items/generic/food/cthushi.consumable @@ -4,7 +4,7 @@ "price": 250, "category": "preparedFood", "inventoryIcon": "cthushi.png", - "description": "Mad not to use soy sauce... \n^blue;+^white;1 ^blue;Madness^reset; \n^orange;Type: Cooked Meat + Grain^reset;", + "description": "Mad not to use soy sauce... ^blue;Madness Gain^reset; 4 \n^orange;Type: Cooked Meat + Grain^reset;", "shortdescription": "Cthushi", "effects": [ ["madnessgain3", "meatc_plant_meal", diff --git a/items/generic/food/eldurkey.consumable b/items/generic/food/eldurkey.consumable index 85f4a5aa150..16e772dd4ac 100644 --- a/items/generic/food/eldurkey.consumable +++ b/items/generic/food/eldurkey.consumable @@ -4,7 +4,7 @@ "price": 25, "category": "preparedFood", "inventoryIcon": "eldurkey.png", - "description": "A meal of Eldritch proportions. ^cyan;+^reset;20%^green; HP^reset; ^cyan;+^reset;15%^green; Energy^reset;^cyan; +^reset;3^blue; Madness^reset;^red; Insanity^reset; 180s ^orange;Type: Cooked Meat + Vegetables^reset;", + "description": "A meal of Eldritch proportions. ^cyan;+^reset;20%^green; HP^reset; ^cyan;+^reset;15%^green; Energy^reset;^red; Insanity^reset; 180s ^blue;Madness Gain^reset; 4 ^orange;Type: Cooked Meat + Vegetables^reset;", "shortdescription": "Eldurkey", "effects": [ ["madnessgain3", "meatc_plant_meal", diff --git a/items/generic/food/erchiusomlette.consumable b/items/generic/food/erchiusomlette.consumable index cc38e190477..3e7cff806b5 100644 --- a/items/generic/food/erchiusomlette.consumable +++ b/items/generic/food/erchiusomlette.consumable @@ -4,7 +4,7 @@ "price": 75, "category": "preparedFood", "inventoryIcon": "erchiusomlette.png", - "description": "Not the kind of fuel you need... \n^blue;Glow^reset; 120s ^blue;+^reset;40 ^blue;Fuel^reset; ^orange;Type: Cooked Meat + Vegetables + Dairy + Eggs^reset;", + "description": "Not the kind of fuel you need... ^yellow;Glow^reset; 120s ^green;+^reset;40 ^green;Fuel^reset; ^blue;Madness Gain^reset; 4 ^orange;Type: Cooked Meat + Vegetables + Dairy + Eggs^reset;", "shortdescription": "Erchius Omlette", "fuelAmount": 40, "effects": [ diff --git a/items/generic/food/gnomeandveggiesandwich.consumable b/items/generic/food/gnomeandveggiesandwich.consumable index f4ba6aefa73..4912159bc1b 100644 --- a/items/generic/food/gnomeandveggiesandwich.consumable +++ b/items/generic/food/gnomeandveggiesandwich.consumable @@ -4,7 +4,7 @@ "price": 35, "category": "preparedFood", "inventoryIcon": "gnomeandveggiesandwich.png", - "description": "One gnome was harmed in making this sandwich. \n^cyan;+^reset;20%^green; HP^reset;^cyan; +^reset;20%^green; Energy^reset;\n^cyan;+^reset;3^blue; Madness^reset; ^orange;Type: Cooked Meat + Vegetables^reset;", + "description": "One gnome was harmed in making this sandwich. \n^cyan;+^reset;20%^green; HP^reset;^cyan; +^reset;20%^green; Energy^reset; ^blue;Madness Gain^reset; 3 ^orange;Type: Cooked Meat + Vegetables^reset;", "shortdescription": "Gnomewich", "effects": [ ["madnessgain2", "meatc_plant_meal", diff --git a/items/generic/food/greghead.consumable b/items/generic/food/greghead.consumable index ec9e850ddd8..6707a40ff6c 100644 --- a/items/generic/food/greghead.consumable +++ b/items/generic/food/greghead.consumable @@ -4,7 +4,7 @@ "price" : 300, "category" : "preparedFood", "inventoryIcon" : "greghead.png", - "description" : "The severed head of a Greg\n^green;Heal ^white;20% ^green;HP ^gray;(^white;20s^gray;)\n^red;Drunk ^gray;(^white;1m^gray;)\n^blue;+^white;1 ^blue;Madness^reset; ^red;Type: Raw Meat^reset;", + "description" : "The severed head of a Greg\n^green;Heal ^white;20% ^green;HP ^gray;(^white;20s^gray;)\n^red;Drunk ^gray;(^white;1m^gray;) ^blue;Madness Gain^reset; 2\n^red;Type: Raw Meat^reset;", "shortdescription" : "Greg Head", "foodValue" : 20, "tooltipKind" : "food", diff --git a/items/generic/food/ictea.consumable b/items/generic/food/ictea.consumable index 53cd65615f3..97c684450f2 100644 --- a/items/generic/food/ictea.consumable +++ b/items/generic/food/ictea.consumable @@ -4,7 +4,7 @@ "price": 60, "category": "preparedFood", "inventoryIcon": "ictea.png", - "description": "I-C Tea; a rather eye-opening beverage.\n^green;Glow 300s^cyan; +^reset;2^blue; Madness^reset;", + "description": "I-C Tea; a rather eye-opening beverage.\n^green;Glow 300s ^blue;Madness Gain^reset; 2", "shortdescription": "I-C Tea", "effects": [ ["madnessgain", diff --git a/items/generic/food/idiotsandwich.consumable b/items/generic/food/idiotsandwich.consumable index 42dc08903a2..4e1e50d4627 100644 --- a/items/generic/food/idiotsandwich.consumable +++ b/items/generic/food/idiotsandwich.consumable @@ -4,7 +4,7 @@ "price": 50, "category": "preparedFood", "inventoryIcon": "idiotsandwich.png", - "description": "IT'S FRACKIN RAW \n^blue;+Drunk^reset; 2m \n^red;Type: Raw Meat^reset;", + "description": "IT'S FRACKIN' RAW \n^red;Drunk^reset; 2m \n^blue;Madness Gain^reset; 4 \n^red;Type: Raw Meat^reset;", "shortdescription": "Idiot Sandwich", "effects": [ ["madnessgain3", "meat_raw", diff --git a/items/generic/food/jarredfetus.consumable b/items/generic/food/jarredfetus.consumable index 1ade296d0b2..6a2362853aa 100644 --- a/items/generic/food/jarredfetus.consumable +++ b/items/generic/food/jarredfetus.consumable @@ -4,7 +4,7 @@ "category": "drink", "price": 395, "inventoryIcon": "jarredfetus.png", - "description": "A fetus, too early in development to determine species without research. ^red;Type: Raw Meat^reset;", + "description": "A fetus, too early in development to determine species without research. ^blue;Madness Gain^reset; 3 ^red;Type: Raw Meat^reset;", "shortdescription": "Jarred Fetus", "effects": [ ["madnessgain2", { "effect" : "meat_raw" } ] ], "foodValue": 12, diff --git a/items/generic/food/leadandjsandwich.consumable b/items/generic/food/leadandjsandwich.consumable index af4f562e45a..5eff7a3df7c 100644 --- a/items/generic/food/leadandjsandwich.consumable +++ b/items/generic/food/leadandjsandwich.consumable @@ -4,7 +4,7 @@ "price" : 55, "category" : "preparedFood", "inventoryIcon" : "leadandjsandwich.png", - "description" : "Don't eat this. \n^blue;+^white;1 ^blue;Madness^reset; \n^yellow;Type: Robot Food^reset;", + "description" : "Don't eat this.\n^blue;Madness Gain^reset; 2\n^yellow;Type: Robot Food^reset;", "shortdescription" : "Pb and J Sandwich", "foodValue" : 40, "tooltipKind" : "food", diff --git a/items/generic/food/magicallunch.consumable b/items/generic/food/magicallunch.consumable index 3bd7f57a630..a9fb9f58716 100644 --- a/items/generic/food/magicallunch.consumable +++ b/items/generic/food/magicallunch.consumable @@ -4,7 +4,7 @@ "price" : 20, "category" : "preparedFood", "inventoryIcon" : "magicallunch.png", - "description" : "You have no idea what is inside. This does not look magical.\n^red;-^white;5% ^red;HP ^gray;(^white;1m^gray;)\n^blue;+^white;2 ^blue;Madness^reset;", + "description" : "You have no idea what is inside. This does not look magical.\n^red;-^white;5% ^red;HP ^gray;(^white;1m^gray;) ^blue;Madness Gain^reset; 3", "shortdescription" : "Magical Lunch", "foodValue" : 20, "tooltipKind" : "food", diff --git a/items/generic/food/nightmarefuel.consumable b/items/generic/food/nightmarefuel.consumable index e7b643b2bee..d2b937bdd01 100644 --- a/items/generic/food/nightmarefuel.consumable +++ b/items/generic/food/nightmarefuel.consumable @@ -4,7 +4,7 @@ "price": 75, "category": "preparedFood", "inventoryIcon": "nightmarefuel.png", - "description": "An ominous coffee-like substance for robotic consumers. \n^cyan;+^reset;35%^green; Energy^reset;^red; Nightmare^reset; 180s^reset;^cyan;+^reset;1^blue; Madness^reset; ^yellow;Type: Robot Food^reset;", + "description": "An ominous coffee-like substance for robotic consumers. ^cyan;+^reset;35%^green; Energy^reset;^red; Nightmare^reset; 180s^reset; ^blue;Madness Gain^reset; 3 ^yellow;Type: Robot Food^reset;", "shortdescription": "Nightmare Fuel", "effects": [ ["madnessgain2", "robot_food", diff --git a/items/generic/food/ocularoobleck.consumable b/items/generic/food/ocularoobleck.consumable index 4f165601be3..7b503cf0eb7 100644 --- a/items/generic/food/ocularoobleck.consumable +++ b/items/generic/food/ocularoobleck.consumable @@ -4,7 +4,7 @@ "price": 35, "category": "preparedFood", "inventoryIcon": "ocularoobleck.png", - "description": "A meaty, mysterious menagerie of eyes and oculemon. \n^cyan;+^reset;10%^green; Energy^reset;^red; Poison^reset; 10s^reset;^cyan; +^reset;1^blue; Madness^reset; ^green;Type: Meaty Plant^reset;", + "description": "A meaty, mysterious menagerie of eyes and oculemon. ^cyan;+^reset;10^green;% Energy^reset;^red; Poison^reset; 10s^reset; ^blue;Madness Gain^reset; 3 ^green;Type: Meaty Plant^reset;", "shortdescription": "Ocular Oobleck", "effects": [ ["madnessgain2", "meat_plant", @@ -29,4 +29,4 @@ "itemAgingScripts": ["/scripts/items/rotting.lua"], "rottingMultiplier": 1, "blockingEffects": ["wellfed"] -} \ No newline at end of file +} diff --git a/items/generic/food/orphanpaste.consumable b/items/generic/food/orphanpaste.consumable index 0193d2e5214..50a4ef9473b 100644 --- a/items/generic/food/orphanpaste.consumable +++ b/items/generic/food/orphanpaste.consumable @@ -4,7 +4,7 @@ "category": "drink", "price": 405, "inventoryIcon": "orphanpaste.png", - "description": "Made from only the finest ingredients. A perfect food for Vegans! Can fuel ships (40) and mechs.\n^cyan;+^white;10% ^cyan;HP ^gray;(^white;75s^gray;)^reset; ^red;Type: Raw Meat^reset;", + "description": "Made from only the finest ingredients. A perfect food for Vegans! Can fuel ships (40) and mechs.\n^cyan;+^white;10% ^cyan;HP ^gray;(^white;75s^gray;)^reset; ^blue;Madness Gain^reset; 3 ^red;Type: Raw Meat^reset;", "shortdescription": "Orphan Paste", "fuelAmount": 40, "effects": [ diff --git a/items/generic/food/plaguepestpancakes.consumable b/items/generic/food/plaguepestpancakes.consumable index 2ebd0eebb64..34f80deca27 100644 --- a/items/generic/food/plaguepestpancakes.consumable +++ b/items/generic/food/plaguepestpancakes.consumable @@ -4,7 +4,7 @@ "price": 85, "category": "preparedFood", "inventoryIcon": "plaguepestpancakes.png", - "description": "I've heard of bacon in pancakes, but pest? Eugh! \n^cyan;-^red;5% Health^reset; ^blue;+2^reset; Madness; ^red;60s Poison^reset; ^orange;Type: Cooked Meat + Vegetables + Dairy + Eggs^reset;", + "description": "I've heard of bacon in pancakes, but pest? Eugh! \n^red;-^reset;5^red;% Health^reset; 60s ^red;Poison^reset; ^blue;Madness Gain^reset; 3 ^orange;Type: Cooked Meat + Vegetables + Dairy + Eggs^reset;", "shortdescription": "Plague Pest Pancakes", "effects": [ ["madnessgain2", "bacon_pancakes_meal", diff --git a/items/generic/food/putridpestpuree.consumable b/items/generic/food/putridpestpuree.consumable index 40b84bf35f9..ce3acabbb00 100644 --- a/items/generic/food/putridpestpuree.consumable +++ b/items/generic/food/putridpestpuree.consumable @@ -4,7 +4,7 @@ "price": 75, "category": "preparedFood", "inventoryIcon": "putridpestpuree.png", - "description": "A blended mixture of pest, larva, and pussplum. Guaranteed to flush your bowels. ^cyan;+^green;12% HP^reset; ^blue;+2^reset; Madness ^orange;Type: Cooked Meat + Fruits^reset;", + "description": "A blended mixture of pest, larva, and pussplum. Guaranteed to flush your bowels. ^cyan;+^green;12% HP^reset; ^blue;Madness Gain^reset; 3 ^orange;Type: Cooked Meat + Fruits^reset;", "shortdescription": "Putrid Pest Puree", "effects": [ ["madnessgain2", "meatc_fruit_meal", diff --git a/items/generic/food/severedheadplatter.consumable b/items/generic/food/severedheadplatter.consumable index 3aa8b09149a..b241f0e24d8 100644 --- a/items/generic/food/severedheadplatter.consumable +++ b/items/generic/food/severedheadplatter.consumable @@ -4,7 +4,7 @@ "price" : 1305, "category" : "preparedFood", "inventoryIcon" : "severedheadplatter.png", - "description" : "It's literally just a rotting severed head. There is no platter.\n^red;-^white;5% ^red;HP ^gray;(^white;1m^gray;)\n^blue;+^white;4 ^blue;Madness^reset; ^red;Type: Raw Meat^reset;", + "description" : "It's literally just a rotting severed head. There is no platter.\n^red;-^white;5% ^red;HP ^gray;(^white;1m^gray;) ^blue;Madness Gain^reset; 5 ^red;Type: Raw Meat^reset;", "shortdescription" : "Severed Head Platter", "foodValue" : 45, "tooltipKind" : "food", diff --git a/items/generic/food/sewerfrieswithbacon.consumable b/items/generic/food/sewerfrieswithbacon.consumable index a902a1b2d80..c390f9da031 100644 --- a/items/generic/food/sewerfrieswithbacon.consumable +++ b/items/generic/food/sewerfrieswithbacon.consumable @@ -4,7 +4,7 @@ "price": 45, "category": "preparedFood", "inventoryIcon": "sewerfrieswithbacon.png", - "description": "Fries with a fermented gravy, adorned with bacon. What a crappy meal. \n^cyan;-^red;5% Health ^reset; ^blue;+2^reset; Madness ^orange;Type: Cooked Meat + Vegetables^reset;", + "description": "Fries with a fermented gravy, adorned with bacon. What a crappy meal. ^red;-^reset;5^red;% Health ^reset; ^blue;Madness Gain^reset; 2 ^orange;Type: Cooked Meat + Vegetables^reset;", "shortdescription": "Sewer Fries with Bacon", "effects": [ ["madnessgain", "meatc_plant_meal", @@ -21,4 +21,4 @@ "itemAgingScripts": ["/scripts/items/rotting.lua"], "rottingMultiplier": 1, "blockingEffects": ["wellfed"] -} \ No newline at end of file +} diff --git a/items/generic/food/yettas.consumable b/items/generic/food/yettas.consumable index 36deea72421..670a0c29210 100644 --- a/items/generic/food/yettas.consumable +++ b/items/generic/food/yettas.consumable @@ -4,7 +4,7 @@ "price" : 1622, "category" : "preparedFood", "inventoryIcon" : "yettas.png", - "description" : "Thought to exist only in legend, until the recipe was found after 4000 years.\n^cyan;+^white;30% ^pink;Radiation ^cyan;Res ^gray;(^white;5m^gray;)\n^red;-^white;5% ^red;HP ^gray;(^white;220s^gray;)\n^blue;+^white;3 ^blue;Madness^reset;", + "description" : "Thought to exist only in legend, until the recipe was found after 4000 years.\n^cyan;+^white;30% ^pink;Radiation ^cyan;Res ^gray;(^white;5m^gray;)\n^red;-^white;5% ^red;HP ^gray;(^white;220s^gray;)\n^blue;Madness Gain^reset; 4", "shortdescription" : "Yettas", "foodValue" : 70, "tooltipKind" : "food", diff --git a/items/generic/loot/babyheadonastick.consumable b/items/generic/loot/babyheadonastick.consumable index 67f94d071dd..8d24855619d 100644 --- a/items/generic/loot/babyheadonastick.consumable +++ b/items/generic/loot/babyheadonastick.consumable @@ -4,7 +4,7 @@ "category" : "food", "price" : 55, "inventoryIcon" : "babyheadonastick.png", - "description" : "Floran delicacy.\n^red;-^white;5% ^red;HP ^gray;(^white;10s^gray;)\n^blue;+^white;0.5 ^blue;Madness^reset; \n^red;Type: Raw Meat^reset;", + "description" : "Floran delicacy.\n^red;-^white;5% ^red;HP ^gray;(^white;10s^gray;) ^blue;Madness Gain^reset; 1\n^red;Type: Raw Meat^reset;", "shortdescription" : "Baby Head (on a stick)", "maxStack" : 1000, "foodValue" : 30, diff --git a/items/generic/loot/devilsbargain.consumable b/items/generic/loot/devilsbargain.consumable index bf81093230e..905ce85b186 100644 --- a/items/generic/loot/devilsbargain.consumable +++ b/items/generic/loot/devilsbargain.consumable @@ -4,7 +4,7 @@ "price": 1200, "category": "medicine", "inventoryIcon": "devilsbargain.png", - "description": "^red;-^white;25% ^red;HP ^gray;& ^red;EP^gray;,\n^cyan;+^white;20% ^pink;All ^cyan;Res ^gray;& ^cyan;Damage^gray;,\n^cyan;+^white;55% ^cyan;Run ^gray;(^white;2m^gray;)\n^blue;+^white;2 ^blue;Madness^reset;", + "description": "^red;-^white;25% ^red;HP ^gray;& ^red;EP^gray;,\n^cyan;+^white;20% ^pink;All ^cyan;Res ^gray;& ^cyan;Damage^gray;,\n^cyan;+^white;55% ^cyan;Run ^gray;(^white;2m^gray;)\n^blue;Madness Gain^reset; 3", "shortdescription": "The Devil's Bargain", "effects": [["devilsbargain", "madnessgain2"]], "tooltipKind": "food", diff --git a/items/generic/loot/faceskin.consumable b/items/generic/loot/faceskin.consumable index 68526128d7e..a5a08ff7ebd 100644 --- a/items/generic/loot/faceskin.consumable +++ b/items/generic/loot/faceskin.consumable @@ -4,7 +4,7 @@ "category" : "food", "price" : 220, "inventoryIcon" : "faceskin.png", - "description" : "Just like mom used to make.\n^red;-^white;5% ^red;HP ^gray;(^white;10s^gray;)\n^blue;+^white;1 ^blue;Madness^reset; \n^red;Type: Raw Meat^reset;", + "description" : "Just like mom used to make.\n^red;-^white;5% ^red;HP ^gray;(^white;10s^gray;)\n^blue;Madness Gain^reset; 2 \n^red;Type: Raw Meat^reset;", "shortdescription" : "Face Skin", "maxStack" : 1000, "foodValue" : 10, diff --git a/items/generic/loot/feces.consumable b/items/generic/loot/feces.consumable index dcf8b897720..b4544f57360 100644 --- a/items/generic/loot/feces.consumable +++ b/items/generic/loot/feces.consumable @@ -4,7 +4,7 @@ "category" : "medicine", "price" : 0, "inventoryIcon" : "feces.png", - "description" : "Fecal matter. I doubt you require more description\n^red;Poisoned ^gray;(^white;5s^gray;)\n^blue;+^white;1 ^blue;Madness^reset;\n^green;Growth Rate x^white;1.5 ^gray;& ^green;+^white;1 ^green;produce.\n^cyan;-^white;1 ^cyan;seed use^reset;", + "description" : "Fecal matter. I doubt you require more description\n^red;Poisoned ^gray;(^white;5s^gray;)\n^blue;Madness Gain^reset; 2\n^green;Growth Rate x^white;1.5 ^gray;& ^green;+^white;1 ^green;produce.\n^cyan;-^white;1 ^cyan;seed use^reset;", "shortdescription" : "Fecal Matter", "effects" : [ [ "madnessgain", diff --git a/items/generic/loot/fudeathstick.consumable b/items/generic/loot/fudeathstick.consumable index a7d2d4888f7..1a6e03337da 100644 --- a/items/generic/loot/fudeathstick.consumable +++ b/items/generic/loot/fudeathstick.consumable @@ -4,7 +4,7 @@ "price" : 100, "category" : "medicine", "inventoryIcon" : "deathstick.png", - "description" : "A narcotic extracted from the Gemglow seed.\n^cyan;+^white;20 ^cyan;EP^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;-^white;20 ^red;Defense^reset; (220s)", + "description" : "A narcotic extracted from the Gemglow seed.\n^cyan;+^white;20 ^cyan;EP^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;-^white;20 ^red;Defense^reset; (220s) ^blue;Madness Gain^reset; 2", "shortdescription" : "Telk Death-Stick", "effects" : [ [ "madnessgain", diff --git a/items/generic/loot/fupilldrug.consumable b/items/generic/loot/fupilldrug.consumable index 4df394252f2..63087c8b9c5 100644 --- a/items/generic/loot/fupilldrug.consumable +++ b/items/generic/loot/fupilldrug.consumable @@ -4,7 +4,7 @@ "price" : 100, "category" : "medicine", "inventoryIcon" : "pilldrug.png", - "description" : "Extracted from Capriole flowers. A heavy class-A narcotic.\n^cyan;+^white;20% ^cyan;Energy Regen^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;-^white;30 ^red;Defense^gray;, ^red;Insanity^reset; (220s)", + "description" : "Extracted from Capriole flowers. A heavy class-A narcotic.\n^cyan;+^white;20% ^cyan;Energy Regen^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;-^white;30 ^red;Defense^gray;, ^red;Insanity^reset; (220s) ^blue;Madness Gain^reset; 3", "shortdescription" : "Cappa", "effects" : [ [ "madnessgain2", diff --git a/items/generic/loot/fushroomspore.consumable b/items/generic/loot/fushroomspore.consumable index 153221f01a6..6cd5f9ffcee 100644 --- a/items/generic/loot/fushroomspore.consumable +++ b/items/generic/loot/fushroomspore.consumable @@ -4,7 +4,7 @@ "price" : 100, "category" : "medicine", "inventoryIcon" : "shroomspore.png", - "description" : "Ghost mushroom spores. Best when burned.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;Insanity^gray; (^white;520s^gray;)^reset;", + "description" : "Ghost mushroom spores. Best when burned.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;Insanity^gray; (^white;520s^gray;)^reset; ^blue;Madness Gain^reset; 3", "shortdescription" : "Ghost-Spore", "effects" : [ [ "madnessgain2", diff --git a/items/generic/loot/futeltikparasite.consumable b/items/generic/loot/futeltikparasite.consumable index 88198f62cc6..d397171431e 100644 --- a/items/generic/loot/futeltikparasite.consumable +++ b/items/generic/loot/futeltikparasite.consumable @@ -4,7 +4,7 @@ "price" : 100, "category" : "medicine", "inventoryIcon" : "teltikparasite.png", - "description" : "Parasites found on fletchweed. Converts saliva into hallucinogens.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;Insanity^gray;, ^reset;(^white;220s^reset;)", + "description" : "Parasites found on fletchweed. Converts saliva into hallucinogens.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Heavily Intoxicated^gray;, ^red;Insanity^gray;, ^reset;(^white;220s^reset;) ^blue;Madness Gain^reset; 2", "shortdescription" : "Teltik Vison Worm", "effects" : [ [ "madnessgain", diff --git a/items/generic/loot/myphisinjector.consumable b/items/generic/loot/myphisinjector.consumable index ae8d1516684..f3282e29944 100644 --- a/items/generic/loot/myphisinjector.consumable +++ b/items/generic/loot/myphisinjector.consumable @@ -4,7 +4,7 @@ "price": 3500, "category": "medicine", "inventoryIcon": "myphisinjector.png", - "description": "A mysterious drug.\n^red;Hammered^gray;, ^red;-^white;50% ^red;Run^gray;, ^red;-^white;30% ^red;Jump^gray;, ^cyan;+^white;15% ^pink;All ^cyan;Res^gray;, ^cyan;Extremely Caffeinated ^gray;(^white;220s^gray;)\n^blue;+^white;5 ^blue;Madness^reset;", + "description": "A mysterious drug.\n^red;Hammered^gray;, ^red;-^white;50% ^red;Run^gray;, ^red;-^white;30% ^red;Jump^gray;, ^cyan;+^white;15% ^pink;All ^cyan;Res^gray;, ^cyan;Extremely Caffeinated ^gray;(^white;220s^gray;) ^blue;Madness Gain^reset; 1", "shortdescription": "Myphis Mist Injector", "tooltipKind": "food", "effects": [ diff --git a/items/generic/loot/portaljuice.consumable b/items/generic/loot/portaljuice.consumable index 933406b8520..9475fd25a39 100644 --- a/items/generic/loot/portaljuice.consumable +++ b/items/generic/loot/portaljuice.consumable @@ -4,7 +4,7 @@ "price" : 200, "category" : "medicine", "inventoryIcon" : "portaljuice.png", - "description" : "^cyan;If near death, warps you elsewhere and gives ^gray;(^white;10m^gray;) ^blue;+^white;1^gray;-^white;36 ^blue;Madness^reset;", + "description" : "^cyan;If near death, warps you elsewhere and gives ^gray;(^white;10m^gray;) ^blue;Madness Gain^reset; 1", "shortdescription" : "Portal Juice", "effects" : [ [ "madnessgain05", "portaljuice" ] ], "tooltipKind" : "food", diff --git a/items/generic/loot/powderednarcotics.consumable b/items/generic/loot/powderednarcotics.consumable index 2862cc6ea76..f6bacdbbb15 100644 --- a/items/generic/loot/powderednarcotics.consumable +++ b/items/generic/loot/powderednarcotics.consumable @@ -4,7 +4,7 @@ "price" : 500, "category" : "medicine", "inventoryIcon" : "powderednarcotics.png", - "description" : "Absolutely illegal in 97 sectors. Awesome in all of them.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Extremely Caffeinated^gray;, ^red;-^white;30 ^red;Defense^gray;, ^red;Insanity^gray;, ^red;Poisoned ^gray;(^white;220s^gray;)^reset;", + "description" : "Absolutely illegal in 97 sectors. Awesome in all of them.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Extremely Caffeinated^gray;, ^red;-^white;30 ^red;Defense^gray;, ^red;Insanity^gray;, ^red;Poisoned ^gray;(^white;220s^gray;)^reset; ^blue;Madness Gain^reset; 3", "shortdescription" : "Bigraxian Hellpowder", "effects" : [ [ "madnessgain2", diff --git a/items/generic/loot/purecocainium.consumable b/items/generic/loot/purecocainium.consumable index 586d442235b..4f7d30dc248 100644 --- a/items/generic/loot/purecocainium.consumable +++ b/items/generic/loot/purecocainium.consumable @@ -4,7 +4,7 @@ "price" : 1000, "category" : "medicine", "inventoryIcon" : "purecocainium.png", - "description" : "You probably shouldn't be seen carrying this around.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Extremely Caffeinated^gray;, ^red;-^white;30 ^red;Defense^gray;, ^red;Insanity^gray;, ^red;Poisoned ^gray;(^white;220s^gray;)^reset;", + "description" : "You probably shouldn't be seen carrying this around.\n^cyan;+^white;30 ^cyan;EP^gray;, ^cyan;Extremely Caffeinated^gray;, ^red;-^white;30 ^red;Defense^gray;, ^red;Insanity^gray;, ^red;Poisoned ^gray;(^white;220s^gray;)^reset; ^blue;Madness Gain^reset; 3", "shortdescription" : "Pure Cocanium", "effects" : [ [ "madnessgain2", diff --git a/items/generic/loot/serumstim.consumable b/items/generic/loot/serumstim.consumable index 6fd67c897cd..10ed71d1950 100644 --- a/items/generic/loot/serumstim.consumable +++ b/items/generic/loot/serumstim.consumable @@ -4,7 +4,7 @@ "category" : "medicine", "price" : 200, "inventoryIcon" : "serumstim.png", - "description" : "A long-lasting vitality enhancer.\n^cyan;+^white;25% ^cyan;HP ^gray;(^white;2m^gray;)\n^blue;+^white;5 ^blue;Madness^reset;", + "description" : "A long-lasting vitality enhancer.\n^cyan;+^white;25% ^cyan;HP ^gray;(^white;2m^gray;) ^blue;Madness Gain^reset; 1", "shortdescription" : "Blood Serum Stim", "effects" : [ [ "percenthealthbooststim","madnessgain05" ] ], "tooltipKind" : "food", diff --git a/items/generic/loot/thesauce.consumable b/items/generic/loot/thesauce.consumable index b29193fe12a..07ca0b2270c 100644 --- a/items/generic/loot/thesauce.consumable +++ b/items/generic/loot/thesauce.consumable @@ -4,7 +4,7 @@ "price" : 200, "category" : "medicine", "inventoryIcon" : "thesauce.png", - "description" : "Protects you from damage via some sort of...weird mojo.\n^cyan;+^white;30% ^cyan;Defense ^gray;(^white;2m^gray;)\n^blue;+^white;3 ^blue;Madness^reset;", + "description" : "Protects you from damage via some sort of...weird mojo.\n^cyan;+^white;30% ^cyan;Defense ^gray;(^white;2m^gray;) ^blue;Madness Gain^reset; 4", "shortdescription" : "The Sauce", "tooltipKind" : "food", "effects" : [ ["madnessgain3","percentarmorboost30"] ], diff --git a/items/generic/loot/uberstim.consumable b/items/generic/loot/uberstim.consumable index f9f8e882946..6a99d7a0df8 100644 --- a/items/generic/loot/uberstim.consumable +++ b/items/generic/loot/uberstim.consumable @@ -4,7 +4,7 @@ "category": "medicine", "price": 200, "inventoryIcon": "uberstim.png", - "description": "A VERY high dosage of performance enhancers.\n^cyan;+^white;350% ^cyan;Run^gray;, ^cyan;+^white;150% ^cyan;Jump^gray;, ^cyan;Feather Fall ^gray;(^white;24s^gray;)\n^blue;+^white;2 ^blue;Madness^reset;", + "description": "A VERY high dosage of performance enhancers.\n^cyan;+^white;350% ^cyan;Run^gray;, ^cyan;+^white;150% ^cyan;Jump^gray;, ^cyan;Feather Fall ^gray;(^white;24s^gray;) ^blue;Madness Gain^reset; 3", "shortdescription": "Uber-Stim", "tooltipKind": "food", "effects": [["fusupermovementstim", "madnessgain2"]], diff --git a/items/generic/loot/ultrastim.consumable b/items/generic/loot/ultrastim.consumable index 333749ed27b..4340821191f 100644 --- a/items/generic/loot/ultrastim.consumable +++ b/items/generic/loot/ultrastim.consumable @@ -4,7 +4,7 @@ "price": 200, "category": "medicine", "inventoryIcon": "ultrastim.png", - "description": "^cyan;+^white;6 ^cyan;Defense ^gray;(^white;2m^gray;)\n^cyan;-^white;30% ^cyan;Gravity ^gray;(^white;15s^gray;)\n^green;Repair ^white;160% ^green;Shield HP ^gray;(^white;30s^gray;)\n^green;Heal ^white;40% ^green;HP ^gray;(^white;1m^gray;)\n^blue;+^white;2 ^blue;Madness^reset;", + "description": "^cyan;+^white;6 ^cyan;Defense ^gray;(^white;2m^gray;)\n^cyan;-^white;30% ^cyan;Gravity ^gray;(^white;15s^gray;)\n^green;Repair ^white;160% ^green;Shield HP ^gray;(^white;30s^gray;)\n^green;Heal ^white;40% ^green;HP ^gray;(^white;1m^gray;)\n^blue;Madness Gain^reset; 3", "shortdescription": "X-Stim", "tooltipKind": "food", "effects": [