Merge pull request #2203 from comma/master

Map update and pose system
This commit is contained in:
Cael Aislinn
2013-01-20 08:53:00 -08:00
5 changed files with 130 additions and 119 deletions
@@ -18,3 +18,5 @@
var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
//Surgery info
var/datum/surgery_status/op_stage = new/datum/surgery_status
//Active emote/pose
var/pose = null
@@ -589,3 +589,10 @@
for (var/mob/O in (hearers(src.loc, null) | get_mobs_in_view(world.view,src)))
O.show_message(message, m_type)
/mob/living/carbon/human/verb/pose()
set name = "Set pose"
set desc = "Sets description which will be shown when someone examines you"
set category = "IC"
pose = copytext(sanitize(input(usr, "This is [src]. \He is...", "Pose", null) as text), 1, MAX_MESSAGE_LEN)
@@ -418,5 +418,7 @@
if(print_flavor_text()) msg += "[print_flavor_text()]\n"
msg += "*---------*</span>"
if (pose)
msg += "\n[t_He] is [pose]."
usr << msg