Skip to content

Commit

Permalink
Grammar and consistency fixes with Arm blades/False Arm blade messages
Browse files Browse the repository at this point in the history
  • Loading branch information
Ikarrus committed Jul 11, 2015
1 parent f580ad3 commit 0c0a196
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
8 changes: 4 additions & 4 deletions code/game/gamemodes/changeling/powers/mutations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@
var/weapon_name_simple

/obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target)
playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
qdel(user.l_hand)
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms their [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
user.update_inv_l_hand()
return
if(istype(user.r_hand, weapon_type))
playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
qdel(user.r_hand)
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms their [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
user.update_inv_r_hand()
return
..(user, target)
Expand Down Expand Up @@ -138,7 +139,6 @@
loc.visible_message("<span class='warning'>A grotesque blade forms around [loc.name]\'s arm!</span>", "<span class='warning'>Our arm twists and mutates, transforming it into a deadly blade.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")

/obj/item/weapon/melee/arm_blade/dropped(mob/user)
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms his blade into an arm!</span>", "<span class='notice'>We assimilate the blade back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
qdel(src)

/obj/item/weapon/melee/arm_blade/afterattack(atom/target, mob/user, proximity)
Expand Down
6 changes: 1 addition & 5 deletions code/game/gamemodes/changeling/powers/tiny_prick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@
desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless."
force = 5 //Basically as strong as a punch

/obj/item/weapon/melee/arm_blade/false/dropped(mob/user)
qdel(src)
return

/obj/item/weapon/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity)
return

Expand Down Expand Up @@ -151,7 +147,7 @@

spawn(600)
playsound(target, 'sound/effects/blobattack.ogg', 30, 1)
target.visible_message("<span class='warning'>With a sickening crunch, [target] reforms his [blade] into an arm!</span>", "<span class='warning'>[blade] reforms back to normal.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
target.visible_message("<span class='warning'>With a sickening crunch, [target] reforms their [blade.name] into an arm!</span>", "<span class='warning'>[blade] reforms back to normal.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
qdel(blade)
user.update_inv_l_hand()
user.update_inv_r_hand()
Expand Down

0 comments on commit 0c0a196

Please sign in to comment.