cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds three new hair flower pins - yellow, blue, and pink.

Browse Source 
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
This commit is contained in:
Jon
2015-09-09 23:26:10 +01:00
committed by Neerti
parent 6740dea5ad
commit 9f2ec9c163
7 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/supplypacks.dm
View File

@@ -1413,6 +1413,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/head/hasturhood,
/obj/item/clothing/head/powdered_wig,
/obj/item/clothing/head/hairflower,
/obj/item/clothing/head/hairflower/yellow,
/obj/item/clothing/head/hairflower/blue,
/obj/item/clothing/head/hairflower/pink,
/obj/item/clothing/mask/gas/owl_mask,
/obj/item/clothing/mask/gas/monkeymask,
/obj/item/clothing/head/helmet/gladiator,
@@ -1500,4 +1503,4 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/device/kit/paint/gygax/darkgygax,
/obj/item/device/kit/paint/gygax/recitence
)
name = "Random Gygax exosuit modkit"
name = "Random Gygax exosuit modkit"

3
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -21,6 +21,9 @@
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/head/hairflower
new /obj/item/clothing/head/hairflower/pink
new /obj/item/clothing/head/hairflower/yellow
new /obj/item/clothing/head/hairflower/blue
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/rank/bartender(src)

22
code/modules/client/preferences_gear.dm
View File

@@ -196,12 +196,30 @@ var/global/list/gear_datums = list()
cost = 1
slot = slot_head
/datum/gear/hairflower
display_name = "hair flower pin"
/datum/gear/rhairflower
display_name = "hair flower pin, red"
path = /obj/item/clothing/head/hairflower
cost = 1
slot = slot_head
/datum/gear/yhairflower
display_name = "hair flower pin, yellow"
path = /obj/item/clothing/head/hairflower/yellow
cost = 1
slot = slot_head
/datum/gear/ghairflower
display_name = "hair flower pin, pink"
path = /obj/item/clothing/head/hairflower/pink
cost = 1
slot = slot_head
/datum/gear/bhairflower
display_name = "hair flower pin, blue"
path = /obj/item/clothing/head/hairflower/blue
cost = 1
slot = slot_head
/datum/gear/dbhardhat
display_name = "hardhat, blue"
path = /obj/item/clothing/head/hardhat/dblue

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

@@ -18,6 +18,15 @@
slot_flags = SLOT_HEAD | SLOT_EARS
body_parts_covered = 0
/obj/item/clothing/head/hairflower/blue
icon_state = "hairflower_blue"
/obj/item/clothing/head/hairflower/pink
icon_state = "hairflower_pink"
/obj/item/clothing/head/hairflower/yellow
icon_state = "hairflower_yellow"
/obj/item/clothing/head/powdered_wig
name = "powdered wig"
desc = "A powdered wig."
@@ -243,7 +252,7 @@
)
flags_inv = BLOCKHAIR
siemens_coefficient = 2.0 //why is it so conductive?!
body_parts_covered = 0
body_parts_covered = 0
/obj/item/clothing/head/orangebandana //themij: Taryn Kifer
name = "orange bandana"