From 1dcbb048ffee0979e21fa253770a7324b8b3fcc0 Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Tue, 3 Dec 2024 20:00:58 -0500 Subject: [PATCH 1/2] Update emote.dm --- code/modules/mob/living/emote.dm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 2c8fd9285b..b665e41dcb 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -178,7 +178,6 @@ L.SetSleeping(20) */ -/* Fortuna edit: flapping your wings disabled /datum/emote/living/flap key = "flap" key_third_person = "flaps" @@ -205,7 +204,6 @@ message = "flaps their wings ANGRILY!" restraint_check = TRUE wing_time = 10 -*/ /datum/emote/living/fchuckle key = "fchuckle" @@ -345,7 +343,7 @@ message = "grimaces." message_param = "grimaces at %t." -/* + /datum/emote/living/kiss key = "kiss" key_third_person = "kisses" @@ -362,7 +360,6 @@ if(. && iscarbon(user)) var/mob/living/carbon/C = user return !C.silent && (!C.mind || !C.mind.miming) -*/ /datum/emote/living/audible/laugh key = "laugh" @@ -740,7 +737,6 @@ to_chat(user, message) -/* Fortuna edit: beep disabled /datum/emote/beep key = "beep" key_third_person = "beeps" @@ -748,7 +744,6 @@ message_param = "beeps at %t." sound = 'sound/machines/twobeep.ogg' mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/living/carbon/human) -*/ /datum/emote/living/slap key = "slap" @@ -1118,7 +1113,6 @@ if(. && isliving(user)) //Are they alive? The stuff below is the sounds being listed, with percent (the 20s) and then number of times played (1) pick(playsound(C, 'sound/f13effects/sunsetsounds/wah1.ogg', 33, 1),playsound(C, 'sound/f13effects/sunsetsounds/wah2.ogg', 33, 1),playsound(C, 'sound/f13effects/sunsetsounds/wah3.ogg', 34, 1),) -/* /datum/emote/living/boowomp key = "boowomp" key_third_person = "frowns heavily." @@ -1158,7 +1152,6 @@ key_third_person = "raises an eyebrow menacingly!" message = "raises an eyebrow menacingly!" sound = 'sound/f13effects/sunsetsounds/vineboom.ogg' -*/ /datum/emote/living/frogcry key = "frogcry" @@ -1455,7 +1448,6 @@ message = "tilts their head." message_param = "tilts their head at %t." -/* /datum/emote/living/rizz key = "rizz" key_third_person = "rizzler" @@ -1483,7 +1475,6 @@ message = "draws attention to themselves!" message_param = "%t" //Funny block text sound = "modular_splurt/sound/voice/alienbeeper.ogg" -*/ //Slime start @@ -1512,7 +1503,6 @@ S.slime_mood = slime_mood S.handle_body(H) -/* /datum/emote/mood/sneaky key = "slimesneaky" slime_mood = "aslime-mischevous" @@ -1538,4 +1528,3 @@ slime_mood = "aslime-angry" // Slime end -*/ From 4425297ff0184504843199929c0ba072cae5282f Mon Sep 17 00:00:00 2001 From: Dameon Owen Date: Tue, 3 Dec 2024 20:29:33 -0500 Subject: [PATCH 2/2] Update emote.dm --- code/modules/mob/living/emote.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index b665e41dcb..301b264170 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -185,6 +185,7 @@ restraint_check = TRUE var/wing_time = 20 +/* /datum/emote/living/flap/run_emote(mob/user, params) . = ..() if(. && ishuman(user)) @@ -197,6 +198,7 @@ else H.OpenWings() addtimer(CALLBACK(H, TYPE_PROC_REF(open ? /mob/living/carbon/human/atom/.proc/OpenWings : /mob/living/carbon/human/atom/,CloseWings)), wing_time) +*/ /datum/emote/living/flap/aflap key = "aflap"