shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors leather & Crafting with Bigenerator (#849)

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-18 01:11:58 -05:00
committed by Poojawa
parent 4370b5285a
commit d2be6cfeb5
2 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/leather.dm
+24 -2
View File
@@ -118,6 +118,9 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
var/wetness = 30 //Reduced when exposed to high temperautres
var/drying_threshold_temperature = 500 //Kelvin to start drying
/*
* Leather SHeet
*/
/obj/item/stack/sheet/leather
name = "leather"
desc = "The by-product of mob grinding."
@@ -125,6 +128,24 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
icon_state = "sheet-leather"
origin_tech = "materials=2"
GLOBAL_LIST_INIT(leather_recipes, list ( \
new/datum/stack_recipe("wallet", /obj/item/weapon/storage/wallet, 1), \
new/datum/stack_recipe("muzzle", /obj/item/clothing/mask/muzzle, 2), \
new/datum/stack_recipe("botany gloves", /obj/item/clothing/gloves/botanic_leather, 3), \
new/datum/stack_recipe("toolbelt", /obj/item/weapon/storage/belt/utility, 4), \
new/datum/stack_recipe("leather satchel", /obj/item/weapon/storage/backpack/satchel, 5), \
new/datum/stack_recipe("bandolier", /obj/item/weapon/storage/belt/bandolier, 5), \
new/datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7), \
new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \
))
/obj/item/stack/sheet/leather/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.leather_recipes
return ..()
/*
* Sinew
*/
/obj/item/stack/sheet/sinew
name = "watcher sinew"
icon = 'icons/obj/mining.dmi'
@@ -136,11 +157,12 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \
GLOBAL_LIST_INIT(sinew_recipes, list ( \
new/datum/stack_recipe("sinew restraints", /obj/item/weapon/restraints/handcuffs/sinew, 1, on_floor = 1), \
))
))
/obj/item/stack/sheet/sinew/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.sinew_recipes
return ..()
/*
* Plates
*/
@@ -207,4 +229,4 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
var/obj/item/stack/sheet/leather/HS = new(src.loc)
HS.amount = 1
wetness = initial(wetness)
src.use(1)
src.use(1)
code/modules/research/designs/biogenerator_designs.dm
+4 -52
View File
@@ -115,28 +115,12 @@
build_path = /obj/item/stack/sheet/cloth
category = list("initial","Leather and Cloth")
/datum/design/wallet
name = "Wallet"
id = "wallet"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 100)
build_path = /obj/item/weapon/storage/wallet
category = list("initial","Leather and Cloth")
/datum/design/botany_gloves
name = "Botanical Gloves"
id = "botany_gloves"
/datum/design/leather
name = "Sheet of Leather"
id = "leather"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 150)
build_path = /obj/item/clothing/gloves/botanic_leather
category = list("initial","Leather and Cloth")
/datum/design/toolbelt
name = "Utility Belt"
id = "toolbelt"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 300)
build_path = /obj/item/weapon/storage/belt/utility
build_path = /obj/item/stack/sheet/leather
category = list("initial","Leather and Cloth")
/datum/design/secbelt
@@ -163,14 +147,6 @@
build_path = /obj/item/weapon/storage/belt/janitor
category = list("initial","Leather and Cloth")
/datum/design/bandolier
name = "Bandolier Belt"
id = "bandolier"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 300)
build_path = /obj/item/weapon/storage/belt/bandolier
category = list("initial","Leather and Cloth")
/datum/design/s_holster
name = "Shoulder Holster"
id = "s_holster"
@@ -179,30 +155,6 @@
build_path = /obj/item/weapon/storage/belt/holster
category = list("initial","Leather and Cloth")
/datum/design/leather_satchel
name = "Leather Satchel"
id = "leather_satchel"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 400)
build_path = /obj/item/weapon/storage/backpack/satchel
category = list("initial","Leather and Cloth")
/datum/design/leather_jacket
name = "Leather Jacket"
id = "leather_jacket"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 500)
build_path = /obj/item/clothing/suit/jacket/leather
category = list("initial","Leather and Cloth")
/datum/design/leather_overcoat
name = "Leather Overcoat"
id = "leather_overcoat"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 1000)
build_path = /obj/item/clothing/suit/jacket/leather/overcoat
category = list("initial","Leather and Cloth")
/datum/design/rice_hat
name = "Rice Hat"
id = "rice_hat"