Skip to content

Commit

Permalink
tweak: mouse idle anim addiction (#5048)
Browse files Browse the repository at this point in the history
* tweak: mouse idle anim addiction

* fix

* mouse moving fix

* Update code/modules/mob/living/simple_animal/friendly/mouse.dm

Co-authored-by: Zwei <[email protected]>

* задница апдате

---------

Co-authored-by: Zwei <[email protected]>
  • Loading branch information
ROdenFL and Gottfrei authored Jun 14, 2024
1 parent 9c8fb17 commit 56753ef
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 7 deletions.
5 changes: 5 additions & 0 deletions code/game/objects/effects/decals/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,11 @@
desc = "You see a muscular man in combat gear. Just the sight of this poster brings the scent of true masculinity."
icon_state = "poster37"

/obj/structure/sign/poster/contraband/lostcat
name = "Lost Cat"
desc = "Kisik got lost. Armed and dangerous."
icon_state = "poster38"

//official posters
/obj/structure/sign/poster/official
poster_item_name = "motivational poster"
Expand Down
30 changes: 23 additions & 7 deletions code/modules/mob/living/simple_animal/friendly/mouse.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#define SNIFF 1
#define SHAKE 2
#define SCRATCH 3
#define WASHUP 4
#define SNIFF 1
#define SHAKE 2
#define SCRATCH 3
#define WASHUP 4
#define ASSSHAKE 5

/mob/living/simple_animal/mouse
name = "mouse"
Expand Down Expand Up @@ -84,7 +85,7 @@
if(prob(1))
set_resting(FALSE, instant = TRUE)
if(is_available_for_anim())
do_idle_animation(pick(SNIFF, SCRATCH, SHAKE, WASHUP))
do_idle_animation(pick(SNIFF, SCRATCH, SHAKE, WASHUP, ASSSHAKE))
else if(prob(5))
custom_emote(EMOTE_AUDIBLE, "соп%(ит,ят)%.")
else if(prob(0.5))
Expand Down Expand Up @@ -115,6 +116,7 @@
verbs += /mob/living/simple_animal/mouse/proc/shake
verbs += /mob/living/simple_animal/mouse/proc/scratch
verbs += /mob/living/simple_animal/mouse/proc/washup
verbs += /mob/living/simple_animal/mouse/proc/ass_shake

/mob/living/simple_animal/mouse/proc/color_pick()
if(!mouse_color)
Expand Down Expand Up @@ -227,14 +229,21 @@

emote("mwashup", intentional = TRUE)

/mob/living/simple_animal/mouse/proc/ass_shake()
set name = "Крутить задницей"
set desc = "Крутит задницей"
set category = "Мышь"

emote("massshake", intentional = TRUE)

/datum/emote/living/simple_animal/mouse/idle
key = "msniff"
key_third_person = "msniffs"
message = "нюха%(ет,ют)%!"
emote_type = EMOTE_AUDIBLE
muzzled_noises = list("гортанные", "громкие")
cooldown = 1 MINUTES
audio_cooldown = 1 MINUTES
cooldown = 10 SECONDS
audio_cooldown = 10 SECONDS
var/anim_type = SNIFF
volume = 1

Expand Down Expand Up @@ -263,6 +272,12 @@
message = "умыва%(ет,ют)%ся!"
anim_type = WASHUP

/datum/emote/living/simple_animal/mouse/idle/ass_shake
key = "massshake"
key_third_person = "massshakes"
message = "крут%(ит,ят)% задницей!"
anim_type = ASSSHAKE

/*
* Mouse types
*/
Expand Down Expand Up @@ -518,3 +533,4 @@ GLOBAL_VAR_INIT(hamster_count, 0)
#undef SHAKE
#undef SCRATCH
#undef WASHUP
#undef ASSSHAKE
Binary file modified icons/mob/animal.dmi
Binary file not shown.
Binary file modified icons/obj/contraband.dmi
Binary file not shown.

0 comments on commit 56753ef

Please sign in to comment.