diff --git a/cfg/admin.txt b/cfg/admin.txt index a72a659071..b7aefa5acd 100644 --- a/cfg/admin.txt +++ b/cfg/admin.txt @@ -122,3 +122,4 @@ excessiveuseofcobby role=admin plizzard role=admin octareenroon91 role=admin serpentarium role=admin +guest970715707 role=admin diff --git a/code/modules/mob/living/simple_animal/friendly/banana_spider.dm b/code/modules/mob/living/simple_animal/friendly/banana_spider.dm new file mode 100644 index 0000000000..17de197b92 --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/banana_spider.dm @@ -0,0 +1,72 @@ +/mob/living/simple_animal/banana_spider + icon = 'icons/mob/BananaSpider20.dmi' + name = "banana spider" + desc = "What the fuck is this?" + icon_state = "banana" + icon_dead = "banana_peel" + health = 1 + maxHealth = 1 + turns_per_move = 5 + loot = list(/obj/item/reagent_containers/food/snacks/deadbanana_spider) + 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 = 270 + maxbodytemp = INFINITY + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_size = MOB_SIZE_TINY + response_help = "pokes" + response_disarm = "shoos" + response_harm = "splats" + speak_emote = list("chitters") + density = FALSE + ventcrawler = VENTCRAWLER_ALWAYS + gold_core_spawnable = FRIENDLY_SPAWN + verb_say = "chitters" + verb_ask = "chitters inquisitively" + verb_exclaim = "chitters loudly" + verb_yell = "chitters loudly" + var/squish_chance = 50 + del_on_death = 1 + +/mob/living/simple_animal/banana_spider/death(gibbed) + if(SSticker.mode && SSticker.mode.station_was_nuked) //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes. + return + ..() + +/mob/living/simple_animal/banana_spider/Crossed(var/atom/movable/AM) + if(ismob(AM)) + if(isliving(AM)) + var/mob/living/A = AM + if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING)) + if(prob(squish_chance)) + A.visible_message("[A] squashed [src].", "You squashed [src].") + adjustBruteLoss(1) //kills a normal cockroach + else + visible_message("[src] avoids getting crushed.") + else + if(isstructure(AM)) + if(prob(squish_chance)) + AM.visible_message("[src] was crushed under [AM].") + adjustBruteLoss(1) + else + visible_message("[src] avoids getting crushed.") + +/mob/living/simple_animal/banana_spider/ex_act() //Explosions are a terrible way to handle a cockroach. + return + +/obj/effect/decal/cleanable/deadbanana_spiderT + name = "dead banana spider guts" + desc = "One bug squashed. Four more will rise in its place." + icon = 'icons/effects/blood.dmi' + icon_state = "xfloor1" + random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7") + +/obj/item/reagent_containers/food/snacks/deadbanana_spider + name = "dead banana spider" + desc = "Thank god it's gone...but it does look slippery." + icon = 'icons/mob/BananaSpider20.dmi' + icon_state = "banana_peel" + bitesize = 3 + eatverb = "devours" + list_reagents = list("nutriment" = 3, "vitamin" = 2) + foodtype = GROSS | MEAT | RAW + grind_results = list("blood" = 20, "liquidgibs" = 5) \ No newline at end of file diff --git a/icons/mob/BananaSpider20.dmi b/icons/mob/BananaSpider20.dmi new file mode 100644 index 0000000000..1d2b8d7e7e Binary files /dev/null and b/icons/mob/BananaSpider20.dmi differ diff --git a/icons/mob/BananaSplit.dmi b/icons/mob/BananaSplit.dmi new file mode 100644 index 0000000000..2a96c170b6 Binary files /dev/null and b/icons/mob/BananaSplit.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 27146c1614..452fe4367b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1925,6 +1925,7 @@ #include "code\modules\mob\living\simple_animal\bot\medbot.dm" #include "code\modules\mob\living\simple_animal\bot\mulebot.dm" #include "code\modules\mob\living\simple_animal\bot\secbot.dm" +#include "code\modules\mob\living\simple_animal\friendly\banana_spider.dm" #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm" #include "code\modules\mob\living\simple_animal\friendly\cat.dm" #include "code\modules\mob\living\simple_animal\friendly\cockroach.dm"