cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 11:58:39 +01: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
code/modules/client/preference_setup/loadout/loadout_head.dm
+15 -8
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"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+9
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