Skip to content

Commit

Permalink
Adds some new clothing items and cargo crates (#11140)
Browse files Browse the repository at this point in the history
* New sunglasses and fedoras

* Fix

* Adds some more hats

* CL

* Fix vox icons
  • Loading branch information
unid15 authored and clusterfack committed Jul 31, 2016
1 parent 0c129d0 commit 3cc694c
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 0 deletions.
60 changes: 60 additions & 0 deletions code/datums/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,66 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
manifest += "Contains any [num_contained] of:"
..()

/datum/supply_packs/randomised/cheap_hats
name = "Hat crate"
cost = 50
containername = "dusty crate"
num_contained = 5
contains = list(\
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/bearpelt,
/obj/item/clothing/head/beaverhat,
/obj/item/clothing/head/beret,
/obj/item/clothing/head/boaterhat,
/obj/item/clothing/head/bowlerhat,
/obj/item/clothing/head/chefhat,
/obj/item/clothing/head/cowboy,
/obj/item/clothing/head/dunce_cap,
/obj/item/clothing/head/fedora,
/obj/item/clothing/head/fedora/brown,
/obj/item/clothing/head/fedora/white,
/obj/item/clothing/head/fez,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/head/greenbandana,
/obj/item/clothing/head/hasturhood,
/obj/item/clothing/head/headband,
/obj/item/clothing/head/libertyhat,
/obj/item/clothing/head/mailman,
/obj/item/clothing/head/naziofficer,
/obj/item/clothing/head/panzer,
/obj/item/clothing/head/powdered_wig,
/obj/item/clothing/head/soft/mime,
/obj/item/clothing/head/squatter_hat,
/obj/item/clothing/head/that,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/wizard/magus/fake,
/obj/item/clothing/head/wizard/clown/fake,
/obj/item/clothing/head/wizard/necro/fake
)

/datum/supply_packs/randomised/cheap_glasses
name = "Glasses crate"
cost = 50
containername = "dusty crate"
num_contained = 5
contains = list(\
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/glasses/gglasses,
/obj/item/clothing/glasses/kaminaglasses,
/obj/item/clothing/glasses/monocle,
/obj/item/clothing/glasses/regular,
/obj/item/clothing/glasses/regular/hipster,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/simonglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses/big,
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/clothing/glasses/sunglasses/prescription,
/obj/item/clothing/glasses/sunglasses/purple,
/obj/item/clothing/glasses/sunglasses/rockstar,
/obj/item/clothing/glasses/sunglasses/star,
)

/datum/supply_packs/formal_wear
contains = list(/obj/item/clothing/head/that,
/obj/item/clothing/suit/storage/lawyer/bluejacket,
Expand Down
15 changes: 15 additions & 0 deletions code/modules/clothing/glasses/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,21 @@

qdel(src)

/obj/item/clothing/glasses/sunglasses/purple
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes, and the colored lenses let you see the world in purple."
name = "purple sunglasses"
icon_state = "sun_purple"

/obj/item/clothing/glasses/sunglasses/star
name = "star-shaped sunglasses"
desc = "Novelty sunglasses, both lenses are in the shape of a star."
icon_state = "sun_star"

/obj/item/clothing/glasses/sunglasses/rockstar
name = "red star-shaped sunglasses"
desc = "Novelty sunglasses with a fancy silver frame and two red-tinted star-shaped lenses. You should probably stomp on them and get a pair of normal ones."
icon_state = "sun_star_silver"

/obj/item/clothing/glasses/virussunglasses
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
name = "sunglasses"
Expand Down
16 changes: 16 additions & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,16 @@

usr.visible_message("[usr] tips \his fedora.", "You tip your fedora.")

/obj/item/clothing/head/fedora/white
name = "white fedora"
icon_state = "fedora_white"
desc = "A great white hat ruined by being within fifty yards of you."

/obj/item/clothing/head/fedora/brown
name = "brown fedora"
icon_state = "fedora_brown"
desc = "Don't you even think about losing it."

/obj/item/clothing/head/fez
name = "\improper fez"
icon_state = "fez"
Expand Down Expand Up @@ -402,3 +412,9 @@
icon_state = "mummy"
item_state = "mummy"
_color = "mummy"

/obj/item/clothing/head/dunce_cap
name = "dunce cap"
desc = "A conical paper hat which used to be used as a punishment in schools. Misbehaving children had to wear it while standing in a corner. The writing on it says \"DUNCE\"."
icon_state = "duncecap"
item_state = "duncecap"
12 changes: 12 additions & 0 deletions code/modules/clothing/suits/wiz_robe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,21 @@
item_state = "magus"
siemens_coefficient = 0.8

/obj/item/clothing/head/wizard/magus/fake
desc = "A mysterious helmet."
wizard_garb = 0

/obj/item/clothing/head/wizard/clown
name = "purple wizard hat"
desc = "Strange-looking purple hat-wear that most certainly belongs to a real magic user."
icon_state = "wizhatclown"
item_state = "wizhatclown" // cheating
siemens_coefficient = 0.8

/obj/item/clothing/head/wizard/clown/fake
desc = "Strange-looking purple hat-wear that most certainly doesn't belong to a real magic user."
wizard_garb = 0

/obj/item/clothing/head/wizard/amp
name = "psychic amplifier"
desc = "A crown-of-thorns psychic amplifier. Kind of looks like a tiara having sex with an industrial robot."
Expand All @@ -51,6 +59,10 @@
item_state = "necrohood"
siemens_coefficient = 0.8

/obj/item/clothing/head/wizard/necro/fake
desc = "An elegant hood woven with child labor somewhere in Space China."
wizard_garb = 0

/obj/item/clothing/head/wizard/magician
name = "Magical Tophat"
desc = "A magical tophat perfect for any magical performance."
Expand Down
7 changes: 7 additions & 0 deletions html/changelogs/unid-hea.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
author: Unid

delete-after: True

changes:
- rscadd: Added some new sunglasses, fedoras and dunce caps.
- rscadd: Added hat crates and glasses crates to cargo, both of them cost 50 credits and contain some ordinary hats and glasses (some of which are otherwise unobtainable).
Binary file modified icons/mob/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/eyes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/glasses.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.

0 comments on commit 3cc694c

Please sign in to comment.