From 5e2c921933d79763f1bc14050d2f89be0e6c1a61 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Mon, 18 Mar 2013 18:01:51 +0400 Subject: [PATCH 1/4] Fixed nanopaste messages. (and some my shitcode) --- code/game/objects/items/stacks/nanopaste.dm | 10 +++++----- code/modules/reagents/reagent_containers/syringes.dm | 2 +- code/modules/research/designs.dm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index c4697e63b6f..5b0be916c35 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -1,7 +1,7 @@ /obj/item/stack/nanopaste name = "nanopaste" singular_name = "nanite swarm" - desc = "A tube of paste containing swarms of repair nanties. Very effective in repairing robotic machinery." + desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." icon = 'icons/obj/nanopaste.dmi' icon_state = "tube" origin_tech = "materials=4;engineering=3" @@ -18,8 +18,8 @@ R.adjustFireLoss(-60) R.updatehealth() use(1) - user.visible_message("You apply some [src] at [R]'s damaged areas.",\ - "\The [user] applied some [src] at [R]'s damaged areas.") + user.visible_message("\The [user] applied some [src] at [R]'s damaged areas.",\ + "You apply some [src] at [R]'s damaged areas.") else user << "All [R]'s systems are nominal." @@ -31,7 +31,7 @@ S.heal_damage(30, 30, robo_repair = 1) H.updatehealth() use(1) - user.visible_message("You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name]",\ - "\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src]") + user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.display_name] with \the [src].",\ + "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.display_name].") else user << "Nothing to fix here." diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 6edc909cd8d..45cf1331e9e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -158,7 +158,7 @@ update_icon() if(mode == SYRINGE_BROKEN) icon_state = "broken" - overlays = null //dirty fix + overlays.Cut() return var/rounded_vol = round(reagents.total_volume,5) overlays.Cut() diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index f1a4e8b683c..fa0c2b39359 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1323,7 +1323,7 @@ datum/design/synthetic_flash datum/design/nanopaste name = "nanopaste" - desc = "A tube of paste containing swarms of repair nanties. Very effective in repairing robotic machinery." + desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." id = "nanopaste" req_tech = list("materials" = 4, "engineering" = 3) build_type = PROTOLATHE From e417ad2ec7ed4eef5190667655f1a06021845bf2 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Mon, 18 Mar 2013 18:03:53 +0400 Subject: [PATCH 2/4] Fixed ghosts hearing whispers. --- code/modules/mob/living/carbon/human/whisper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index b844ae784a9..42cb5038f39 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -140,5 +140,5 @@ for (var/mob/M in dead_mob_list) if (!(M.client)) continue - if (M.stat > 1 && !(M in heard_a)) + if (M.stat > 1 && !(M in heard_a) && (M.client.prefs.toggles & CHAT_GHOSTEARS)) M.show_message(rendered, 2) From 4036ee3732a9a2fb826ef9a2662462ca3c3973f3 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Mon, 18 Mar 2013 18:37:57 +0400 Subject: [PATCH 3/4] Fixed dem closets. --- code/modules/research/xenoarchaeology/misc.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm index ec1f4f18046..4abd5014922 100644 --- a/code/modules/research/xenoarchaeology/misc.dm +++ b/code/modules/research/xenoarchaeology/misc.dm @@ -82,6 +82,9 @@ /obj/structure/closet/excavation name = "Excavation tools" icon_state = "toolcloset" + icon_closed = "toolcloset" + icon_opened = "toolclosetopen" + New() ..() From 1758bf8314c476363475e92ff969ad93d0a03070 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Mon, 18 Mar 2013 19:54:03 +0400 Subject: [PATCH 4/4] Fixed spiderbots grabbing items out of reach. --- .../mob/living/simple_animal/friendly/spiderbot.dm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 86aeae28538..9a01fc3ff87 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -315,11 +315,16 @@ var/obj/selection = input("Select an item.", "Pickup") in items + items.Cut() if(selection) - held_item = selection - selection.loc = src - visible_message("\blue [src] scoops up the [held_item]!", "\blue You grab the [held_item]!", "You hear a skittering noise and a clink.") - return held_item + for(var/obj/item/I in view(1, src)) + if(selection == I) + held_item = selection + selection.loc = src + visible_message("\blue [src] scoops up the [held_item]!", "\blue You grab the [held_item]!", "You hear a skittering noise and a clink.") + return held_item + else + src << "\red \The [selection] is too far away." src << "\red There is nothing of interest to take." return 0 \ No newline at end of file