cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether

Browse Source 
Adds bracelets!
This commit is contained in:
Neerti
2017-11-21 01:32:35 -05:00
committed by GitHub
parent 2ac5947707 b1bfea36dc
commit cc616148e3
6 changed files with 105 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -209,3 +209,26 @@
var/obj/item/clothing/suit/sweater_type = sweater
sweaters[initial(sweater_type.name)] = sweater_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))
/datum/gear/accessory/bracelet/material
display_name = "bracelet selection"
description = "Choose from a number of bracelets."
path = /obj/item/clothing/accessory/bracelet
cost = 1
/datum/gear/accessory/bracelet/material/New()
..()
var/bracelettype = list()
bracelettype["bracelet, steel"] = /obj/item/clothing/accessory/bracelet/material/steel
bracelettype["bracelet, iron"] = /obj/item/clothing/accessory/bracelet/material/iron
bracelettype["bracelet, silver"] = /obj/item/clothing/accessory/bracelet/material/silver
bracelettype["bracelet, gold"] = /obj/item/clothing/accessory/bracelet/material/gold
bracelettype["bracelet, platinum"] = /obj/item/clothing/accessory/bracelet/material/platinum
bracelettype["bracelet, glass"] = /obj/item/clothing/accessory/bracelet/material/glass
bracelettype["bracelet, wood"] = /obj/item/clothing/accessory/bracelet/material/wood
bracelettype["bracelet, plastic"] = /obj/item/clothing/accessory/bracelet/material/plastic
gear_tweaks += new/datum/gear_tweak/path(bracelettype)
/datum/gear/accessory/bracelet/friendship
display_name = "friendship bracelet"
path = /obj/item/clothing/accessory/bracelet/friendship

78
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -302,3 +302,81 @@
/obj/item/clothing/accessory/scarf/stripedblue
name = "striped blue scarf"
icon_state = "stripedbluescarf"
//bracelets
/obj/item/clothing/accessory/bracelet
name = "bracelet"
desc = "A simple silver bracelet with a clasp."
icon = 'icons/obj/clothing/ties.dmi'
icon_state = "bracelet"
w_class = ITEMSIZE_TINY
slot_flags = SLOT_TIE
/obj/item/clothing/accessory/bracelet/friendship
name = "friendship bracelet"
desc = "A beautiful friendship bracelet in all the colors of the rainbow."
icon_state = "friendbracelet"
/obj/item/clothing/accessory/bracelet/friendship/verb/dedicate_bracelet()
set name = "Dedicate Bracelet"
set category = "Object"
set desc = "Dedicate your friendship bracelet to a special someone."
var/mob/M = usr
if(!M.mind)
return 0
var/input = sanitizeSafe(input("Who do you want to dedicate the bracelet to?", ,""), MAX_NAME_LEN)
if(src && input && !M.stat && in_range(M,src))
desc = "A beautiful friendship bracelet in all the colors of the rainbow. It's dedicated to [input]."
to_chat(M, "You dedicate the bracelet to [input], remembering the times you've had together.")
return 1
/obj/item/clothing/accessory/bracelet/material
icon_state = "materialbracelet"
/obj/item/clothing/accessory/bracelet/material/New(var/newloc, var/new_material)
..(newloc)
if(!new_material)
new_material = DEFAULT_WALL_MATERIAL
material = get_material_by_name(new_material)
if(!istype(material))
qdel(src)
return
name = "[material.display_name] bracelet"
desc = "A bracelet made from [material.display_name]."
color = material.icon_colour
/obj/item/clothing/accessory/bracelet/material/get_material()
return material
/obj/item/clothing/accessory/bracelet/material/wood/New(var/newloc)
..(newloc, "wood")
/obj/item/clothing/accessory/bracelet/material/plastic/New(var/newloc)
..(newloc, "plastic")
/obj/item/clothing/accessory/bracelet/material/iron/New(var/newloc)
..(newloc, "iron")
/obj/item/clothing/accessory/bracelet/material/steel/New(var/newloc)
..(newloc, "steel")
/obj/item/clothing/accessory/bracelet/material/silver/New(var/newloc)
..(newloc, "silver")
/obj/item/clothing/accessory/bracelet/material/gold/New(var/newloc)
..(newloc, "gold")
/obj/item/clothing/accessory/bracelet/material/platinum/New(var/newloc)
..(newloc, "platinum")
/obj/item/clothing/accessory/bracelet/material/phoron/New(var/newloc)
..(newloc, "phoron")
/obj/item/clothing/accessory/bracelet/material/glass/New(var/newloc)
..(newloc, "glass")
..()

2
code/modules/materials/material_recipes.dm
View File

@@ -13,7 +13,7 @@
recipes += new/datum/stack_recipe("[display_name] armor plate", /obj/item/weapon/material/armor_plating, 1, time = 20, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] grave marker", /obj/item/weapon/material/gravemarker, 5, time = 50, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] ring", /obj/item/clothing/gloves/ring/material, 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] bracelet", /obj/item/clothing/accessory/bracelet/material, 1, on_floor = 1, supplied_material = "[name]")
if(integrity>=50)
recipes += new/datum/stack_recipe("[display_name] door", /obj/structure/simple_door, 10, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")