Skip to content

Commit

Permalink
Added pirate outfits to gimmick.dm by popular demand, since we had th…
Browse files Browse the repository at this point in the history
…e sprites. Also, Botanists now spawn with an apron.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@123 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
musketstgstation@gmail.com committed Sep 20, 2010
1 parent 5ca0829 commit 1f5c203
Show file tree
Hide file tree
Showing 11 changed files with 69 additions and 6 deletions.
8 changes: 7 additions & 1 deletion code/defines/obj/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,12 @@
item_state = "wcoat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS

/obj/item/clothing/suit/apron
name = "apron"
icon_state = "apron"
item_state = "apron"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS

/obj/item/clothing/suit/wizrobe
name = "robe"
desc = "A magnificant blue robe that seems to radiate power"
Expand Down Expand Up @@ -633,7 +639,7 @@
color = "orange"

/obj/item/clothing/under/color/pink
name = "Pink Jumpsuit (F)"
name = "Pink Jumpsuit"
icon_state = "pink"
item_state = "p_suit"
color = "pink"
Expand Down
66 changes: 61 additions & 5 deletions code/defines/obj/clothing/gimmick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
fire_resist = T0C+5200


/obj/item/clothing/under/nazi1
/*/obj/item/clothing/under/nazi1
name = "Nazi uniform"
desc = "SIEG HEIL!"
icon_state = "nazi1"
color = "nazi"
icon_state = "nazi"
color = "nazi1"*/ //no direction sprites

/obj/item/clothing/suit/greatcoat
name = "great coat"
Expand Down Expand Up @@ -86,13 +86,13 @@
name = "cloud"
desc = "cloud"
icon_state = "cloud"
color = "aqua"
color = "cloud"

/obj/item/clothing/under/yay
name = "yay"
desc = "Yay!"
icon_state = "yay"
color = "yellow"
color = "yay"

// UNUSED COLORS

Expand Down Expand Up @@ -250,3 +250,59 @@
item_state = "classic_baton"
flags = FPRINT | ONBELT | TABLEPASS
force = 10

/obj/item/clothing/under/pirate
name = "Pirate Outfit"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
color = "pirate"

/obj/item/clothing/head/pirate
name = "pirate hat"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"

/obj/item/clothing/suit/pirate
name = "pirate coat"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
flags = FPRINT | TABLEPASS

/obj/item/clothing/glasses/eyepatch
name = "eyepatch"
desc = "Yarr."
icon_state = "eyepatch"
item_state = "eyepatch"

/obj/item/clothing/head/bandana
name = "pirate bandana"
desc = "Yarr."
icon_state = "bandana"
item_state = "bandana"

/obj/item/clothing/under/schoolgirl
name = "schoolgirl uniform"
desc = "It's just like one of my Japanese animes!"
icon_state = "schoolgirl"
item_state = "schoolgirl"
color = "schoolgirl"

/* no left/right sprites
/obj/item/clothing/under/mario
name = "Mario costume"
desc = "Worn by Italian plumbers everywhere. Probably."
icon_state = "mario"
item_state = "mario"
color = "mario"
/obj/item/clothing/under/luigi
name = "Mario costume"
desc = "Player two. Couldn't you get the first controller?"
icon_state = "luigi"
item_state = "luigi"
color = "luigi"
*/

1 change: 1 addition & 0 deletions code/game/jobs/jobprocs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves)
src.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(src), slot_l_hand)
src.equip_if_possible(new /obj/item/clothing/suit/apron(src), slot_wear_suit)

if ("Librarian")

Expand Down
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/suit.dmi
Binary file not shown.
Binary file modified icons/mob/uniform.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.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.

0 comments on commit 1f5c203

Please sign in to comment.