From 6393cdd1f50f2d0452d0889e23b380d2843dec34 Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Sun, 16 Oct 2011 12:11:33 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2Fireaxe=20is=20now=20backslotable=20ag?= =?UTF-8?q?ain,=20all=20bugs=20fixed.=20=E2=80=A2CHANGELOG=20updated=20abo?= =?UTF-8?q?ut=20bugfixing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2374 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 2 +- code/game/objects/items/item.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 3 +++ icons/changelog.html | 10 ++++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 683621e5bf5..6db9606be7c 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -574,7 +574,7 @@ desc = "Truly, the tool of a madman. Who would possibly think to fight fire with an axe?" force = 5 w_class = 4.0 - //flags = ONBACK + flags = ONBACK twohanded = 1 force_unwielded = 5 force_wielded = 30 diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index c8d5e170840..e18f2304f68 100644 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -203,7 +203,7 @@ force = force_wielded src.name = "[initial(name)] (Wielded)" src.update_icon() //If needed by the particular item - user << "\blue You grab the [initial(name)] with both hands, It is ready for use." + user << "\blue You grab the [initial(name)] with both hands." var/obj/item/weapon/offhand/O = new /obj/item/weapon/offhand(user) ////Let's reserve his other hand~ O.name = text("[initial(src.name)] - Offhand") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9ebb7044094..cd307b3212f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -432,6 +432,9 @@ return if (!( W.flags & ONBACK )) return + if(W.twohanded && W.wielded) + usr << "Unwield the [initial(W.name)] first!" + return u_equip(W) back = W W.equipped(src, text) diff --git a/icons/changelog.html b/icons/changelog.html index c76c8a48563..d0501a824d5 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -54,17 +54,19 @@ Stuff which is in development and not yet visible to players or just code relate (ie. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> + 15 October 2011, White Cane Safety Day:
    +
  • Agouri updated: +
      +
    • There has been a tidal wave of bugfixes over the last 5 or so days. If you had previously tried something on the station, saw that it was bugged and never tried it again, chances are it got fixed. I don't want you to neglect using stuff because you think it was bugged, which it was at one point, but no longer is. Thanks, happy new semester to everyone~
      • +
    +
  • Errorage updated:
    • When you're unconscious, paralyzed, sleeping, etc. you will still see the same blackness as always, but it will rarely flicker a bit to allow you to see a little of your surroundings.
    • -
- -15 October 2011: -
  • Doohl updated:
    • New hairstyles! YOU never asked for this!