From 32d8a7b6ce788b13889ede5cc0e4a706d363b25b Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Mon, 13 Feb 2012 19:07:55 +0000 Subject: [PATCH] - Added the security officer, warden and hos jumpsuits by Khodoque: http://nanotrasen.com/phpBB3/viewtopic.php?f=9&t=7627&start=20#p89942 Screenshot: http://www.kamletos.si/new%20security%20jumpsuits.PNG - Closets in security and the outpost that were labeled as "red wardrobe" are now labeled as "security wardrobe". git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3120 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/closet.dm | 4 ++-- code/defines/obj/clothing/jumpsuit.dm | 8 ++++---- html/changelog.html | 4 ++++ icons/mob/uniform.dmi | Bin 157364 -> 160262 bytes icons/obj/clothing/uniforms.dmi | Bin 34262 -> 37035 bytes 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index 98f67b57c9a..d1781e0555b 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -262,8 +262,8 @@ icon_closed = "pink" /obj/structure/closet/wardrobe/red - name = "Red Wardrobe" - desc = "Contains red jumpsuits." + name = "Security Wardrobe" + desc = "Contains security officer jumpsuits." icon_state = "red" icon_closed = "red" diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index 981ef0da6b7..dc4ca23c7a5 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -141,17 +141,17 @@ /obj/item/clothing/under/rank/warden desc = "Made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. This one has the word \"Warden\" written on the shoulders." name = "Warden Jumpsuit" - icon_state = "darkred" + icon_state = "warden" item_state = "r_suit" - color = "darkred" + color = "warden" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/under/rank/security name = "Security Jumpsuit" desc = "Made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection." - icon_state = "red" + icon_state = "security" item_state = "r_suit" - color = "red" + color = "secred" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/under/rank/vice diff --git a/html/changelog.html b/html/changelog.html index edab33b394b..b53f59c4369 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -94,6 +94,10 @@ should be listed in the changelog upon commit tho. Thanks. -->

13 February 2012

+

Khodoque updated:

+

Erro updated: