mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 23:27:34 +01:00
Unit test material checks are now performed on all crafting recipes by default. All stack recipes now transfer mats to the results (#92620)
## About The Pull Request Extends the part of the crafting unit test that ensures consistency between the total mats of the components of a recipe (or rather, the result of said recipe) and a generic instance of the same type as its result, previously only implemented on food recipes. ## Why It's Good For The Game This ensures a degree of consistency with the material composition of various objects in the game. I couldn't do it in the original PR as that one was too big already and it took months to get it merged, and have the relative bugs fixed. Currently a WIP as I slowly deal with the unit test reports. ## Changelog 🆑 refactor: Follow-up to the crafting/material refactor from months ago. All objects crafted with stacks now inherit their mat composition (not necessarily the effects and color) by default, while previously only a few things like chair, sinks and toilets did. Report any object looking or behaving weirdly as a result. fix: The material composition of ammo boxes is no longer a 1/10 of what it's supposed to be. It was a shitty hack to make it harder to recycle empty ammo boxes. Instead, they lose materials as they're emptied now. /🆑
This commit is contained in:
@@ -513,6 +513,7 @@
|
||||
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE|ITEM_SLOT_NECK
|
||||
resistance_flags = FLAMMABLE
|
||||
storage_type = /datum/storage/bag/rebar_quiver
|
||||
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
|
||||
|
||||
/obj/item/storage/bag/rebar_quiver/syndicate
|
||||
icon_state = "syndie_quiver_0"
|
||||
@@ -582,6 +583,7 @@
|
||||
|
||||
/obj/item/storage/bag/quiver/lesser
|
||||
storage_type = /datum/storage/bag/quiver/less
|
||||
custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/obj/item/storage/bag/quiver/full/PopulateContents()
|
||||
. = ..()
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
/obj/item/storage/box/Initialize(mapload)
|
||||
. = ..()
|
||||
if(foldable_result == /obj/item/stack/sheet/cardboard)
|
||||
set_custom_materials(list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT))
|
||||
update_appearance()
|
||||
|
||||
/obj/item/storage/box/suicide_act(mob/living/carbon/user)
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
illustration = null
|
||||
resistance_flags = FLAMMABLE
|
||||
foldable_result = null
|
||||
custom_materials = list(/datum/material/paper = SHEET_MATERIAL_AMOUNT * 1.25)
|
||||
/// A list of all available papersack reskins
|
||||
var/list/papersack_designs = list()
|
||||
///What design from papersack_designs we are currently using.
|
||||
|
||||
@@ -609,7 +609,7 @@
|
||||
spawn_count = 10
|
||||
contents_tag = "pickle"
|
||||
foldable_result = /obj/item/reagent_containers/cup/beaker/large
|
||||
custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT)
|
||||
custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.25)
|
||||
open_status = FANCY_CONTAINER_ALWAYS_OPEN
|
||||
has_open_closed_states = FALSE
|
||||
storage_type = /datum/storage/pickles_jar
|
||||
|
||||
@@ -498,6 +498,7 @@
|
||||
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
storage_type = /datum/storage/test_tube_rack
|
||||
custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/obj/item/storage/test_tube_rack/update_icon_state()
|
||||
icon_state = "[base_icon_state][contents.len > 0 ? contents.len : null]"
|
||||
|
||||
Reference in New Issue
Block a user