cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 15:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Hair Pins (#5474)

Browse Source 
Adds (read:ports) a few hair pins, a few hair bows, more hair flower pins, and flower crowns. Make a wood circlet, then apply sunflower/poppy/harebell seeds to make a flower crown.

This PR also fixes department jackets, and finishes up by adding a sec cloak (and hos cloak) and sec jacket.
This commit is contained in:
ParadoxSpace
2018-11-03 16:29:12 -06:00
committed by Erki
parent 1b10bb1fe5
commit 85fe79ac11
22 changed files with 242 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,17 +89,24 @@
gear_tweaks += new/datum/gear_tweak/path(hardhat)
/datum/gear/head/hairflower
display_name = "hair flower pin selection"
path = /obj/item/clothing/head/hairflower
display_name = "hair flower pin (colorable)"
path = /obj/item/clothing/head/pin/flower/white
/datum/gear/head/hairflower/New()
..()
var/hairflower = list()
hairflower["hair flower pin, red"] = /obj/item/clothing/head/hairflower
hairflower["hair flower pin, blue"] = /obj/item/clothing/head/hairflower/blue
hairflower["hair flower pin, yellow"] = /obj/item/clothing/head/hairflower/yellow
hairflower["hair flower pin, pink"] = /obj/item/clothing/head/hairflower/pink
gear_tweaks += new/datum/gear_tweak/path(hairflower)
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/head/pin
display_name = "pin selection"
path = /obj/item/clothing/head/pin
/datum/gear/head/pin/New()
..()
var/list/pins = list()
for(var/pin in typesof(/obj/item/clothing/head/pin))
var/obj/item/clothing/head/pin/pin_type = pin
pins[initial(pin_type.name)] = pin_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pins))
/datum/gear/head/hats
display_name = "hat selection"

9
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -166,6 +166,11 @@
path = /obj/item/clothing/accessory/poncho/roles/cloak/medical
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
/datum/gear/suit/roles/poncho/cloak/security
display_name = "cloak, security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/security
allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
/datum/gear/suit/blue_lawyer_jacket
display_name = "suit jacket, blue"
path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
@@ -312,6 +317,10 @@
display_name = "department jacket, medical"
path = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
/datum/gear/suit/miscellaneous/sec_dep_jacket
display_name = "department jacket, security"
path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
/datum/gear/suit/miscellaneous/peacoat
display_name = "peacoat"
path = /obj/item/clothing/suit/storage/toggle/peacoat

112
code/modules/clothing/head/misc.dm
View File

@@ -10,21 +10,90 @@
desc = "It's good to be emperor."
siemens_coefficient = 0.9
/obj/item/clothing/head/hairflower
name = "hair flower pin"
icon_state = "hairflower"
desc = "Smells nice."
/obj/item/clothing/head/pin
icon_state = "pin"
item_state = "pin"
name = "hair pin"
desc = "A nice hair pin."
slot_flags = SLOT_HEAD | SLOT_EARS
body_parts_covered = 0
/obj/item/clothing/head/hairflower/blue
/obj/item/clothing/head/pin/pink
icon_state = "pinkpin"
item_state = "pinkpin"
name = "pink hair pin"
/obj/item/clothing/head/pin/clover
icon_state = "cloverpin"
item_state = "cloverpin"
name = "clover pin"
desc = "A hair pin in the shape of a clover leaf. Smells of mischief."
/obj/item/clothing/head/pin/butterfly
icon_state = "butterflypin"
item_state = "butterflypin"
name = "butterfly pin"
desc = "A hair pin in the shape of a bright blue butterfly."
/obj/item/clothing/head/pin/magnetic
icon_state = "magnetpin"
item_state = "magnetpin"
name = "magnetic 'pin'"
desc = "Finally, a hair pin even a robot chassis can use."
matter = list(DEFAULT_WALL_MATERIAL = 10)
/obj/item/clothing/head/pin/flower
name = "red flower pin"
icon_state = "hairflower"
item_state = "hairflower"
desc = "Smells nice."
/obj/item/clothing/head/pin/flower/blue
icon_state = "hairflower_blue"
item_state = "hairflower_blue"
name = "blue flower pin"
/obj/item/clothing/head/hairflower/yellow
icon_state = "hairflower_yellow"
/obj/item/clothing/head/hairflower/pink
/obj/item/clothing/head/pin/flower/pink
item_state = "hairflower_pink"
icon_state = "hairflower_pink"
name = "pink flower pin"
/obj/item/clothing/head/pin/flower/yellow
icon_state = "hairflower_yellow"
item_state = "hairflower_yellow"
name = "yellow flower pin"
/obj/item/clothing/head/pin/flower/violet
icon_state = "hairflower_violet"
item_state = "hairflower_violet"
name = "violet flower pin"
/obj/item/clothing/head/pin/flower/orange
icon_state = "hairflower_orange"
item_state = "hairflower_orange"
name = "orange flower pin"
/obj/item/clothing/head/pin/flower/white
icon_state = "hairflower_white"
item_state = "hairflower_white"
name = "white flower pin"
/obj/item/clothing/head/pin/bow
icon_state = "bow"
item_state = "bow"
name = "hair bow"
desc = "A ribbon tied into a bow with a clip on the back to attach to hair."
item_state_slots = list(slot_r_hand_str = "pill", slot_l_hand_str = "pill")
/obj/item/clothing/head/pin/bow/big
icon_state = "whiteribbon"
item_state = "whiteribbon"
name = "ribbon"
/obj/item/clothing/head/pin/bow/big/red
icon_state = "redribbon"
item_state = "redribbon"
name = "red ribbon"
/obj/item/clothing/head/powdered_wig
name = "powdered wig"
@@ -379,4 +448,27 @@
name = "loose beanie"
desc = "A head-hugging brimless winter cap. This one is loose."
icon_state = "beanie_hang"
item_state = "beanie"
item_state = "beanie"
//Flower crowns
/obj/item/clothing/head/sunflower_crown
name = "sunflower crown"
desc = "A flower crown weaved with sunflowers."
icon_state = "sunflower_crown"
item_state = "sunflower_crown"
body_parts_covered = 0
/obj/item/clothing/head/lavender_crown
name = "harebell crown"
desc = "A flower crown weaved with harebells."
icon_state = "lavender_crown"
item_state = "lavender_crown"
body_parts_covered = 0
/obj/item/clothing/head/poppy_crown
name = "poppy crown"
desc = "A flower crown weaved with poppies."
icon_state = "poppy_crown"
item_state = "poppy_crown"
body_parts_covered = 0

