Ghosts can *spin and *flip

This commit is contained in:
coiax
2017-12-25 23:11:08 +00:00
committed by CitadelStationBot
parent 6205268f7e
commit 703667bdff
7 changed files with 172 additions and 54 deletions
-44
View File
@@ -1,18 +1,3 @@
//The code execution of the emote datum is located at code/datums/emotes.dm
/mob/living/emote(act, m_type = null, message = null)
act = lowertext(act)
var/param = message
var/custom_param = findchar(act, " ")
if(custom_param)
param = copytext(act, custom_param + 1, length(act) + 1)
act = copytext(act, 1, custom_param)
var/datum/emote/E
E = E.emote_list[act]
if(!E)
to_chat(src, "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>")
return
E.run_emote(src, param, m_type)
/* EMOTE DATUMS */
/datum/emote/living
@@ -143,16 +128,6 @@
restraint_check = TRUE
wing_time = 10
/datum/emote/living/flip
key = "flip"
key_third_person = "flips"
restraint_check = TRUE
/datum/emote/living/flip/run_emote(mob/user, params)
. = ..()
if(.)
user.SpinAnimation(7,1)
/datum/emote/living/frown
key = "frown"
key_third_person = "frowns"
@@ -482,25 +457,6 @@
message_param = "beeps at %t."
sound = 'sound/machines/twobeep.ogg'
/datum/emote/living/spin
key = "spin"
key_third_person = "spins"
restraint_check = TRUE
/datum/emote/living/spin/run_emote(mob/user)
. = ..()
if(.)
user.spin(20, 1)
if(iscyborg(user) && user.has_buckled_mobs())
var/mob/living/silicon/robot/R = user
GET_COMPONENT_FROM(riding_datum, /datum/component/riding, R)
if(riding_datum)
for(var/mob/M in R.buckled_mobs)
riding_datum.force_dismount(M)
else
R.unbuckle_all_mobs()
/datum/emote/living/circle
key = "circle"
key_third_person = "circles"
-5
View File
@@ -296,11 +296,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
/mob/living/proc/check_emote(message)
if(copytext(message, 1, 2) == "*")
emote(copytext(message, 2))
return 1
/mob/living/proc/get_message_mode(message)
var/key = copytext(message, 1, 2)
if(key == "#")