Merge pull request #2472 from Yoshax/hawaii

Aloha
This commit is contained in:
Anewbe
2016-09-15 18:50:26 -05:00
committed by GitHub
7 changed files with 137 additions and 2 deletions

View File

@@ -218,4 +218,16 @@
/datum/gear/accessory/chaps/black
display_name = "chaps, black"
path = /obj/item/clothing/accessory/chaps/black
path = /obj/item/clothing/accessory/chaps/black
/datum/gear/accessory/hawaii
display_name = "hawaii shirt"
path = /obj/item/clothing/accessory/hawaii
/datum/gear/accessory/hawaii/New()
..()
var/list/shirts = list()
shirts["blue hawaii shirt"] = /obj/item/clothing/accessory/hawaii
shirts["red hawaii shirt"] = /obj/item/clothing/accessory/hawaii/red
shirts["random colored hawaii shirt"] = /obj/item/clothing/accessory/hawaii/random
gear_tweaks += new/datum/gear_tweak/path(shirts)

View File

@@ -28,6 +28,7 @@
desc = "Lucky suit jacket."
icon_state = "checkered_jacket"
/obj/item/clothing/accessory/chaps
name = "brown chaps"
desc = "A pair of loose, brown leather chaps."
@@ -112,4 +113,20 @@
name = "cargo poncho"
desc = "A simple, comfortable cloak without sleeves. This one is tan and grey, the colors of Cargo."
icon_state = "cargoponcho"
item_state = "cargoponcho"
item_state = "cargoponcho"
/obj/item/clothing/accessory/hawaii
name = "flower-pattern shirt"
desc = "You probably need some welder googles to look at this."
icon_state = "hawaii"
/obj/item/clothing/accessory/hawaii/red
icon_state = "hawaii2"
/obj/item/clothing/accessory/hawaii/random
name = "flower-pattern shirt"
/obj/item/clothing/accessory/hawaii/random/New()
if(prob(50))
icon_state = "hawaii2"
color = color_rotation(rand(-11,12)*15)