16
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -526,24 +526,38 @@
desc = "A cozy jacket in engineering's colors. Show your department pride!"
icon_state = "engi_dep_jacket"
item_state = "engi_dep_jacket"
icon_open = "engi_dep_jacket_open"
icon_closed = "engi_dep_jacket"
/obj/item/clothing/suit/storage/toggle/supply_dep_jacket
name = "supply department jacket"
desc = "A cozy jacket in supply's colors. Show your department pride!"
icon_state = "supply_dep_jacket"
item_state = "supply_dep_jacket"
icon_open = "supply_dep_jacket_open"
icon_closed = "supply_dep_jacket"
/obj/item/clothing/suit/storage/toggle/sci_dep_jacket
name = "science department jacket"
desc = "A cozy jacket in science's colors. Show your department pride!"
icon_state = "sci_dep_jacket"
item_state = "sci_dep_jacket"
icon_open = "sci_dep_jacket_open"
icon_closed = "sci_dep_jacket"
/obj/item/clothing/suit/storage/toggle/med_dep_jacket
name = "medical department jacket"
desc = "A cozy jacket in medical's colors. Show your department pride!"
icon_state = "med_dep_jacket"
item_state = "med_dep_jacket"
icon_open = "med_dep_jacket_open"
icon_closed = "med_dep_jacket"
/obj/item/clothing/suit/storage/toggle/sec_dep_jacket
name = "security department jacket"
desc = "A cozy jacket in security's colors. Show your department pride!"
icon_state = "sec_dep_jacket"
item_state = "sec_dep_jacket"
icon_open = "sec_dep_jacket_open"
icon_closed = "sec_dep_jacket"

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

@@ -453,10 +453,16 @@
/obj/item/clothing/accessory/poncho/roles/cloak/captain
name = "captain's cloak"
desc = "An elaborate cloak meant to be worn by the colony director."
desc = "An elaborate cloak meant to be worn by the Captain."
icon_state = "capcloak"
item_state = "capcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/hos
name = "head of security's cloak"
desc = "An elaborate cloak meant to be worn by the Head of Security."
icon_state = "hoscloak"
item_state = "hoscloak"
/obj/item/clothing/accessory/poncho/roles/cloak/cargo
name = "brown cloak"
desc = "A simple brown and black cloak worn by crate jockeys."
@@ -497,4 +503,10 @@
name = "blue cloak"
desc = "A simple blue and white cloak worn by suit sensor activists."
icon_state = "medcloak"
item_state = "medcloak"
item_state = "medcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/security
name = "dark blue cloak"
desc = "A simple dark blue cloak awarded by NanoTrasen for failing the introductory literacy test."
icon_state = "seccloak"
item_state = "seccloak"

2
code/modules/item_worth/worths_list.dm
View File

@@ -539,7 +539,7 @@ var/list/worths = list(
/obj/item/clothing/head/caphat/hop = 100,
/obj/item/clothing/head/caphat = 200,
/obj/item/clothing/head/centhat = 600,
/obj/item/clothing/head/hairflower = 5,
/obj/item/clothing/head/pin/flower = 5,
/obj/item/clothing/head/powdered_wig = 80,
/obj/item/clothing/head/justice = 30,
/obj/item/clothing/head/philosopher_wig = 70,

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

@@ -117,6 +117,7 @@
/material/wood/generate_recipes()
..()
recipes += new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1)
recipes += new/datum/stack_recipe("wood circlet", /obj/item/woodcirclet, 1)
recipes += new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20)
recipes += new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0)