mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 23:58:07 +01:00
[MIRROR] Cat Nuzzles [MDB IGNORE] (#19163)
* Cat Nuzzles (#73182) ## About The Pull Request Fixes https://github.com/tgstation/tgstation/issues/72946 Cat still splats rats, nuzzles everything else, everything is okay in the world.   ## Why It's Good For The Game Cat nuzzling broken is Against God and Nature ## Changelog 🆑 LT3 fix: Cats can nuzzle people /🆑 * Cat Nuzzles --------- Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
This commit is contained in:
co-authored by
lessthanthree
parent
7aba650c41
commit
5d73dcc11e
@@ -35,9 +35,6 @@
|
||||
has_collar_resting_icon_state = TRUE
|
||||
can_be_held = TRUE
|
||||
held_state = "cat2"
|
||||
///only for attacking rats
|
||||
melee_damage_upper = 6
|
||||
melee_damage_lower = 4
|
||||
attack_verb_continuous = "claws"
|
||||
attack_verb_simple = "claw"
|
||||
attack_sound = 'sound/weapons/slash.ogg'
|
||||
@@ -224,7 +221,7 @@
|
||||
|
||||
//MICE! RATS! OH MY!
|
||||
if((src.loc) && isturf(src.loc))
|
||||
if(!stat && !resting && !buckled)
|
||||
if(!stat && !buckled)
|
||||
//Targeting anything in the rat faction nearby
|
||||
for(var/mob/living/M in view(1,src))
|
||||
if(!M.stat && Adjacent(M))
|
||||
@@ -244,8 +241,6 @@
|
||||
movement_target = null
|
||||
stop_automated_movement = 0
|
||||
break
|
||||
//Rat scratching, or anything else that could be in the rat faction
|
||||
M.attack_animal(src)
|
||||
for(var/obj/item/toy/cattoy/T in view(1,src))
|
||||
if (T.cooldown < (world.time - 400))
|
||||
manual_emote("bats \the [T] around with \his paw!")
|
||||
|
||||
Reference in New Issue
Block a user