Merge pull request #746 from jack-fractal/write-research-debug

R&D Research Levels Unification
This commit is contained in:
ZomgPonies
2015-04-06 23:28:27 -04:00
44 changed files with 152 additions and 74 deletions
@@ -24,7 +24,7 @@
/obj/item/weapon/storage/backpack/holding
name = "Bag of Holding"
desc = "A backpack that opens into a localized pocket of Blue Space."
origin_tech = "bluespace=4"
origin_tech = "bluespace=4;materials=6"
icon_state = "holdingpack"
max_w_class = 4
max_combined_w_class = 28
@@ -132,7 +132,7 @@
desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures."
storage_slots = INFINITY
max_combined_w_class = INFINITY
origin_tech = "bluespace=3"
origin_tech = "bluespace=3;materials=4"
icon_state = "satchel_bspace"
// -----------------------------
@@ -327,7 +327,7 @@
w_class = 4
max_w_class = 2
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
origin_tech = "bluespace=4"
origin_tech = "bluespace=4;materials=6"
can_hold = list()
proc/failcheck(mob/user as mob)