mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 06:00:16 +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:
@@ -21,11 +21,13 @@ FLOOR SAFES
|
||||
obj_flags = CONDUCTS_ELECTRICITY
|
||||
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
|
||||
custom_materials = list(
|
||||
/datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT*10,
|
||||
/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT*5,
|
||||
/datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT * 15,
|
||||
/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 8,
|
||||
/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 6,
|
||||
/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
|
||||
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
|
||||
)
|
||||
material_flags = MATERIAL_EFFECTS
|
||||
|
||||
/// The maximum combined w_class of stuff in the safe
|
||||
var/maxspace = 24
|
||||
/// The amount of tumblers that will be generated
|
||||
@@ -302,6 +304,11 @@ FLOOR SAFES
|
||||
icon_state = "floorsafe"
|
||||
density = FALSE
|
||||
layer = LOW_OBJ_LAYER
|
||||
custom_materials = list(
|
||||
/datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT * 15,
|
||||
/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 8,
|
||||
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.55,
|
||||
)
|
||||
|
||||
/obj/structure/safe/floor/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user