Skip to content

Commit

Permalink
Fix bracelet crafting, allows wallets to hold jewelery (#6582)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

- You can craft bracelets using materials again.
- Allows rings, bracelets, and necklaces to be put into wallets.

## Why It's Good For The Game

Fix good.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Wallets can now hold rings, bracelets, and necklaces.
fix: You can now craft bracelets using material sheets again.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
BlueWildrose authored Jul 13, 2024
1 parent 91745f1 commit ab5695c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
8 changes: 4 additions & 4 deletions code/datums/recipe/material_recipes/tools.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2023 Citadel Station developers. *//
//* Copyright (c) 2024 Citadel Station developers. *//

/datum/stack_recipe/material/tools
abstract_type = /datum/stack_recipe/material/tools
Expand All @@ -15,12 +15,12 @@
created += new /obj/item/clothing/gloves/ring/material(where, stack.material)
return TRUE

/datum/stack_recipe/material/tools/braclet
name = "ring"
/datum/stack_recipe/material/tools/bracelet
name = "bracelet"
result_type = /obj/item/clothing/accessory/bracelet/material
cost = 1

/datum/stack_recipe/material/tools/ring/make(atom/where, amount, obj/item/stack/material/stack, mob/user, silent, use_dir, list/created = list())
/datum/stack_recipe/material/tools/bracelet/make(atom/where, amount, obj/item/stack/material/stack, mob/user, silent, use_dir, list/created = list())
for(var/i in 1 to amount)
created += new /obj/item/clothing/accessory/bracelet/material(where, stack.material)
return TRUE
Expand Down
6 changes: 5 additions & 1 deletion code/game/objects/items/storage/wallets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@
/obj/item/stamp,
/obj/item/clothing/accessory/permit,
/obj/item/clothing/accessory/badge,
/obj/item/makeover
/obj/item/clothing/gloves/ring,
/obj/item/clothing/accessory/bracelet,
/obj/item/clothing/accessory/necklace,
/obj/item/clothing/accessory/metal_necklace,
/obj/item/makeover,
)
insertion_blacklist = list(/obj/item/tool/screwdriver/power)
slot_flags = SLOT_ID
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/obj/item/clothing/accessory/bracelet/material
abstract_type = /obj/item/clothing/accessory/bracelet/material
icon_state = "materialbracelet"
materials_base = null
material_parts = /datum/material/steel
Expand Down

0 comments on commit ab5695c

Please sign in to comment.