Merge pull request #2065 from redstryker/Flannels

Adds Flannels
This commit is contained in:
Yoshax
2016-07-09 01:10:01 +01:00
committed by GitHub
4 changed files with 91 additions and 2 deletions

View File

@@ -267,4 +267,16 @@
for(var/track_style in typesof(/obj/item/clothing/suit/storage/toggle/track))
var/obj/item/clothing/suit/storage/toggle/track/track = track_style
tracks[initial(track.name)] = track
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tracks))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tracks))
/datum/gear/suit/flannel
display_name = "grey flannel"
path = /obj/item/clothing/suit/storage/flannel
/datum/gear/suit/flannel/red
display_name = "red flannel"
path = /obj/item/clothing/suit/storage/flannel/red
/datum/gear/suit/flannel/aqua
display_name = "aqua flannel"
path = /obj/item/clothing/suit/storage/flannel/aqua

View File

@@ -719,4 +719,81 @@
icon_state = "trackjacketwhite"
item_state = "trackjacketwhite"
icon_open = "trackjacketwhite_open"
icon_closed = "trackjacketwhite"
icon_closed = "trackjacketwhite"
//Flannels
/obj/item/clothing/suit/storage/flannel
name = "Flannel shirt"
desc = "A comfy, grey flannel shirt. Unleash your inner hipster."
icon_state = "flannel"
item_state = "gy_suit"
var/rolled = 0
var/tucked = 0
var/buttoned = 0
/obj/item/clothing/suit/storage/flannel/verb/roll_sleeves()
set name = "Roll Sleeves"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living))
return
if(usr.stat)
return
if(rolled == 0)
rolled = 1
usr << "<span class='notice'>You roll up the sleeves of your [src].</span>"
else
rolled = 0
usr << "<span class='notice'>You roll down the sleeves of your [src].</span>"
update_icon()
/obj/item/clothing/suit/storage/flannel/verb/tuck()
set name = "Toggle Shirt Tucking"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)||usr.stat)
return
if(tucked == 0)
tucked = 1
usr << "<span class='notice'>You tuck in your your [src].</span>"
else
tucked = 0
usr << "<span class='notice'>You untuck your [src].</span>"
update_icon()
/obj/item/clothing/suit/storage/flannel/verb/button()
set name = "Toggle Shirt Buttons"
set category = "Object"
set src in usr
if(!istype(usr, /mob/living)||usr.stat)
return
if(buttoned == 0)
buttoned = 1
usr << "<span class='notice'>You unbutton your [src].</span>"
else
buttoned = 0
usr<<"<span class='notice'>You button your [src].</span>"
update_icon()
/obj/item/clothing/suit/storage/flannel/update_icon()
icon_state = initial(icon_state)
if(rolled)
icon_state += "r"
if(tucked)
icon_state += "t"
if(buttoned)
icon_state += "b"
/obj/item/clothing/suit/storage/flannel/red
desc = "A comfy, red flannel shirt. Unleash your inner hipster."
icon_state = "flannel_red"
item_state = "r_suit"
/obj/item/clothing/suit/storage/flannel/aqua
desc = "A comfy, aqua flannel shirt. Unleash your inner hipster."
icon_state = "flannel_aqua"
item_state = "b_suit"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 409 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 143 KiB