cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect scope for some simple animal emote keybinds (#19994)

Browse Source 
* fixed this

* misclick
This commit is contained in:
S34N
2023-01-09 13:11:13 +01:00
committed by GitHub
parent e711cd5921
commit f9952db04e
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/keybindings/emote.dm
+23 -8
View File
@@ -441,14 +441,6 @@
linked_emote = /datum/emote/living/carbon/human/wag/stop
name = "Stop Wag"
/datum/keybinding/emote/carbon/human/scream/screech
linked_emote = /datum/emote/living/carbon/human/scream/screech
name = "Screech"
/datum/keybinding/emote/carbon/human/scream/screech/roar
linked_emote = /datum/emote/living/carbon/human/scream/screech/roar
name = "Roar"
/datum/keybinding/emote/carbon/human/flap
linked_emote = /datum/emote/living/carbon/human/flap
name = "Flap"
@@ -513,6 +505,9 @@
linked_emote = /datum/emote/living/carbon/human/rattle
name = "Rattle"
/datum/keybinding/emote/carbon/human/monkey/can_use(client/C, mob/M)
return ismonkeybasic(M) && ..()
/datum/keybinding/emote/carbon/human/monkey/gnarl
linked_emote = /datum/emote/living/carbon/human/monkey/gnarl
name = "Gnarl (Monkey)"
@@ -529,6 +524,14 @@
linked_emote = /datum/emote/living/carbon/human/monkey/tail
name = "Tail (Monkey)"
/datum/keybinding/emote/carbon/human/monkey/scream/screech
linked_emote = /datum/emote/living/carbon/human/scream/screech
name = "Screech (Monkey)"
/datum/keybinding/emote/carbon/human/monkey/scream/screech/roar
linked_emote = /datum/emote/living/carbon/human/scream/screech/roar
name = "Roar (Monkey)"
/datum/keybinding/emote/silicon
category = KB_CATEGORY_EMOTE_SILICON
@@ -581,6 +584,9 @@
linked_emote = /datum/emote/living/simple_animal/diona_chirp
name = "Chirp (Nymph)"
/datum/keybinding/emote/simple_animal/diona_chirp/can_use(client/C, mob/M)
return isnymph(M) && ..()
/datum/keybinding/emote/simple_animal/pet/dog/bark
linked_emote = /datum/emote/living/simple_animal/pet/dog/bark
name = "Bark (Dog)"
@@ -593,10 +599,16 @@
linked_emote = /datum/emote/living/simple_animal/pet/dog/growl
name = "Growl (Dog)"
/datum/keybinding/emote/simple_animal/pet/dog/can_use(client/C, mob/M)
return isdog(M) && ..()
/datum/keybinding/emote/simple_animal/mouse/squeak
linked_emote = /datum/emote/living/simple_animal/mouse/squeak
name = "Squeak (Mouse)"
/datum/keybinding/emote/simple_animal/mouse/can_use(client/C, mob/M)
return ismouse(M) && ..()
/datum/keybinding/emote/simple_animal/pet/cat/meow
linked_emote = /datum/emote/living/simple_animal/pet/cat/meow
name = "Meow (Cat)"
@@ -609,6 +621,9 @@
linked_emote = /datum/emote/living/simple_animal/pet/cat/purr
name = "Purr (Cat)"
/datum/keybinding/emote/simple_animal/pet/cat/can_use(client/C, mob/M)
return iscat(M) && ..()
/datum/keybinding/custom
category = KB_CATEGORY_EMOTE_CUSTOM
var/default_emote_text = "Insert custom me emote text."