cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +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-04 00:29:12 +02: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/game/objects/items/weapons/improvised_components.dm
+39 -1
View File
@@ -144,4 +144,42 @@
icon_state = "buckler1"
force_divisor = 0.1
thrown_force_divisor = 0.1
default_material = "steel"
default_material = "steel"
/obj/item/woodcirclet
name = "wood circlet"
desc = "A small wood circlet for making a flower crown."
icon = 'icons/obj/buildingobject.dmi'
icon_state = "woodcirclet"
item_state = "woodcirclet"
w_class = ITEMSIZE_SMALL
/obj/item/woodcirclet/attackby(obj/item/W as obj, mob/user as mob)
var/obj/item/complete
if(istype(W,/obj/item/seeds/poppyseed))
to_chat(user, "<span class='notice'>You attach the poppy to the circlet and create a beautiful flower crown.</span>")
complete = new /obj/item/clothing/head/poppy_crown(get_turf(user))
user.drop_from_inventory(W)
user.drop_from_inventory(src)
qdel(W)
qdel(src)
user.put_in_hands(complete)
return
else if(istype(W,/obj/item/seeds/sunflowerseed))
to_chat(user, "<span class='notice'>You attach the sunflower to the circlet and create a beautiful flower crown.</span>")
complete = new /obj/item/clothing/head/sunflower_crown(get_turf(user))
user.drop_from_inventory(W)
user.drop_from_inventory(src)
qdel(W)
qdel(src)
user.put_in_hands(complete)
return
else if(istype(W,/obj/item/seeds/harebell))
to_chat(user, "<span class='notice'>You attach the harebell to the circlet and create a beautiful flower crown.</span>")
complete = new /obj/item/clothing/head/lavender_crown(get_turf(user))
user.drop_from_inventory(W)
user.drop_from_inventory(src)
qdel(W)
qdel(src)
user.put_in_hands(complete)
return
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+6 -1
View File
@@ -19,7 +19,12 @@
new /obj/item/clothing/head/that(src)
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/pin/flower(src)
new /obj/item/clothing/head/pin/flower/pink(src)
new /obj/item/clothing/head/pin/flower/yellow(src)
new /obj/item/clothing/head/pin/flower/blue(src)
new /obj/item/clothing/head/pin/pink(src)
new /obj/item/clothing/head/pin/magnetic(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/rank/bartender(src)