This commit is contained in:
DragonTrance
2021-02-21 08:37:10 -07:00
parent 58b69503e3
commit 24cb27b67c
30 changed files with 637 additions and 45 deletions
+1
View File
@@ -11,6 +11,7 @@
w_class = WEIGHT_CLASS_TINY
full_w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
grind_results = list(/datum/reagent/cellulose = 10)
var/value = 0
/obj/item/stack/spacecash/Initialize()
+5 -4
View File
@@ -142,6 +142,7 @@
stop_bleeding = 1800
self_delay = 20
max_amount = 12
grind_results = list(/datum/reagent/cellulose = 3)
/obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params)
@@ -196,10 +197,10 @@
desc = "A healing paste you can apply on wounds."
icon_state = "aloe_paste"
self_delay = 20
self_delay = 25
novariants = TRUE
amount = 20
max_amount = 20
heal_brute = 3
heal_burn = 3
grind_results = list(/datum/reagent/consumable/aloejuice = 1)
heal_brute = 25
heal_burn = 30
grind_results = list(/datum/reagent/consumable/aloejuice = 1)
@@ -247,7 +247,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/mineral/wood
novariants = TRUE
grind_results = list(/datum/reagent/carbon = 20)
grind_results = list(/datum/reagent/cellulose = 10)
/obj/item/stack/sheet/mineral/wood/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.wood_recipes
@@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/mineral/bamboo
grind_results = list(/datum/reagent/carbon = 5)
grind_results = list(/datum/reagent/cellulose = 10)
/obj/item/stack/sheet/mineral/wood/attackby(obj/item/W, mob/user, params) // NOTE: sheet_types.dm is where the WOOD stack lives. Maybe move this over there.
// Taken from /obj/item/stack/rods/attackby in [rods.dm]
@@ -355,6 +355,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
is_fabric = TRUE
loom_result = /obj/item/stack/sheet/silk
merge_type = /obj/item/stack/sheet/cloth
grind_results = list(/datum/reagent/cellulose = 4)
/obj/item/stack/sheet/cloth/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.cloth_recipes
@@ -374,6 +375,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
item_state = "sheet-cloth"
novariants = TRUE
merge_type = /obj/item/stack/sheet/silk
grind_results = list(/datum/reagent/cellulose = 2)
//obj/item/stack/sheet/silk/Initialize(mapload, new_amount, merge = TRUE)
// recipes = GLOB.silk_recipes
@@ -398,6 +400,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/durathread
grind_results = list(/datum/reagent/cellulose = 10)
/obj/item/stack/sheet/durathread/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.durathread_recipes
+1
View File
@@ -13,6 +13,7 @@
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
grind_results = list(/datum/reagent/cellulose = 3)
/obj/item/stack/wrapping_paper/use(used, transfer)
var/turf/T = get_turf(src)
+2 -2
View File
@@ -889,10 +889,10 @@ obj/item/storage/belt/slut/ComponentInitialize()
content_overlays = TRUE
/obj/item/storage/belt/botany/New()
. = ..()
if(prob(1))
new/obj/item/storage/belt/botany/fancy(loc)
qdel(src)
. = ..()
/obj/item/storage/belt/botany/ComponentInitialize()
. = ..()
@@ -915,4 +915,4 @@ obj/item/storage/belt/slut/ComponentInitialize()
/obj/item/storage/belt/botany/fancy //I like citadel's botany belt but I also wanna keep the default
desc = "A belt made for holding hydroponics supplies. Oddly enough, it's not green."
icon_state = "botanybelt_extra"
item_state = "botanybelt_extra"
item_state = "botanybelt_extra"