fix

GuyBronson · Apr 23, 2019 · ee4ce78 · ee4ce78
1 parent 4a3f90f
commit ee4ce78
Show file tree

Hide file tree

Showing 16 changed files with 71 additions and 2 deletions.
diff --git a/_FUversioning.config b/_FUversioning.config
@@ -5,6 +5,8 @@
 __________________________________________________
   ^cyan;New in version 5.6.293^reset;
 
+  * added Xi bed
+
   * Combustion generator is less fuel hungry, burning each unit of fuel for longer than before by an average of 2 seconds per unit
 
   * added Carbon Dioxide as a new resource. It can be gathered via extraction from coal and limestone, oil, and other sources.

diff --git a/a_notyetadded/objects/psiamplifier.png → a_notyetadded/objects/elder/psiamplifier.png b/a_notyetadded/objects/psiamplifier.png → a_notyetadded/objects/elder/psiamplifier.png
diff --git a/a_notyetadded/objects/elder/psionicamplifier.png b/a_notyetadded/objects/elder/psionicamplifier.png
diff --git a/a_notyetadded/objects/elder/psionicsbench.png b/a_notyetadded/objects/elder/psionicsbench.png
diff --git a/a_notyetadded/objects/xi/xibedcover.png b/a_notyetadded/objects/xi/xibedcover.png
diff --git a/a_notyetadded/roughmachine.png b/a_notyetadded/roughmachine.png
diff --git a/a_notyetadded/roughmachine2.png b/a_notyetadded/roughmachine2.png
diff --git a/codex/elder/madness_research1.codex b/codex/elder/madness_research1.codex
@@ -7,7 +7,7 @@
 
 "All matter in the universe is composed of small packets of energy known as quantas. This energy, which goes into the making up of atoms pulsates or resonates at a particular frequency. Each atom being different therefore, has a slightly different pulsation or frequency.", 
 "Thus each material thing being made up of a combination of atoms, called molecules, has its own unique frequency, unlike any other. Now because each individual thing is unique, no potato for instance is exactly like any other potato.",
-"There exists an �empathy� between the whole potato and each of its individual parts. If you slice that potato in half, the frequency of each half is exactly the same. The only example of that frequency anywhere in the universe."
+"There exists an 'empathy' between the whole potato and each of its individual parts. If you slice that potato in half, the frequency of each half is exactly the same. The only example of that frequency anywhere in the universe."
 
   ],
     "itemConfig" : {

diff --git a/items/active/unsorted/fu_lootbox/fu_lootbox.activeitem b/items/active/unsorted/fu_lootbox/fu_lootbox.activeitem
@@ -2,7 +2,7 @@
 	"itemName" : "fu_lootbox",
 	"price" : 2000,
 	"level" : 1,
-	"maxStack" : 1,
+	"maxStack" : 1000,
 	"rarity" : "Legendary",
 	"category" : "mysteriousReward",
 	"description" : "'$20 for a *chance* to get something useful? Sign me the f*** up!",

diff --git a/objects/radien/bed/xibed.frames b/objects/radien/bed/xibed.frames
@@ -0,0 +1,10 @@
+{
+
+  "frameGrid" : {
+    "size" : [48, 24],
+    "dimensions" : [1, 1],
+    "names" : [
+      [ "default" ]
+    ]
+  }
+}
diff --git a/objects/radien/bed/xibed.object b/objects/radien/bed/xibed.object
@@ -0,0 +1,45 @@
+{
+  "objectName" : "xibed",
+  "colonyTags" : ["xi","radien","bed"],
+  "rarity" : "Common",
+  "category" : "furniture",
+  "price" : 125,
+  "description" : "An unusual form of bed intended for X'i.",
+  "shortdescription" : "Xian Bed",
+  "race" : "radien",
+
+  "objectType" : "loungeable",
+  "sitFlipDirection" : true,
+  "sitOrientation" : "lay",
+  "sitAngle" : 90,
+  "sitEmote" : "sleep",
+  "sitStatusEffects" : [
+    "bed1"
+  ],
+  "sitEffectEmitters" : [ "sleepbubbles" ],
+
+
+  "inventoryIcon" : "xibedicon.png",
+  "orientations" : [
+
+    {
+      "image" : "xibed.png:<color>",
+      "sitCoverImage" : "/objects/radien/bed/xibedcover.png",
+      "flipImages" : true,
+      "imagePosition" : [-24, 0],
+      "spaceScan" : 0.1,
+      "anchors" : [ "bottom" ],
+      "direction" : "left",
+      "sitPosition" : [-8, 15]
+    },
+    {
+      "image" : "xibed.png:<color>",
+      "sitCoverImage" : "/objects/radien/bed/xibedcover.png",
+      "imagePosition" : [-24, 0],
+      "spaceScan" : 0.1,
+      "anchors" : [ "bottom" ],
+      "direction" : "right",
+      "sitPosition" : [-8, 15]
+    }
+  ]
+}
diff --git a/a_notyetadded/objects/xi/xibed.png → objects/radien/bed/xibed.png b/a_notyetadded/objects/xi/xibed.png → objects/radien/bed/xibed.png
diff --git a/objects/radien/bed/xibedcover.png b/objects/radien/bed/xibedcover.png
diff --git a/objects/radien/bed/xibedicon.png b/objects/radien/bed/xibedicon.png
diff --git a/recipes/emptyhands/radien/items/xibed.recipe b/recipes/emptyhands/radien/items/xibed.recipe
@@ -0,0 +1,11 @@
+{
+  "input" : [
+    { "item" : "alienmeat", "count" : 2 },
+    { "item" : "xibulb", "count" : 10 }
+  ],
+  "output" : {
+    "item" : "xibed",
+    "count" : 1
+  },
+  "groups" : [ "radiencrafting", "all" ]
+}
diff --git a/species/radien.species b/species/radien.species
@@ -19,6 +19,7 @@
 
 // Empty Hands
       { "item" : "flagradien" },
+      { "item" : "xibed" },
       { "item" : "radienquarterstaff" },
       { "item" : "radiendagger" },
       { "item" : "radienspear" },