Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-10a

This commit is contained in:
Majkl-J
2024-10-20 04:12:02 -07:00
1411 changed files with 131464 additions and 65514 deletions
@@ -460,6 +460,8 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
grind_results = list(/datum/reagent/cellulose = 10)
material_type = /datum/material/bamboo
walltype = /turf/closed/wall/mineral/bamboo
drop_sound = null
pickup_sound = null
/datum/armor/mineral_bamboo
fire = 50
@@ -826,6 +828,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
grind_results = list(/datum/reagent/carbon = 10)
merge_type = /obj/item/stack/sheet/bone
material_type = /datum/material/bone
drop_sound = null
pickup_sound = null
/obj/item/stack/sheet/bone/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
. = ..()
@@ -899,6 +903,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
resistance_flags = FLAMMABLE
grind_results = list(/datum/reagent/cellulose = 20)
material_type = /datum/material/paper
drop_sound = null
pickup_sound = null
/obj/item/stack/sheet/paperframes/get_main_recipes()
. = ..()
@@ -920,6 +926,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
merge_type = /obj/item/stack/sheet/meat
material_type = /datum/material/meat
material_modifier = 1 //None of that wussy stuff
drop_sound = null
pickup_sound = null
/obj/item/stack/sheet/meat/fifty
amount = 50
@@ -937,6 +945,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
merge_type = /obj/item/stack/sheet/pizza
material_type = /datum/material/pizza
material_modifier = 1
drop_sound = null
pickup_sound = null
/obj/item/stack/sheet/pizza/fifty
amount = 50