From 67e0554d34e2befd284d92b174812d4a0c2088c2 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Thu, 24 Mar 2011 06:23:59 +0000 Subject: [PATCH] CHANGELOG UPDATED - Opaque windows (tinted and frosted) now look darker - Added a trashcart object (trash bin, behaves like a crate) - Added several recolored spacecash items. Some spawn in the vault. - Added a new type of cigar. - Applied the owl costume fixes by DabirA. They look strange when used with a backpack tho. - Overalls now work for all directions - Added thermal monocle object (thermoncle) - Removed the swat_suit (which was broken) and all it's references (from human.dm) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1261 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/mining.dm | 1 + code/defines/obj/clothing/gimmick.dm | 8 ++++-- code/defines/obj/clothing/glasses.dm | 4 +++ code/defines/obj/clothing/mask.dm | 9 ++++++ code/defines/obj/clothing/suit.dm | 2 +- code/defines/obj/window.dm | 2 ++ code/game/gamemodes/setupgame.dm | 2 +- code/game/objects/closets/secure/captain.dm | 2 +- .../objects/closets/secure/engineering.dm | 2 +- code/game/objects/closets/secure/medical.dm | 2 +- code/game/objects/closets/secure/scientist.dm | 3 +- code/game/objects/closets/secure/security.dm | 4 +-- code/game/objects/items/clothing.dm | 3 +- code/game/objects/storage/crates.dm | 9 ++++++ code/game/objects/window.dm | 2 ++ code/modules/mob/living/carbon/human/human.dm | 27 +++++++++--------- icons/changelog.html | 15 +++++++--- icons/mob/eyes.dmi | Bin 2861 -> 2860 bytes icons/mob/uniform.dmi | Bin 130322 -> 130034 bytes icons/obj/cigarettes.dmi | Bin 4775 -> 5943 bytes icons/obj/items.dmi | Bin 34631 -> 35650 bytes icons/obj/janitor.dmi | Bin 1107 -> 2728 bytes icons/obj/storage.dmi | Bin 24143 -> 25192 bytes icons/obj/structures.dmi | Bin 29672 -> 35639 bytes 24 files changed, 68 insertions(+), 29 deletions(-) diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index a5a38d51a995f..0749abc97f987 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -430,6 +430,7 @@ proc/check_craftlathe_recipe(var/list/param_recipe) ..() sleep(2) new /obj/item/device/analyzer(src) + new /obj/item/device/radio/headset/headset_mine(src) new /obj/item/clothing/under/rank/miner(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index 4eb711c38ef15..f5c4aa0e34e95 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -101,11 +101,12 @@ icon_state = "cloud" color = "cloud" -/obj/item/clothing/under/yay +/*/obj/item/clothing/under/yay name = "yay" desc = "Yay!" icon_state = "yay" - color = "yay" + color = "yay"*/ // no sprite --errorage + // UNUSED COLORS @@ -115,11 +116,12 @@ icon_state = "psyche" color = "psyche" +/* /obj/item/clothing/under/maroon name = "maroon" desc = "maroon" icon_state = "maroon" - color = "maroon" + color = "maroon"*/ // no sprite -- errorage /obj/item/clothing/under/lightblue name = "lightblue" diff --git a/code/defines/obj/clothing/glasses.dm b/code/defines/obj/clothing/glasses.dm index a7e889cfa88fa..a9713b7c2a495 100644 --- a/code/defines/obj/clothing/glasses.dm +++ b/code/defines/obj/clothing/glasses.dm @@ -41,3 +41,7 @@ icon_state = "thermal" item_state = "glasses" origin_tech = "magnets=3" + +/obj/item/clothing/glasses/thermal/monocle + name = "Thermoncle" + icon_state = "thermoncle" \ No newline at end of file diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm index 1ef68fc9f0508..468b29cc7390e 100644 --- a/code/defines/obj/clothing/mask.dm +++ b/code/defines/obj/clothing/mask.dm @@ -110,6 +110,7 @@ /obj/item/clothing/mask/cigarette/cigar name = "Premium Cigar" + desc = "Only for the best of space travelers." icon_state = "cigaroff" icon_on = "cigaron" icon_off = "cigaroff" @@ -118,6 +119,14 @@ item_state = "cigaroff" smoketime = 1500 +/obj/item/clothing/mask/cigarette/cigar/cohiba + name = "Cohiba Cigar" + desc = "There's little more you could want from a cigar." + icon_state = "cigaroff" + icon_on = "cigaron" + icon_off = "cigaroff" + icon_butt = "cigarbutt" + /obj/item/clothing/mask/gas/mime name = "mime mask" desc = "It looks a little creepy" diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index d8da89cf1862a..fc96541442b60 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -277,7 +277,7 @@ /obj/item/clothing/suit/fire/heavy name = "firesuit" desc = "A suit that protects against extreme fire and heat." - icon_state = "thermal" + //icon_state = "thermal" item_state = "ro_suit" //w_class = 4//bulky item protective_temperature = 10000 diff --git a/code/defines/obj/window.dm b/code/defines/obj/window.dm index c3799a7eed050..003aeb1efdd68 100644 --- a/code/defines/obj/window.dm +++ b/code/defines/obj/window.dm @@ -53,7 +53,9 @@ /obj/window/reinforced/tinted name = "tinted window" + icon_state = "twindow" opacity = 1 /obj/window/reinforced/tinted/frosted + icon_state = "fwindow" name = "frosted window" \ No newline at end of file diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 38ae73eb8cc2c..b40314cd650f3 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -61,7 +61,7 @@ // M.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(M), M.slot_l_hand) M.equip_if_possible(new /obj/item/clothing/gloves/yellow(M), M.slot_gloves) M.equip_if_possible(new /obj/item/device/t_scanner(M), M.slot_r_store) - M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears) + //M.equip_if_possible(new /obj/item/device/radio/headset(M), M.slot_ears) M.equip_if_possible(new /obj/item/weapon/storage/backpack(M), M.slot_back) if (prob(50)) M.equip_if_possible(new /obj/item/clothing/mask/gas(M), M.slot_wear_mask) diff --git a/code/game/objects/closets/secure/captain.dm b/code/game/objects/closets/secure/captain.dm index a791409b9c30e..9373d545d3730 100644 --- a/code/game/objects/closets/secure/captain.dm +++ b/code/game/objects/closets/secure/captain.dm @@ -2,7 +2,7 @@ ..() sleep(2) new /obj/item/weapon/reagent_containers/food/drinks/flask(src) - new /obj/item/device/radio/headset/headset_com( src ) + new /obj/item/device/radio/headset/heads/captain( src ) new /obj/item/weapon/gun/energy/general( src ) new /obj/item/weapon/storage/id_kit( src ) new /obj/item/clothing/under/rank/captain( src ) diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index 07383aa575cee..23ec5fb342a94 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -2,7 +2,7 @@ ..() sleep(2) new /obj/item/blueprints( src ) - new /obj/item/device/radio/headset/headset_eng( src ) + new /obj/item/device/radio/headset/heads/ce( src ) new /obj/item/clothing/under/rank/chief_engineer( src ) new /obj/item/clothing/gloves/yellow( src ) new /obj/item/clothing/shoes/brown( src ) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index c478d55128307..5aa880d4e6fef 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -52,7 +52,7 @@ /obj/secure_closet/CMO/New() ..() sleep(2) - new /obj/item/device/radio/headset/headset_med( src ) + new /obj/item/device/radio/headset/heads/cmo( src ) new /obj/item/clothing/suit/labcoat/cmo( src ) new /obj/item/clothing/under/rank/medical( src ) new /obj/item/weapon/tank/air( src ) diff --git a/code/game/objects/closets/secure/scientist.dm b/code/game/objects/closets/secure/scientist.dm index 7fd83fa61a612..33c7fe67936d8 100644 --- a/code/game/objects/closets/secure/scientist.dm +++ b/code/game/objects/closets/secure/scientist.dm @@ -1,6 +1,7 @@ /obj/secure_closet/scientist/New() ..() sleep(2) + new /obj/item/device/radio/headset/headset_sci( src ) new /obj/item/weapon/tank/air( src ) new /obj/item/clothing/mask/gas( src ) new /obj/item/clothing/suit/bio_suit/general( src ) @@ -14,7 +15,7 @@ /obj/secure_closet/RD/New() ..() sleep(2) - new /obj/item/device/radio/headset/headset_com( src ) + new /obj/item/device/radio/headset/heads/rd( src ) new /obj/item/clothing/under/rank/research_director( src ) new /obj/item/weapon/tank/air( src ) new /obj/item/clothing/mask/gas( src ) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 4e7ff04d39b03..b63fe9a9dbd65 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -45,7 +45,7 @@ /obj/secure_closet/highsec/New() ..() sleep(2) - new /obj/item/device/radio/headset/headset_com(src) + new /obj/item/device/radio/headset/heads/hop( src ) new /obj/item/weapon/gun/energy/general( src ) new /obj/item/device/flash( src ) new /obj/item/weapon/storage/id_kit( src ) @@ -59,7 +59,7 @@ /obj/secure_closet/hos/New() ..() sleep(2) - new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/weapon/shield/riot(src) new /obj/item/weapon/gun/energy/general( src ) new /obj/item/device/flash( src ) diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index e26277597eabf..98d02ce367c39 100644 --- a/code/game/objects/items/clothing.dm +++ b/code/game/objects/items/clothing.dm @@ -175,11 +175,12 @@ THERMAL GLASSES desc = null ..() +/* /obj/item/clothing/suit/swat_suit/death_commando name = "Death Commando Suit" icon_state = "death_commando_suit" item_state = "death_commando_suit" - flags = FPRINT | TABLEPASS | SUITSPACE + flags = FPRINT | TABLEPASS | SUITSPACE*/ /obj/item/clothing/mask/gas/death_commando name = "Death Commando Mask" diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm index 7857723a54e78..d9e329362a798 100644 --- a/code/game/objects/storage/crates.dm +++ b/code/game/objects/storage/crates.dm @@ -22,6 +22,15 @@ openicon = "o2crateopen" closedicon = "o2crate" +/obj/crate/trashcart + desc = "A heavy, metal trashcart with wheels." + name = "Trash Cart" + icon = 'storage.dmi' + icon_state = "trashcart" + density = 1 + openicon = "trashcartopen" + closedicon = "trashcart" + /obj/crate/medical desc = "A medical crate." name = "Medical crate" diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index f239ff23e8a24..0e823e3a7adfa 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -241,6 +241,8 @@ name = "reinforced window" state = 2*anchored health = 40 + if(opacity) + icon_state = "twindow" update_nearby_tiles(need_rebuild=1) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 81afec7c6f4ef..f3e2d02c66592 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -226,6 +226,7 @@ if (prob(20)) d = d / 2 d = d / 4 + /* else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(90)) @@ -236,7 +237,7 @@ show_message("\red Your armor only softens the blow!", 4) if (prob(60)) d = d / 2 - d = d / 5 + d = d / 5*/ if (istype(src.r_hand, /obj/item/weapon/shield/riot)) if (prob(90)) show_message("\red Your shield absorbs the blow!", 4) @@ -273,11 +274,11 @@ if (prob(5)) show_message("\red Your armor absorbs the hit!", 4) return - else + /*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(70)) show_message("\red Your armor absorbs the hit!", 4) - return + return*/ if (prob(75) && src.stunned <= 10) src.stunned = 10 else @@ -303,7 +304,7 @@ if (prob(20)) d = d / 2 d = d / 2 - else + /*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(70)) show_message("\red Your armor absorbs the blow!", 4) @@ -313,7 +314,7 @@ show_message("\red Your armor only softens the blow!", 4) if (prob(60)) d = d / 2 - d = d / 2 + d = d / 2*/ if (!src.eye_blurry) src.eye_blurry = 4 //This stuff makes no sense but lasers need a buff. if (prob(25)) src.stunned++ @@ -339,7 +340,7 @@ if (prob(20)) d = d / 2 d = d / 2 - else + /*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(50)) show_message("\red Your armor absorbs the blow!", 4) @@ -349,7 +350,7 @@ show_message("\red Your armor only softens the blow!", 4) if (prob(50)) d = d / 2 - d = d / 2 + d = d / 2*/ if (src.stat != 2) var/organ = src.organs[ran_zone("chest")] if (istype(organ, /datum/organ/external)) @@ -377,7 +378,7 @@ if (prob(20)) d = d / 2 d = d / 4 - else + /*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(90)) show_message("\red Your armor absorbs the blow!", 4) @@ -387,7 +388,7 @@ show_message("\red Your armor only softens the blow!", 4) if (prob(60)) d = d / 2 - d = d / 5 + d = d / 5*/ if (istype(src.r_hand, /obj/item/weapon/shield/riot)) if (prob(90)) show_message("\red Your shield absorbs the blow!", 4) @@ -1381,11 +1382,11 @@ for(var/mob/O in viewers(src, null)) O.show_message(text("\red [M.name] has attempted to bite []!", src), 1) return - else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) + /*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(25)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [M.name] has attempted to bite []!", src), 1) - return + return*/ else for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) @@ -1437,11 +1438,11 @@ for(var/mob/O in viewers(src, null)) O.show_message(text("\red [M.name] has attempted to bite []!", src), 1) return - else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) + /*else if (istype(src.wear_suit, /obj/item/clothing/suit/swat_suit)) if (prob(25)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [M.name] has attempted to bite []!", src), 1) - return + return*/ else for(var/mob/O in viewers(src, null)) O.show_message(text("\red [M.name] has bit []!", src), 1) diff --git a/icons/changelog.html b/icons/changelog.html index 0db9b03f05b94..454d1c8cad900 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -51,7 +51,7 @@

