Merge pull request #3588 from VOREStation/use-names-that-make-fucking-sense

Makes file pathing for mobs not piss me off
This commit is contained in:
Aronai Sieyes
2018-04-30 12:53:20 -04:00
committed by GitHub
8 changed files with 21 additions and 21 deletions
@@ -1,4 +1,4 @@
/mob/living/simple_animal/hostile/badboi
/mob/living/simple_animal/hostile/corrupthound
name = "corrupt hound"
desc = "Good boy machine broke. This is definitely no good news for the organic lifeforms in vicinity."
icon = 'icons/mob/vore64x32.dmi'
@@ -57,7 +57,7 @@
loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6)
/mob/living/simple_animal/hostile/badboi/prettyboi
/mob/living/simple_animal/hostile/corrupthound/prettyboi
name = "corrupt corrupt hound"
desc = "Bad boy machine broke as well. Seems an attempt was made to achieve a less threatening look, and this one is definitely having some conflicting feelings about it."
icon_state = "prettyboi"
@@ -76,18 +76,18 @@
say_got_target = list("HERE COMES BIG MEAN HUG MACHINE!", "I'LL BE GENTLE!", "FUEL ME FRIEND!", "I*M SO SORRY!", "YUMMY TREAT DETECTED!", "LOVE ME!", "Not again. NOT AGAIN!")
/mob/living/simple_animal/hostile/badboi/isSynthetic()
/mob/living/simple_animal/hostile/corrupthound/isSynthetic()
return TRUE
/mob/living/simple_animal/hostile/badboi/speech_bubble_appearance()
/mob/living/simple_animal/hostile/corrupthound/speech_bubble_appearance()
return "synthetic_evil"
/mob/living/simple_animal/hostile/badboi/PunchTarget()
/mob/living/simple_animal/hostile/corrupthound/PunchTarget()
if(istype(target_mob,/mob/living/simple_animal/mouse))
return EatTarget()
else ..()
/mob/living/simple_animal/hostile/badboi/death(gibbed, deathmessage = "shudders and collapses!")
/mob/living/simple_animal/hostile/corrupthound/death(gibbed, deathmessage = "shudders and collapses!")
.=..()
resting = 0
icon_state = icon_dead
@@ -1,4 +1,4 @@
/mob/living/simple_animal/hostile/rous
/mob/living/simple_animal/hostile/rat
name = "giant rat"
desc = "In what passes for a hierarchy among verminous rodents, this one is king."
tt_desc = "Mus muscular"
@@ -41,6 +41,6 @@
vore_pounce_chance = 45
vore_icons = SA_ICON_LIVING | SA_ICON_REST
/mob/living/simple_animal/hostile/rous/death()
/mob/living/simple_animal/hostile/rat/death()
playsound(src, 'sound/effects/mouse_squeak_loud.ogg', 50, 1)
..()
@@ -1,4 +1,4 @@
/mob/living/simple_animal/wah
/mob/living/simple_animal/redpanda
name = "red panda"
desc = "It's a wah! Beware of doom pounce!"
tt_desc = "Ailurus fulgens"
@@ -29,7 +29,7 @@
emote_see = list("trundles around","rears up onto their hind legs and pounces a bug")
// Activate Noms!
/mob/living/simple_animal/wah
/mob/living/simple_animal/redpanda
vore_active = 1
vore_bump_chance = 10
vore_bump_emote = "playfully lunges at"
@@ -37,7 +37,7 @@
vore_default_mode = DM_HOLD // above will only matter if someone toggles it anyway
vore_icons = SA_ICON_LIVING
/mob/living/simple_animal/wah/fae
/mob/living/simple_animal/redpanda/fae
name = "dark wah"
desc = "Ominous, but still cute!"
tt_desc = "Ailurus brattus"