Male toilets now use the correct icon in the editor.

Captain's armor, hat, jumpsuit are now blue. HoP's jumpsuit is also blue.
Old colors are now centcom Commander and Centcom Officer jumpsuits/armor.

Green=Central Command.
Blue=Command.
Red=Security.
White=Research.
Yellow=Engineering.
Light Blue=Medical.

Stamp colors changed to reflect this. Command radio also changed.
Minor tile color changes to the Bridge and other places.
Warden now has a dark red undersuit instead of blue.
Rig suit is fixed and is now in Engineering once again.
More redundancy fixes in clothing code.
Removed techpriest.dmi from mob. Not sure if it was committed with the last update. Sprites are stored in mob/robots.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@515 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-02 05:25:37 +00:00
parent 2f48c83d31
commit dd97a0e45d
16 changed files with 4875 additions and 4871 deletions

View File

@@ -373,7 +373,7 @@
/area/crew_quarters/sleep_male/toilet_male
name = "Male Toilets"
icon_state = "Sleep"
icon_state = "toilet"
/area/crew_quarters/sleep_female
name = "Female Dorm"

View File

@@ -182,7 +182,7 @@
name = "Cent. Comm. hat"
icon_state = "centcom"
flags = FPRINT|TABLEPASS|SUITSPACE
item_state = "centcom"
item_state = "centhat"
/obj/item/clothing/head/det_hat
name = "hat"
@@ -496,16 +496,11 @@
permeability_coefficient = 0.01
heat_transfer_coefficient = 0.30
/obj/item/clothing/suit/plaguedoctorsuit
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit
name = "Plague doctor suit"
desc = "It protected doctors from the Black Death, back then. You bet your arse it's gonna help you against viruses."
icon_state = "plaguedoctor"
item_state = "bio_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
heat_transfer_coefficient = 0.30
/obj/item/clothing/suit/det_suit
name = "coat"
@@ -604,6 +599,7 @@
/obj/item/clothing/suit/armor/captain
name = "Captain's armor"
desc = "Wearing this armor exemplifies who is in charge. You are in charge."
icon_state = "caparmor"
item_state = "caparmor"
w_class = 4//bulky item
@@ -809,8 +805,7 @@
desc = "It has a Captains rank stripe on it."
name = "Captain Jumpsuit"
icon_state = "captain"
item_state = "dg_suit"
item_state = "caparmor"
color = "captain"
/obj/item/clothing/under/rank/chaplain
@@ -834,6 +829,13 @@
item_state = "r_suit"
color = "forensicsred"
/obj/item/clothing/under/rank/warden
desc = "It has a Warden rank stripe on it."
name = "Warden Jumpsuit"
icon_state = "darkred"
item_state = "r_suit"
color = "darkred"
/obj/item/clothing/under/rank/geneticist
desc = "Made of a special fiber that gives special protection against biohazards. Has a genetics rank stripe on it."
name = "Genetics Jumpsuit"
@@ -846,8 +848,8 @@
desc = "It has a Head of Personnel rank stripe on it."
name = "Head of Personnel Jumpsuit"
icon_state = "hop"
item_state = "g_suit"
color = "hopgreen"
item_state = "b_suit"
color = "hop"
/obj/item/clothing/under/rank/head_of_security
desc = "It has a Head of Security rank stripe on it."
@@ -923,7 +925,7 @@
/obj/item/clothing/under/det
name = "Hard worn suit"
desc = "Someone who wears this means business"
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
color = "detective"
@@ -950,7 +952,7 @@
/obj/item/clothing/under/sl_suit
desc = "A very amish looking suit"
desc = "A very amish looking suit."
name = "Amish Suit"
icon_state = "sl_suit"
color = "sl_suit"
@@ -969,9 +971,10 @@
item_state = "bl_suit"
color = "syndicate"
mode = 0
/obj/item/clothing/under/syndicate/notreally
/obj/item/clothing/under/syndicate/tacticool
name = "Tacticool Turtleneck"
desc = "Non-descript, slightly suspicious civilian clothing, wearing this makes you feel like buying an SKS, going into the woods, and operating."
desc = "Non-descript, slightly suspicious civilian clothing. Wearing this makes you feel like buying an SKS, going into the woods, and operating."
icon_state = "syndicate"
item_state = "bl_suit"
color = "syndicate"

View File

@@ -392,7 +392,7 @@
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/color/blue(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/under/rank/warden(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/clothing/head/helmet(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 23 KiB

File diff suppressed because it is too large Load Diff