Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Watcher wreaths; Normal and Icewing varieties #2773

Merged
merged 1 commit into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions code/datums/components/crafting/tailoring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,29 @@
)
category = CAT_CLOTHING

/datum/crafting_recipe/wreath
name = "Watcher Wreath"
result = /obj/item/clothing/neck/wreath
time = 2 SECONDS
reqs = list(
/obj/item/stack/sheet/bone = 2,
/obj/item/stack/sheet/sinew = 2,
/obj/item/stack/ore/diamond = 2,
)
category = CAT_CLOTHING

/datum/crafting_recipe/icewreath
name = "Icewing Wreath"
result = /obj/item/clothing/neck/wreath/icewing
time = 2 SECONDS
reqs = list(
/obj/item/stack/sheet/bone = 1,
/obj/item/stack/sheet/sinew = 1,
/obj/item/stack/ore/diamond = 2,
/obj/item/crusher_trophy/watcher_wing/ice_wing = 1,
)
category = CAT_CLOTHING

/datum/crafting_recipe/bracers
name = "Bone Bracers"
result = /obj/item/clothing/gloves/bracer
Expand Down
20 changes: 18 additions & 2 deletions code/modules/cargo/bounties/mining.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,32 @@
reward = CARGO_CRATE_VALUE * 15
required_count = 3
wanted_types = list(/obj/item/clothing/accessory/talisman = TRUE)

//NOVA EDIT REMOVAL
/*

/datum/bounty/item/mining/watcher_wreath
name = "Watcher Wreaths"
description = "Station 14's Research Director thinks they're onto a break-through on the cultural icons of some pagan beliefs. Ship them a few watcher wreaths for analysis."
reward = CARGO_CRATE_VALUE * 15
required_count = 3
wanted_types = list(/obj/item/clothing/neck/wreath = FALSE)

/datum/bounty/item/mining/icewing_wreath
name = "Icewing Wreath"
description = "We're getting some....weird messages from Station 14's Research Director. And most of what they said was incoherent. But they apparently want an icewing wreath. Could you send them one?"
reward = CARGO_CRATE_VALUE * 30
required_count = 1
wanted_types = list(/obj/item/clothing/neck/wreath/icewing = FALSE)
*/
//END NOVA EDIT REMOVAL

/datum/bounty/item/mining/bone_dagger
name = "Bone Daggers"
description = "Central Command's canteen is undergoing budget cuts. Ship over some bone daggers so our chef can keep working."
reward = CARGO_CRATE_VALUE * 10
required_count = 3
wanted_types = list(/obj/item/knife/combat/bone = TRUE)
*/
//END NOVA EDIT REMOVAL

/datum/bounty/item/mining/polypore_mushroom
name = "Mushroom Bowl"
Expand Down
20 changes: 20 additions & 0 deletions code/modules/clothing/neck/_neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -487,3 +487,23 @@
/obj/item/clothing/neck/beads/Initialize(mapload)
. = ..()
color = color = pick("#ff0077","#d400ff","#2600ff","#00ccff","#00ff2a","#e5ff00","#ffae00","#ff0000", "#ffffff")

/obj/item/clothing/neck/wreath
name = "\improper Watcher Wreath"
desc = "An elaborate crown made from the twisted flesh and sinew of a watcher. \
Wearing it makes you feel like you have eyes in the back of your head."
icon_state = "watcher_wreath"
worn_y_offset = 10
alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER
resistance_flags = FIRE_PROOF

/obj/item/clothing/neck/wreath/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
. = ..()
if(!isinhands)
. += emissive_appearance(icon_file, "wreath_emissive", src, alpha = src.alpha)

/obj/item/clothing/neck/wreath/icewing
name = "\improper Icewing Wreath"
desc = "An elaborate crown made from the twisted flesh and sinew of an icewing watcher. \
Wearing it sends shivers down your spine just from being near it."
icon_state = "icewing_wreath"
Binary file modified icons/mob/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/neck.dmi
Binary file not shown.
Loading