Reapply "Merge branch 'master' into trash-eat-Mk2"

This reverts commit d638582401.
This commit is contained in:
MrSky12
2024-05-15 23:28:30 +02:00
parent d638582401
commit 6ba955d90c
82 changed files with 1090 additions and 218 deletions
@@ -483,6 +483,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \
new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \
new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \
null, \
new/datum/stack_recipe("open/closed sign", /obj/item/service_sign), \
))
/obj/item/stack/sheet/cardboard //BubbleWrap //it's cardboard you fuck