Revert "Merge branch 'master' into prbt"

This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
This commit is contained in:
Raeschen
2021-08-17 08:13:00 +02:00
parent d0b32346a6
commit 6deb4e071c
2 changed files with 352 additions and 357 deletions

View File

@@ -137,7 +137,3 @@
key = "spiderpurr" key = "spiderpurr"
emote_message_3p = "purrs." emote_message_3p = "purrs."
emote_sound = 'sound/voice/spiderpurr.ogg' emote_sound = 'sound/voice/spiderpurr.ogg'
/decl/emote/audible/squeaky
key = "squeaky"
emote_message_3p = "squeaks."
emote_sound = 'sound/items/drop/plushie.ogg'

View File

@@ -1,353 +1,352 @@
var/list/_human_default_emotes = list( var/list/_human_default_emotes = list(
/decl/emote/visible/blink, /decl/emote/visible/blink,
/decl/emote/audible/synth, /decl/emote/audible/synth,
/decl/emote/audible/synth/ping, /decl/emote/audible/synth/ping,
/decl/emote/audible/synth/buzz, /decl/emote/audible/synth/buzz,
/decl/emote/audible/synth/confirm, /decl/emote/audible/synth/confirm,
/decl/emote/audible/synth/deny, /decl/emote/audible/synth/deny,
/decl/emote/audible/synth/scary, /decl/emote/audible/synth/scary,
/decl/emote/visible/nod, /decl/emote/visible/nod,
/decl/emote/visible/shake, /decl/emote/visible/shake,
/decl/emote/visible/shiver, /decl/emote/visible/shiver,
/decl/emote/visible/collapse, /decl/emote/visible/collapse,
/decl/emote/audible/gasp, /decl/emote/audible/gasp,
/decl/emote/audible/choke, /decl/emote/audible/choke,
/decl/emote/audible/sneeze, /decl/emote/audible/sneeze,
/decl/emote/audible/sniff, /decl/emote/audible/sniff,
/decl/emote/audible/snore, /decl/emote/audible/snore,
/decl/emote/audible/whimper, /decl/emote/audible/whimper,
/decl/emote/audible/whistle, /decl/emote/audible/whistle,
/decl/emote/audible/whistle/quiet, /decl/emote/audible/whistle/quiet,
/decl/emote/audible/whistle/wolf, /decl/emote/audible/whistle/wolf,
/decl/emote/audible/whistle/summon, /decl/emote/audible/whistle/summon,
/decl/emote/audible/yawn, /decl/emote/audible/yawn,
/decl/emote/audible/clap, /decl/emote/audible/clap,
/decl/emote/audible/chuckle, /decl/emote/audible/chuckle,
/decl/emote/audible/cough, /decl/emote/audible/cough,
/decl/emote/audible/cry, /decl/emote/audible/cry,
/decl/emote/audible/sigh, /decl/emote/audible/sigh,
/decl/emote/audible/laugh, /decl/emote/audible/laugh,
/decl/emote/audible/mumble, /decl/emote/audible/mumble,
/decl/emote/audible/grumble, /decl/emote/audible/grumble,
/decl/emote/audible/groan, /decl/emote/audible/groan,
/decl/emote/audible/moan, /decl/emote/audible/moan,
/decl/emote/audible/grunt, /decl/emote/audible/grunt,
/decl/emote/audible/slap, /decl/emote/audible/slap,
/decl/emote/audible/crack, /decl/emote/audible/crack,
/decl/emote/human/deathgasp, /decl/emote/human/deathgasp,
/decl/emote/audible/giggle, /decl/emote/audible/giggle,
/decl/emote/audible/scream, /decl/emote/audible/scream,
/decl/emote/visible/airguitar, /decl/emote/visible/airguitar,
/decl/emote/visible/blink_r, /decl/emote/visible/blink_r,
/decl/emote/visible/bow, /decl/emote/visible/bow,
/decl/emote/visible/salute, /decl/emote/visible/salute,
/decl/emote/visible/flap, /decl/emote/visible/flap,
/decl/emote/visible/aflap, /decl/emote/visible/aflap,
/decl/emote/visible/drool, /decl/emote/visible/drool,
/decl/emote/visible/eyebrow, /decl/emote/visible/eyebrow,
/decl/emote/visible/twitch, /decl/emote/visible/twitch,
/decl/emote/visible/dance, /decl/emote/visible/dance,
/decl/emote/visible/twitch_v, /decl/emote/visible/twitch_v,
/decl/emote/visible/faint, /decl/emote/visible/faint,
/decl/emote/visible/frown, /decl/emote/visible/frown,
/decl/emote/visible/blush, /decl/emote/visible/blush,
/decl/emote/visible/wave, /decl/emote/visible/wave,
/decl/emote/visible/glare, /decl/emote/visible/glare,
/decl/emote/visible/stare, /decl/emote/visible/stare,
/decl/emote/visible/look, /decl/emote/visible/look,
/decl/emote/visible/point, /decl/emote/visible/point,
/decl/emote/visible/raise, /decl/emote/visible/raise,
/decl/emote/visible/grin, /decl/emote/visible/grin,
/decl/emote/visible/shrug, /decl/emote/visible/shrug,
/decl/emote/visible/smile, /decl/emote/visible/smile,
/decl/emote/visible/pale, /decl/emote/visible/pale,
/decl/emote/visible/tremble, /decl/emote/visible/tremble,
/decl/emote/visible/wink, /decl/emote/visible/wink,
/decl/emote/visible/hug, /decl/emote/visible/hug,
/decl/emote/visible/dap, /decl/emote/visible/dap,
/decl/emote/visible/signal, /decl/emote/visible/signal,
/decl/emote/visible/handshake, /decl/emote/visible/handshake,
/decl/emote/visible/afold, /decl/emote/visible/afold,
/decl/emote/visible/alook, /decl/emote/visible/alook,
/decl/emote/visible/eroll, /decl/emote/visible/eroll,
/decl/emote/visible/hbow, /decl/emote/visible/hbow,
/decl/emote/visible/hip, /decl/emote/visible/hip,
/decl/emote/visible/holdup, /decl/emote/visible/holdup,
/decl/emote/visible/hshrug, /decl/emote/visible/hshrug,
/decl/emote/visible/crub, /decl/emote/visible/crub,
/decl/emote/visible/erub, /decl/emote/visible/erub,
/decl/emote/visible/fslap, /decl/emote/visible/fslap,
/decl/emote/visible/ftap, /decl/emote/visible/ftap,
/decl/emote/visible/hrub, /decl/emote/visible/hrub,
/decl/emote/visible/hspread, /decl/emote/visible/hspread,
/decl/emote/visible/pocket, /decl/emote/visible/pocket,
/decl/emote/visible/rsalute, /decl/emote/visible/rsalute,
/decl/emote/visible/rshoulder, /decl/emote/visible/rshoulder,
/decl/emote/visible/squint, /decl/emote/visible/squint,
/decl/emote/visible/tfist, /decl/emote/visible/tfist,
/decl/emote/visible/tilt, /decl/emote/visible/tilt,
/decl/emote/visible/spin, /decl/emote/visible/spin,
/decl/emote/visible/sidestep, /decl/emote/visible/sidestep,
/decl/emote/audible/snap, /decl/emote/audible/snap,
/decl/emote/visible/vomit, /decl/emote/visible/vomit,
/decl/emote/visible/floorspin, /decl/emote/visible/floorspin,
/decl/emote/visible/flip, /decl/emote/visible/flip,
//VOREStation Add //VOREStation Add
/decl/emote/audible/awoo, /decl/emote/audible/awoo,
/decl/emote/audible/awoo2, /decl/emote/audible/awoo2,
/decl/emote/audible/growl, /decl/emote/audible/growl,
/decl/emote/audible/woof, /decl/emote/audible/woof,
/decl/emote/audible/woof2, /decl/emote/audible/woof2,
/decl/emote/audible/nya, /decl/emote/audible/nya,
/decl/emote/audible/mrowl, /decl/emote/audible/mrowl,
/decl/emote/audible/peep, /decl/emote/audible/peep,
/decl/emote/audible/chirp, /decl/emote/audible/chirp,
/decl/emote/audible/hoot, /decl/emote/audible/hoot,
/decl/emote/audible/weh, /decl/emote/audible/weh,
/decl/emote/audible/merp, /decl/emote/audible/merp,
/decl/emote/audible/myarp, /decl/emote/audible/myarp,
/decl/emote/audible/bark, /decl/emote/audible/bark,
/decl/emote/audible/bork, /decl/emote/audible/bork,
/decl/emote/audible/mrow, /decl/emote/audible/mrow,
/decl/emote/audible/hypno, /decl/emote/audible/hypno,
/decl/emote/audible/hiss, /decl/emote/audible/hiss,
/decl/emote/audible/rattle, /decl/emote/audible/rattle,
/decl/emote/audible/squeak, /decl/emote/audible/squeak,
/decl/emote/audible/geck, /decl/emote/audible/geck,
/decl/emote/audible/baa, /decl/emote/audible/baa,
/decl/emote/audible/baa2, /decl/emote/audible/baa2,
/decl/emote/audible/mar, /decl/emote/audible/mar,
/decl/emote/audible/wurble, /decl/emote/audible/wurble,
/decl/emote/audible/snort, /decl/emote/audible/snort,
/decl/emote/audible/meow, /decl/emote/audible/meow,
/decl/emote/audible/moo, /decl/emote/audible/moo,
/decl/emote/audible/croak, /decl/emote/audible/croak,
/decl/emote/audible/gao, /decl/emote/audible/gao,
/decl/emote/audible/cackle, /decl/emote/audible/cackle,
/decl/emote/audible/squish, /decl/emote/audible/squish,
/decl/emote/audible/spiderchitter, /decl/emote/audible/spiderchitter,
/decl/emote/audible/spiderpurr, /decl/emote/audible/spiderpurr,
/decl/emote/audible/squeaky,
/decl/emote/visible/mlem, /decl/emote/visible/mlem,
/decl/emote/visible/blep, /decl/emote/visible/blep,
/decl/emote/helper/vwag, /decl/emote/helper/vwag,
/decl/emote/helper/vflap, /decl/emote/helper/vflap,
//VOREStation Add End //VOREStation Add End
//CHOMPedit Add Start //CHOMPedit Add Start
/decl/emote/audible/prbt /decl/emote/audible/prbt
//CHOMPedit Add End //CHOMPedit Add End
) )
//VOREStation Add Start //VOREStation Add Start
var/list/_simple_mob_default_emotes = list( var/list/_simple_mob_default_emotes = list(
/decl/emote/visible/blink, /decl/emote/visible/blink,
/decl/emote/visible/nod, /decl/emote/visible/nod,
/decl/emote/visible/shake, /decl/emote/visible/shake,
/decl/emote/visible/shiver, /decl/emote/visible/shiver,
/decl/emote/visible/collapse, /decl/emote/visible/collapse,
/decl/emote/audible/gasp, /decl/emote/audible/gasp,
/decl/emote/audible/choke, /decl/emote/audible/choke,
/decl/emote/audible/sneeze, /decl/emote/audible/sneeze,
/decl/emote/audible/sniff, /decl/emote/audible/sniff,
/decl/emote/audible/snore, /decl/emote/audible/snore,
/decl/emote/audible/whimper, /decl/emote/audible/whimper,
/decl/emote/audible/whistle, /decl/emote/audible/whistle,
/decl/emote/audible/whistle/quiet, /decl/emote/audible/whistle/quiet,
/decl/emote/audible/whistle/wolf, /decl/emote/audible/whistle/wolf,
/decl/emote/audible/whistle/summon, /decl/emote/audible/whistle/summon,
/decl/emote/audible/yawn, /decl/emote/audible/yawn,
/decl/emote/audible/clap, /decl/emote/audible/clap,
/decl/emote/audible/chuckle, /decl/emote/audible/chuckle,
/decl/emote/audible/cough, /decl/emote/audible/cough,
/decl/emote/audible/cry, /decl/emote/audible/cry,
/decl/emote/audible/sigh, /decl/emote/audible/sigh,
/decl/emote/audible/laugh, /decl/emote/audible/laugh,
/decl/emote/audible/mumble, /decl/emote/audible/mumble,
/decl/emote/audible/grumble, /decl/emote/audible/grumble,
/decl/emote/audible/groan, /decl/emote/audible/groan,
/decl/emote/audible/moan, /decl/emote/audible/moan,
/decl/emote/audible/grunt, /decl/emote/audible/grunt,
/decl/emote/audible/slap, /decl/emote/audible/slap,
/decl/emote/audible/crack, /decl/emote/audible/crack,
/decl/emote/human/deathgasp, /decl/emote/human/deathgasp,
/decl/emote/audible/giggle, /decl/emote/audible/giggle,
/decl/emote/audible/scream, /decl/emote/audible/scream,
/decl/emote/visible/airguitar, /decl/emote/visible/airguitar,
/decl/emote/visible/blink_r, /decl/emote/visible/blink_r,
/decl/emote/visible/bow, /decl/emote/visible/bow,
/decl/emote/visible/salute, /decl/emote/visible/salute,
/decl/emote/visible/flap, /decl/emote/visible/flap,
/decl/emote/visible/aflap, /decl/emote/visible/aflap,
/decl/emote/visible/drool, /decl/emote/visible/drool,
/decl/emote/visible/eyebrow, /decl/emote/visible/eyebrow,
/decl/emote/visible/twitch, /decl/emote/visible/twitch,
/decl/emote/visible/dance, /decl/emote/visible/dance,
/decl/emote/visible/twitch_v, /decl/emote/visible/twitch_v,
/decl/emote/visible/faint, /decl/emote/visible/faint,
/decl/emote/visible/frown, /decl/emote/visible/frown,
/decl/emote/visible/blush, /decl/emote/visible/blush,
/decl/emote/visible/wave, /decl/emote/visible/wave,
/decl/emote/visible/glare, /decl/emote/visible/glare,
/decl/emote/visible/stare, /decl/emote/visible/stare,
/decl/emote/visible/look, /decl/emote/visible/look,
/decl/emote/visible/point, /decl/emote/visible/point,
/decl/emote/visible/raise, /decl/emote/visible/raise,
/decl/emote/visible/grin, /decl/emote/visible/grin,
/decl/emote/visible/shrug, /decl/emote/visible/shrug,
/decl/emote/visible/smile, /decl/emote/visible/smile,
/decl/emote/visible/pale, /decl/emote/visible/pale,
/decl/emote/visible/tremble, /decl/emote/visible/tremble,
/decl/emote/visible/wink, /decl/emote/visible/wink,
/decl/emote/visible/hug, /decl/emote/visible/hug,
/decl/emote/visible/signal, /decl/emote/visible/signal,
/decl/emote/visible/afold, /decl/emote/visible/afold,
/decl/emote/visible/alook, /decl/emote/visible/alook,
/decl/emote/visible/eroll, /decl/emote/visible/eroll,
/decl/emote/visible/hbow, /decl/emote/visible/hbow,
/decl/emote/visible/hip, /decl/emote/visible/hip,
/decl/emote/visible/holdup, /decl/emote/visible/holdup,
/decl/emote/visible/hshrug, /decl/emote/visible/hshrug,
/decl/emote/visible/crub, /decl/emote/visible/crub,
/decl/emote/visible/erub, /decl/emote/visible/erub,
/decl/emote/visible/fslap, /decl/emote/visible/fslap,
/decl/emote/visible/ftap, /decl/emote/visible/ftap,
/decl/emote/visible/hrub, /decl/emote/visible/hrub,
/decl/emote/visible/hspread, /decl/emote/visible/hspread,
/decl/emote/visible/rsalute, /decl/emote/visible/rsalute,
/decl/emote/visible/rshoulder, /decl/emote/visible/rshoulder,
/decl/emote/visible/squint, /decl/emote/visible/squint,
/decl/emote/visible/tfist, /decl/emote/visible/tfist,
/decl/emote/visible/tilt, /decl/emote/visible/tilt,
/decl/emote/visible/spin, /decl/emote/visible/spin,
/decl/emote/visible/sidestep, /decl/emote/visible/sidestep,
/decl/emote/visible/vomit, /decl/emote/visible/vomit,
/decl/emote/visible/floorspin, /decl/emote/visible/floorspin,
/decl/emote/visible/flip, /decl/emote/visible/flip,
/decl/emote/audible/awoo, /decl/emote/audible/awoo,
/decl/emote/audible/awoo2, /decl/emote/audible/awoo2,
/decl/emote/audible/growl, /decl/emote/audible/growl,
/decl/emote/audible/woof, /decl/emote/audible/woof,
/decl/emote/audible/woof2, /decl/emote/audible/woof2,
/decl/emote/audible/nya, /decl/emote/audible/nya,
/decl/emote/audible/mrowl, /decl/emote/audible/mrowl,
/decl/emote/audible/peep, /decl/emote/audible/peep,
/decl/emote/audible/chirp, /decl/emote/audible/chirp,
/decl/emote/audible/hoot, /decl/emote/audible/hoot,
/decl/emote/audible/weh, /decl/emote/audible/weh,
/decl/emote/audible/merp, /decl/emote/audible/merp,
/decl/emote/audible/myarp, /decl/emote/audible/myarp,
/decl/emote/audible/bark, /decl/emote/audible/bark,
/decl/emote/audible/bork, /decl/emote/audible/bork,
/decl/emote/audible/mrow, /decl/emote/audible/mrow,
/decl/emote/audible/hypno, /decl/emote/audible/hypno,
/decl/emote/audible/hiss, /decl/emote/audible/hiss,
/decl/emote/audible/rattle, /decl/emote/audible/rattle,
/decl/emote/audible/squeak, /decl/emote/audible/squeak,
/decl/emote/audible/geck, /decl/emote/audible/geck,
/decl/emote/audible/baa, /decl/emote/audible/baa,
/decl/emote/audible/baa2, /decl/emote/audible/baa2,
/decl/emote/audible/mar, /decl/emote/audible/mar,
/decl/emote/audible/wurble, /decl/emote/audible/wurble,
/decl/emote/audible/snort, /decl/emote/audible/snort,
/decl/emote/audible/meow, /decl/emote/audible/meow,
/decl/emote/audible/moo, /decl/emote/audible/moo,
/decl/emote/audible/croak, /decl/emote/audible/croak,
/decl/emote/audible/gao, /decl/emote/audible/gao,
/decl/emote/audible/cackle, /decl/emote/audible/cackle,
/decl/emote/audible/squish, /decl/emote/audible/squish,
/decl/emote/audible/spiderchitter, /decl/emote/audible/spiderchitter,
/decl/emote/audible/spiderpurr, /decl/emote/audible/spiderpurr,
/decl/emote/audible/squeaky, /decl/emote/visible/mlem,
/decl/emote/visible/mlem, /decl/emote/visible/blep,
/decl/emote/visible/blep,
//CHOMPEdit Add Start
//CHOMPEdit Add Start /decl/emote/audible/prbt
/decl/emote/audible/prbt //CHOMPEdit Add End
//CHOMPEdit Add End )
) //VOREStation Add End
//VOREStation Add End
/mob/living/carbon/human/get_available_emotes()
/mob/living/carbon/human/get_available_emotes() . = global._human_default_emotes
. = global._human_default_emotes if(length(species?.default_emotes))
if(length(species?.default_emotes)) . |= species.default_emotes
. |= species.default_emotes
/mob/living/simple_mob/get_available_emotes()
/mob/living/simple_mob/get_available_emotes() . = global._simple_mob_default_emotes
. = global._simple_mob_default_emotes
/mob/living/carbon/human/verb/pose()
/mob/living/carbon/human/verb/pose() set name = "Set Pose"
set name = "Set Pose" set desc = "Sets a description which will be shown when someone examines you."
set desc = "Sets a description which will be shown when someone examines you." set category = "IC"
set category = "IC"
var/datum/gender/T = gender_datums[get_visible_gender()]
var/datum/gender/T = gender_datums[get_visible_gender()]
pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text)
pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text)
/mob/living/carbon/human/verb/set_flavor()
/mob/living/carbon/human/verb/set_flavor() set name = "Set Flavour Text"
set name = "Set Flavour Text" set desc = "Sets an extended description of your character's features."
set desc = "Sets an extended description of your character's features." set category = "IC"
set category = "IC"
var/HTML = "<body>"
var/HTML = "<body>" HTML += "<tt><center>"
HTML += "<tt><center>" HTML += "<b>Update Flavour Text</b> <hr />"
HTML += "<b>Update Flavour Text</b> <hr />" HTML += "<br></center>"
HTML += "<br></center>" HTML += "<a href='byond://?src=\ref[src];flavor_change=general'>General:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=general'>General:</a> " HTML += TextPreview(flavor_texts["general"])
HTML += TextPreview(flavor_texts["general"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=head'>Head:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=head'>Head:</a> " HTML += TextPreview(flavor_texts["head"])
HTML += TextPreview(flavor_texts["head"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=face'>Face:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=face'>Face:</a> " HTML += TextPreview(flavor_texts["face"])
HTML += TextPreview(flavor_texts["face"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=eyes'>Eyes:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=eyes'>Eyes:</a> " HTML += TextPreview(flavor_texts["eyes"])
HTML += TextPreview(flavor_texts["eyes"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=torso'>Body:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=torso'>Body:</a> " HTML += TextPreview(flavor_texts["torso"])
HTML += TextPreview(flavor_texts["torso"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=arms'>Arms:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=arms'>Arms:</a> " HTML += TextPreview(flavor_texts["arms"])
HTML += TextPreview(flavor_texts["arms"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=hands'>Hands:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=hands'>Hands:</a> " HTML += TextPreview(flavor_texts["hands"])
HTML += TextPreview(flavor_texts["hands"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=legs'>Legs:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=legs'>Legs:</a> " HTML += TextPreview(flavor_texts["legs"])
HTML += TextPreview(flavor_texts["legs"]) HTML += "<br>"
HTML += "<br>" HTML += "<a href='byond://?src=\ref[src];flavor_change=feet'>Feet:</a> "
HTML += "<a href='byond://?src=\ref[src];flavor_change=feet'>Feet:</a> " HTML += TextPreview(flavor_texts["feet"])
HTML += TextPreview(flavor_texts["feet"]) HTML += "<br>"
HTML += "<br>" HTML += "<hr />"
HTML += "<hr />" HTML +="<a href='?src=\ref[src];flavor_change=done'>\[Done\]</a>"
HTML +="<a href='?src=\ref[src];flavor_change=done'>\[Done\]</a>" HTML += "<tt>"
HTML += "<tt>" src << browse(HTML, "window=flavor_changes;size=430x300")
src << browse(HTML, "window=flavor_changes;size=430x300")
/mob/living/carbon/human/proc/toggle_tail(var/setting,var/message = 0)
/mob/living/carbon/human/proc/toggle_tail(var/setting,var/message = 0) if(!tail_style || !tail_style.ani_state)
if(!tail_style || !tail_style.ani_state) if(message)
if(message) to_chat(src, "<span class='warning'>You don't have a tail that supports this.</span>")
to_chat(src, "<span class='warning'>You don't have a tail that supports this.</span>") return 0
return 0
var/new_wagging = isnull(setting) ? !wagging : setting
var/new_wagging = isnull(setting) ? !wagging : setting if(new_wagging != wagging)
if(new_wagging != wagging) wagging = new_wagging
wagging = new_wagging update_tail_showing()
update_tail_showing() return 1
return 1
/mob/living/carbon/human/proc/toggle_wing(var/setting,var/message = 0)
/mob/living/carbon/human/proc/toggle_wing(var/setting,var/message = 0) if(!wing_style || !wing_style.ani_state)
if(!wing_style || !wing_style.ani_state) if(message)
if(message) to_chat(src, "<span class='warning'>You don't have a wingtype that supports this.</span>")
to_chat(src, "<span class='warning'>You don't have a wingtype that supports this.</span>") return 0
return 0
var/new_flapping = isnull(setting) ? !flapping : setting
var/new_flapping = isnull(setting) ? !flapping : setting if(new_flapping != flapping)
if(new_flapping != flapping) flapping = setting
flapping = setting update_wing_showing()
update_wing_showing() return 1
return 1