Made bat part of previous bat type.

This commit is contained in:
Fermi
2019-07-19 22:57:22 +01:00
parent 75d6768ba7
commit e5648fd471
4 changed files with 11 additions and 44 deletions
+1 -1
View File
@@ -1208,7 +1208,7 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
/obj/item/secbat/attack_self(mob/user)
new /mob/living/simple_animal/bat/secbat(user.loc)
new /mob/living/simple_animal/hostile/retaliate/bat/secbat(user.loc)
to_chat(user, "<span class='notice'>You open the box, releasing the secbat!</span>")
var/obj/item/I = new /obj/item/stack/sheet/cardboard
qdel(src)
@@ -1,42 +0,0 @@
/mob/living/simple_animal/bat
name = "Bat"
desc = "A fruit bat which is known to roost in spaceships occastionally."
icon_state = "bat"
icon_living = "bat"
icon_dead = "bat_dead"
icon_gib = "bat_dead"
turns_per_move = 1
response_help = "brushes aside"
response_disarm = "flails at"
response_harm = "hits"
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
speak_chance = 0
maxHealth = 15
health = 15
spacewalk = TRUE
see_in_dark = 10
harm_intent_damage = 6
melee_damage_lower = 6
melee_damage_upper = 5
attacktext = "bites"
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
pass_flags = PASSTABLE
gold_core_spawnable = FRIENDLY_SPAWN
attack_sound = 'sound/weapons/bite.ogg'
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
movement_type = FLYING
speak_emote = list("squeaks")
emote_see = list("squeaks eagerly.", "flaps about.")
/mob/living/simple_animal/bat/secbat
name = "Security Bat"
icon_state = "secbat"
icon_living = "secbat"
icon_dead = "secbat_dead"
icon_gib = "secbat_dead"
desc = "A fruit bat with a tiny little security hat who is ready to inject cuteness into any security operation."
emote_see = list("is ready to law down the law.", "flaps about with an air of authority.")
response_help = "respects the authority of"
@@ -38,3 +38,13 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
/mob/living/simple_animal/hostile/retaliate/bat/secbat
name = "Security Bat"
icon_state = "secbat"
icon_living = "secbat"
icon_dead = "secbat_dead"
icon_gib = "secbat_dead"
desc = "A fruit bat with a tiny little security hat who is ready to inject cuteness into any security operation."
emote_see = list("is ready to law down the law.", "flaps about with an air of authority.")
response_help = "respects the authority of"
gold_core_spawnable = FRIENDLY_SPAWN