Merge pull request #7557 from Zuhayr/dev-freeze

Some fixes, siemens coefficient rebalance for species.
This commit is contained in:
Chinsky
2014-12-29 20:56:08 +03:00
21 changed files with 71 additions and 44 deletions
+2 -2
View File
@@ -829,8 +829,8 @@ Note that amputating the affected organ does in fact remove the infection from t
if(is_broken())
owner.u_equip(c_hand)
var/emote_scream = pick("screams in pain and", "lets out a sharp cry and", "cries out and")
owner.emote("me", 1, "[(owner.species && owner.species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [hand_name]!")
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
owner.emote("me", 1, "[(owner.species && owner.species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [hand_name]!")
if(is_malfunctioning())
owner.u_equip(c_hand)
owner.emote("me", 1, "drops what they were holding, their [hand_name] malfunctioning!")