Changelog

  • It is now possible to actually eat omelettes with the fork now, instead of just stabbing yourself (or others) in the eye with it.
  • Welding masks can now be flipped up or down. Note that when they're up they don't hide your identity or protect you from welding.
  • Reagent based healing should now work properly.
    • -
  • Revolver has been balanced and made cheper.
    • +
  • Revolver has been balanced and made cheaper.
  • Tasers now effect borgs.
  • Plastic explosives are now bought in single bricks.
  • Nuke team slightly buffed and their uplink updated with recently added items.
    • @@ -59,6 +59,7 @@

    Changelog

  • Energy swords now come in blue, green, purple and red.
  • Cameras are now constructable and dismantlable. (Code donated by Powerful Station 13)
  • Updated the change network verb for AIs. (Code donated by Powerful Station 13)
    • +
  • Added gold, silver and diamond pickaxes to R&D which mine faster.
  • Agouri updated: @@ -84,6 +85,8 @@

    Changelog

  • Veyveyr updated:
  • Errorage updated: @@ -91,9 +94,13 @@

    Changelog

  • You can now manually add coins into money bags, also fixed money bag interaction window formatting.
  • QM no longer has access to the entire mining station to stop him from stealing supplies.
  • New machine loading sprite for mining machinery. (sprites by Cheridan)
    • -
  • Added a messanging server to the server room. It'll be used for messanging, but ignore it for now.
    • -
  • The delivery office now requires delivery office access. It's also no longer called "Construction Zone"
    • -
  • Almost all the mecha parts now have sprites. (Sprites by Cheridan)
    • +
  • Added a messanging server to the server room. It'll be used for messanging, but ignore it for now.
    • +
  • The delivery office now requires delivery office access. It's also no longer called "Construction Zone"
    • +
  • Almost all the mecha parts now have sprites. (Sprites by Cheridan)
    • +
  • Tinted and frosted glass now look darker.
    • +
  • There are now more money sprites.
    • +
  • Department closets now contain the correct headsets.
    • +
  • Microwave updated: