From 32936abf268a5535517a179cd993b2ed19a85c41 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 18 Feb 2011 02:01:49 +0000 Subject: [PATCH] New look for the bio suits and their closets Replaced all existing biosuits and hoods with the new sprites. changelog updated git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1054 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/closet.dm | 25 + code/defines/obj/clothing/head.dm | 15 + code/defines/obj/clothing/suit.dm | 15 + code/game/jobs/jobprocs.dm | 4 +- code/game/objects/closets/janitor.dm | 4 +- code/game/objects/closets/l3closet.dm | 49 +- code/game/objects/closets/secure/medical.dm | 4 +- code/game/objects/closets/secure/scientist.dm | 8 +- icons/changelog.html | 14 + icons/mob/head.dmi | Bin 25720 -> 29658 bytes icons/mob/suit.dmi | Bin 87896 -> 97508 bytes icons/obj/closet.dmi | Bin 15301 -> 18079 bytes icons/obj/clothing/hats.dmi | Bin 10855 -> 11900 bytes icons/obj/clothing/suits.dmi | Bin 19124 -> 21044 bytes maps/tgstation.2.0.2.dmm | 17032 ++++++++-------- tgstation.dme | 1 - 16 files changed, 8645 insertions(+), 8526 deletions(-) diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index fd62ac17262..eec2d9cfbec 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -58,6 +58,31 @@ icon_closed = "bio" icon_opened = "bioopen" +/obj/closet/l3closet/general + icon_state = "bio_general" + icon_closed = "bio_general" + icon_opened = "bioopen_general" + +/obj/closet/l3closet/virology + icon_state = "bio_virology" + icon_closed = "bio_virology" + icon_opened = "bioopen_virology" + +/obj/closet/l3closet/security + icon_state = "bio_security" + icon_closed = "bio_security" + icon_opened = "bioopen_security" + +/obj/closet/l3closet/janitor + icon_state = "bio_janitor" + icon_closed = "bio_janitor" + icon_opened = "bioopen_janitor" + +/obj/closet/l3closet/scientist + icon_state = "bio_scientist" + icon_closed = "bio_scientist" + icon_opened = "bioopen_scientist" + /obj/closet/syndicate desc = "Why is this here?" name = "Weapons Closet" diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index 46ef2104b61..84e4ba6fa66 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -12,6 +12,21 @@ permeability_coefficient = 0.01 flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH +/obj/item/clothing/head/bio_hood/general + icon_state = "bio_general" + +/obj/item/clothing/head/bio_hood/virology + icon_state = "bio_virology" + +/obj/item/clothing/head/bio_hood/security + icon_state = "bio_security" + +/obj/item/clothing/head/bio_hood/janitor + icon_state = "bio_janitor" + +/obj/item/clothing/head/bio_hood/scientist + icon_state = "bio_scientist" + /obj/item/clothing/head/cakehat name = "cakehat" desc = "It is a cakehat" diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 7f4f5743b1b..3ba8ccadaca 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -19,6 +19,21 @@ heat_transfer_coefficient = 0.30 slowdown = 1.3 +/obj/item/clothing/suit/bio_suit/general + icon_state = "bio_general" + +/obj/item/clothing/suit/bio_suit/virology + icon_state = "bio_virology" + +/obj/item/clothing/suit/bio_suit/security + icon_state = "bio_security" + +/obj/item/clothing/suit/bio_suit/janitor + icon_state = "bio_janitor" + +/obj/item/clothing/suit/bio_suit/scientist + icon_state = "bio_scientist" + /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." diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 5eff0949634..cb04a74da4c 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -455,8 +455,8 @@ src.equip_if_possible(new /obj/item/device/pda/toxins(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/under/rank/scientist(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes) -// src.equip_if_possible(new /obj/item/clothing/suit/bio_suit(src), slot_wear_suit) -// src.equip_if_possible(new /obj/item/clothing/head/bio_hood(src), slot_head) +// src.equip_if_possible(new /obj/item/clothing/suit/bio_suit/scientist(src), slot_wear_suit) +// src.equip_if_possible(new /obj/item/clothing/head/bio_hood/scientist(src), slot_head) src.equip_if_possible(new /obj/item/clothing/mask/gas(src), slot_wear_mask) src.equip_if_possible(new /obj/item/weapon/tank/air(src), slot_l_hand) diff --git a/code/game/objects/closets/janitor.dm b/code/game/objects/closets/janitor.dm index bf72d368246..31a43c57bf0 100644 --- a/code/game/objects/closets/janitor.dm +++ b/code/game/objects/closets/janitor.dm @@ -1,8 +1,8 @@ /obj/closet/jcloset/New() ..() sleep(2) - new /obj/item/clothing/suit/bio_suit(src) - new /obj/item/clothing/head/bio_hood(src) + new /obj/item/clothing/suit/bio_suit/janitor(src) + new /obj/item/clothing/head/bio_hood/janitor(src) new /obj/item/clothing/under/rank/janitor(src) new /obj/item/clothing/under/rank/janitor(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/game/objects/closets/l3closet.dm b/code/game/objects/closets/l3closet.dm index 267396dbe9d..a0073d38e4a 100644 --- a/code/game/objects/closets/l3closet.dm +++ b/code/game/objects/closets/l3closet.dm @@ -1,7 +1,52 @@ /obj/closet/l3closet/New() ..() sleep(2) - new /obj/item/clothing/suit/bio_suit( src ) + new /obj/item/clothing/suit/bio_suit/general( src ) new /obj/item/clothing/under/color/white( src ) new /obj/item/clothing/shoes/white( src ) - new /obj/item/clothing/head/bio_hood( src ) + new /obj/item/clothing/head/bio_hood/general( src ) + +/obj/closet/l3closet/general/New() + ..() + sleep(2) + contents = list() + new /obj/item/clothing/suit/bio_suit/general( src ) + new /obj/item/clothing/under/color/white( src ) + new /obj/item/clothing/shoes/white( src ) + new /obj/item/clothing/head/bio_hood/general( src ) + +/obj/closet/l3closet/virology/New() + ..() + sleep(2) + contents = list() + new /obj/item/clothing/suit/bio_suit/virology( src ) + new /obj/item/clothing/under/color/white( src ) + new /obj/item/clothing/shoes/white( src ) + new /obj/item/clothing/head/bio_hood/virology( src ) + +/obj/closet/l3closet/security/New() + ..() + sleep(2) + contents = list() + new /obj/item/clothing/suit/bio_suit/security( src ) + new /obj/item/clothing/under/color/white( src ) + new /obj/item/clothing/shoes/white( src ) + new /obj/item/clothing/head/bio_hood/security( src ) + +/obj/closet/l3closet/janitor/New() + ..() + sleep(2) + contents = list() + new /obj/item/clothing/suit/bio_suit/janitor( src ) + new /obj/item/clothing/under/color/white( src ) + new /obj/item/clothing/shoes/white( src ) + new /obj/item/clothing/head/bio_hood/janitor( src ) + +/obj/closet/l3closet/scientist/New() + ..() + sleep(2) + contents = list() + new /obj/item/clothing/suit/bio_suit/scientist( src ) + new /obj/item/clothing/under/color/white( src ) + new /obj/item/clothing/shoes/white( src ) + new /obj/item/clothing/head/bio_hood/scientist( src ) \ No newline at end of file diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index bbf7f3f104e..c478d551283 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -57,9 +57,9 @@ new /obj/item/clothing/under/rank/medical( src ) new /obj/item/weapon/tank/air( src ) new /obj/item/clothing/mask/gas( src ) - new /obj/item/clothing/suit/bio_suit( src ) + new /obj/item/clothing/suit/bio_suit/general( src ) new /obj/item/clothing/shoes/white( src ) new /obj/item/clothing/gloves/latex( src ) - new /obj/item/clothing/head/bio_hood( src ) + new /obj/item/clothing/head/bio_hood/general( src ) new /obj/item/clothing/suit/labcoat(src) return \ No newline at end of file diff --git a/code/game/objects/closets/secure/scientist.dm b/code/game/objects/closets/secure/scientist.dm index b5c2c883a83..7fd83fa61a6 100644 --- a/code/game/objects/closets/secure/scientist.dm +++ b/code/game/objects/closets/secure/scientist.dm @@ -3,11 +3,11 @@ sleep(2) new /obj/item/weapon/tank/air( src ) new /obj/item/clothing/mask/gas( src ) - new /obj/item/clothing/suit/bio_suit( src ) + new /obj/item/clothing/suit/bio_suit/general( src ) new /obj/item/clothing/under/rank/scientist( src ) new /obj/item/clothing/shoes/white( src ) new /obj/item/clothing/gloves/latex( src ) - new /obj/item/clothing/head/bio_hood( src ) + new /obj/item/clothing/head/bio_hood/general( src ) new /obj/item/clothing/suit/labcoat(src) return @@ -18,9 +18,9 @@ new /obj/item/clothing/under/rank/research_director( src ) new /obj/item/weapon/tank/air( src ) new /obj/item/clothing/mask/gas( src ) - new /obj/item/clothing/suit/bio_suit( src ) + new /obj/item/clothing/suit/bio_suit/scientist( src ) new /obj/item/clothing/shoes/white( src ) new /obj/item/clothing/gloves/latex( src ) - new /obj/item/clothing/head/bio_hood( src ) + new /obj/item/clothing/head/bio_hood/scientist( src ) new /obj/item/clothing/suit/labcoat(src) return \ No newline at end of file diff --git a/icons/changelog.html b/icons/changelog.html index ba0ac8e8d06..31a9ae780cb 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -39,6 +39,20 @@

Changelog

+ +18 February 2011, Friday +
    +
  • Errorage updated: +
      +
    • New look for the bio suits. (Biosuit and hood sprites by Cheridan)
      • +
    +
    • +
  • Rastaf0 updated: +
      +
    • Binary translator cost reduced to 1 telecrystal.
    +
    • +
+ 15 February 2011, Tuesday