Skip to content

Commit

Permalink
Merge pull request #852 from MrCat15352/new_snake_syndie
Browse files Browse the repository at this point in the history
Add: pet snake Rouge
  • Loading branch information
RalseiDreemuurr committed Jul 22, 2024
2 parents 6b0b5de + e45f56c commit cdce5a5
Show file tree
Hide file tree
Showing 4 changed files with 396 additions and 0 deletions.
18 changes: 18 additions & 0 deletions mod_celadon/_components/code/emotes/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,21 @@
'mod_celadon/_storge_sounds/sound/voice/alastor_wing1_2.ogg',
'mod_celadon/_storge_sounds/sound/voice/alastor_wing2.ogg',
'mod_celadon/_storge_sounds/sound/voice/alastor_wing2_2.ogg')

/**
* Perform a custom emote.
*
* * m_type: Type of message to send.
* * message: Content of the message. If none is provided, the user will be prompted to choose the input.
* * intentional: Whether or not the user intendeded to perform the emote.
*/
/mob/proc/custom_emote(m_type = EMOTE_VISIBLE, message = null, intentional = FALSE)
var/input = ""
if(!message && !client)
CRASH("An empty custom emote was called from a client-less mob.")
else if(!message)
input = sanitize(copytext_char(input(src,"Choose an emote to display.") as text|null, 1, MAX_MESSAGE_LEN))
else
input = message

emote("me", m_type, input, intentional)
Binary file added mod_celadon/_storge_icons/icons/mob/pets.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions mod_celadon/mobs/_mobs.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
#include "_mobs.dm"

#include "code/iriska.dm"
#include "code/pets/rouge.dm"
#include "code/pets/syndicat.dm"
#include "code/pets/syndifox.dm"
#include "code/pets/syndimouse.dm"


#include "code/burrows.dm"
#include "code/roaches/reagent_containers.dm"
#include "code/roaches/roach.dm"
Expand Down
Loading

0 comments on commit cdce5a5

Please sign in to comment.