-Softcaps can now be dyed in washing machines. Thanks to Intigracy for the sprite work

-Merged cargo maintenance /area/ into mining dock (It was so small and pointless)
-A few aesthetic changes to the map

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3972 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-07-03 02:20:42 +00:00
parent 30348f24c4
commit 9e8f39683f
9 changed files with 7453 additions and 7362 deletions
+66 -4
View File
@@ -1,13 +1,14 @@
/obj/item/clothing/head/cargosoft
/obj/item/clothing/head/soft
name = "cargo cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "cargosoft"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
item_state = "helmet"
color = "cargo"
var/flipped = 0
dropped()
src.icon_state = "cargosoft"
src.icon_state = "[color]soft"
src.flipped=0
..()
@@ -18,9 +19,70 @@
if(usr.canmove && !usr.stat && !usr.restrained())
src.flipped = !src.flipped
if(src.flipped)
icon_state = "cargosoft_flipped"
icon_state = "[color]soft_flipped"
usr << "You flip the hat backwards."
else
icon_state = "cargosoft"
icon_state = "[color]soft"
usr << "You flip the hat back in normal position."
usr.update_inv_head() //so our mob-overlays update
/obj/item/clothing/head/soft/red
name = "red cap"
desc = "It's a baseball hat in a tasteless red colour."
icon_state = "redsoft"
color = "red"
/obj/item/clothing/head/soft/blue
name = "blue cap"
desc = "It's a baseball hat in a tasteless blue colour."
icon_state = "bluesoft"
color = "blue"
/obj/item/clothing/head/soft/green
name = "green cap"
desc = "It's a baseball hat in a tasteless green colour."
icon_state = "greensoft"
color = "green"
/obj/item/clothing/head/soft/blue
name = "blue cap"
desc = "It's a baseball hat in a tasteless blue colour."
icon_state = "redsoft"
color = "cargo"
/obj/item/clothing/head/soft/yellow
name = "yellow cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "yellowsoft"
color = "yellow"
/obj/item/clothing/head/soft/grey
name = "blue cap"
desc = "It's a baseball hat in a tasteless grey colour."
icon_state = "greysoft"
color = "grey"
/obj/item/clothing/head/soft/orange
name = "orange cap"
desc = "It's a baseball hat in a tasteless orange colour."
icon_state = "orangesoft"
color = "orange"
/obj/item/clothing/head/soft/mime
name = "white cap"
desc = "It's a baseball hat in a tasteless white colour."
icon_state = "mimesoft"
color = "mime"
/obj/item/clothing/head/soft/purple
name = "purple cap"
desc = "It's a baseball hat in a tasteless purple colour."
icon_state = "purplesoft"
color = "purple"
/obj/item/clothing/head/soft/rainbow
name = "rainbow cap"
desc = "It's a baseball hat in a bright rainbow of colors."
icon_state = "rainbowsoft"
color = "rainbow"
+1 -1
View File
@@ -24,7 +24,7 @@
armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEEARS
/obj/item/clothing/head/secsoft
/obj/item/clothing/head/soft/sec
name = "soft cap"
desc = "It's baseball hat in tasteful red colour."
icon_state = "secsoft"
+2 -2
View File
@@ -147,7 +147,7 @@
/obj/item/weapon/bedsheet,
/obj/item/clothing/head/helmet/space/santahat,
/obj/item/clothing/head/collectable/paper,
/obj/item/clothing/head/cargosoft
/obj/item/clothing/head/soft
)
if( ! ( item_to_add.type in allowed_types ) )
@@ -216,7 +216,7 @@
emote_hear = list("barks christmas songs", "yaps")
desc = "He has a very shiny nose."
src.sd_SetLuminosity(6)
if(/obj/item/clothing/head/cargosoft)
if(/obj/item/clothing/head/soft)
name = "Corgi Tech [real_name]"
speak = list("Needs a stamp!", "Request DENIED!", "Fill these out in triplicate!")
desc = "The reason your yellow gloves have chew-marks."