From f50f5818e6378d84bb15350385e8a4811ec5efce Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 16 Mar 2014 22:15:20 +0200 Subject: [PATCH] Uniform update Uniforms updated, minor things, nothing ACTUALLY fixed. --- code/modules/clothing/under/jobs/security.dm | 2 -- code/modules/customitems/item_defines.dm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index aff08dff..b5188273 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -171,9 +171,7 @@ name = "Naval Head of Security Uniform" desc = "A service uniform worn by a Head of Security of the NanoTrasen Naval branch." icon_state = "hosdnavyclothes" - item_state = "hosdnavyclothes" item_color = "hosdnavyclothes" - item_color armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) flags = FPRINT | TABLEPASS siemens_coefficient = 0.8 diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 89b60415..843c6dea 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -115,8 +115,8 @@ desc = "A modest uniform. the name-tag reads 'Olivia Conrad'." icon = 'icons/obj/custom_items.dmi' icon_state = "olivia_skirt" - item_color = "black" - item_state = "olivia_skirt_s" + item_color = "olivia_skirt" + item_state = "olivia_skirt" /obj/item/clothing/head/hairflower/fluff/olivia_flower //White Flower - Olivia Conrad - meowykins - DONE name = "White flower"