cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
parent e9ee4dea19 2a5fae5d2a
commit e28e9fbdba
453 changed files with 20635 additions and 15897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+2 -1
View File
@@ -605,7 +605,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
. = ..()
. += GLOB.durathread_recipes
/obj/item/stack/sheet/durathread/on_item_crafted(mob/builder, atom/created)
/obj/item/stack/sheet/durathread/used_in_craft(atom/created, datum/crafting_recipe/recipe)
. = ..()
created.set_armor_rating(CONSUME, max(50, created.get_armor_rating(CONSUME)))
/obj/item/stack/sheet/cotton