cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-30 08:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15626 from SandPoot/emotes

Browse Source 
Minor touches on emotes
This commit is contained in:
Lin
2022-05-18 03:27:08 +00:00
committed by GitHub
parent 35f86287e2 5dad84a486
commit 9d86c5402a
4 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/emote.dm
+2
View File
@@ -518,6 +518,8 @@
/datum/emote/living/circle/run_emote(mob/user, params)
. = ..()
if(!.)
return
var/obj/item/circlegame/N = new(user)
if(user.put_in_hands(N))
to_chat(user, "<span class='notice'>You make a circle with your hand.</span>")
code/modules/mob/living/silicon/robot/emote.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/unrestricted = TRUE
/datum/emote/sound/silicon/run_emote(mob/user, params)
if(!unrestricted && !(issilicon(user) || isipcperson(user)))
if(!unrestricted && !(issilicon(user) || isrobotic(user)))
return
return ..()
code/modules/mob/living/simple_animal/slime/emote.dm
+2
View File
@@ -27,6 +27,8 @@
/datum/emote/slime/mood/run_emote(mob/user, params)
. = ..()
if(!.)
return
var/mob/living/simple_animal/slime/S = user
S.mood = mood
S.regenerate_icons()
modular_citadel/code/modules/mob/cit_emotes.dm
+32 -16
View File
@@ -77,7 +77,8 @@
restraint_check = TRUE
/datum/emote/living/snap/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -93,7 +94,8 @@
restraint_check = TRUE
/datum/emote/living/snap2/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -109,7 +111,8 @@
restraint_check = TRUE
/datum/emote/living/snap3/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -125,7 +128,8 @@
restraint_check = FALSE
/datum/emote/living/awoo/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -141,7 +145,8 @@
restraint_check = FALSE
/datum/emote/living/hiss/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -157,7 +162,8 @@
restraint_check = FALSE
/datum/emote/living/meow/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -173,7 +179,8 @@
restraint_check = FALSE
/datum/emote/living/purr/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -189,7 +196,8 @@
restraint_check = FALSE
/datum/emote/living/nya/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -205,7 +213,8 @@
restraint_check = FALSE
/datum/emote/living/weh/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -221,7 +230,8 @@
restraint_check = FALSE
/datum/emote/living/peep/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -244,7 +254,8 @@
restraint_check = FALSE
/datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -260,7 +271,8 @@
restraint_check = FALSE
/datum/emote/living/merp/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -276,7 +288,8 @@
restraint_check = FALSE
/datum/emote/living/bark/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -293,7 +306,8 @@
restraint_check = FALSE
/datum/emote/living/squish/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -310,7 +324,8 @@
restraint_check = FALSE
/datum/emote/living/pain/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
if(user.nextsoundemote >= world.time)
return
@@ -331,6 +346,7 @@
restraint_check = TRUE
/datum/emote/living/clap1/run_emote(mob/living/user, params)
if(!(. = ..()))
. = ..()
if(!.)
return
playsound(user, 'modular_citadel/sound/voice/clap.ogg', 50, 1, -1)