mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
Objects crafted from lavaland fauna materials (bone, sinew, hide) are now fireproof and lavaproof. And also reinforced fishing lines. (#90627)
This commit is contained in:
committed by
Shadow-Quill
parent
d24439193f
commit
12644fc288
@@ -261,6 +261,7 @@
|
||||
cable_color = null
|
||||
custom_materials = null
|
||||
color = null
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/**
|
||||
* Red cable restraints
|
||||
|
||||
@@ -249,6 +249,7 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
|
||||
merge_type = /obj/item/stack/sheet/sinew
|
||||
drop_sound = 'sound/effects/meatslap.ogg'
|
||||
pickup_sound = 'sound/effects/meatslap.ogg'
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/stack/sheet/sinew/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
|
||||
. = ..()
|
||||
@@ -289,7 +290,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
|
||||
max_amount = 6
|
||||
novariants = FALSE
|
||||
item_flags = NOBLUDGEON
|
||||
resistance_flags = FIRE_PROOF
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
layer = MOB_LAYER
|
||||
merge_type = /obj/item/stack/sheet/animalhide/goliath_hide
|
||||
|
||||
@@ -834,6 +834,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
|
||||
material_type = /datum/material/bone
|
||||
drop_sound = null
|
||||
pickup_sound = null
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/stack/sheet/bone/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
|
||||
. = ..()
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
cold_protection = ARMS
|
||||
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
|
||||
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
|
||||
resistance_flags = NONE
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
armor_type = /datum/armor/gloves_bracer
|
||||
|
||||
/obj/item/clothing/gloves/bracer/Initialize(mapload)
|
||||
|
||||
@@ -525,7 +525,7 @@
|
||||
icon_state = "watcher_wreath"
|
||||
worn_y_offset = 10
|
||||
alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER
|
||||
resistance_flags = FIRE_PROOF
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/clothing/neck/wreath/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
|
||||
. = ..()
|
||||
|
||||
@@ -4,12 +4,14 @@
|
||||
desc = "A hunter's talisman, some say the old gods smile on those who wear it."
|
||||
icon_state = "talisman"
|
||||
attachment_slot = NONE
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/clothing/accessory/skullcodpiece
|
||||
name = "skull codpiece"
|
||||
desc = "A skull shaped ornament, intended to protect the important things in life."
|
||||
icon_state = "skull"
|
||||
attachment_slot = GROIN
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/clothing/accessory/skilt
|
||||
name = "sinew skirt"
|
||||
@@ -17,3 +19,4 @@
|
||||
icon_state = "skilt"
|
||||
minimize_when_attached = FALSE
|
||||
attachment_slot = GROIN
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
icon_state = "reel_green"
|
||||
line_color = "#2aae34"
|
||||
wiki_desc = "Allows you to fish in lava and plasma rivers and lakes."
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/fishing_line/reinforced/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -62,6 +63,7 @@
|
||||
fishing_line_traits = FISHING_LINE_STIFF
|
||||
line_color = "#d1cca3"
|
||||
wiki_desc = "Crafted from sinew. It allows you to fish in lava and plasma like the reinforced line, but it'll make the minigame harder."
|
||||
resistance_flags = FIRE_PROOF | LAVA_PROOF
|
||||
|
||||
/obj/item/fishing_line/sinew/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user