[MIRROR] Basic Mob Spiders III: Sgt. Araneus is no longer a bat [MDB IGNORE] (#19315)

* Basic Mob Spiders III: Sgt. Araneus is no longer a bat

* spooky scary spider

* Revert "spooky scary spider"

This reverts commit 7bcca7750390c7ba6aaa08760886eda524f600f8.

* resolve conflicts

* resolve conflicts

* https://github.com/tgstation/tgstation/pull/73724

https://github.com/tgstation/tgstation/pull/73724

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/19561

* fixes

* wew

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: lessthnthree <three@lessthanthree.dk>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-10 04:47:03 +00:00
committed by GitHub
co-authored by Jacquerel lessthnthree Gandalf
parent 79a99ba516
commit 480745ce05
42 changed files with 606 additions and 577 deletions
@@ -49,7 +49,7 @@
. = ..()
AddComponent(/datum/component/slippery, 20)
/mob/living/simple_animal/hostile/giant_spider/badnana_spider
/mob/living/basic/giant_spider/badnana_spider
name = "badnana spider"
desc = "WHY WOULD GOD ALLOW THIS?!"
icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi'
@@ -60,13 +60,6 @@
health = 40
melee_damage_lower = 5
melee_damage_upper = 5
move_to_delay = 4
speed = -0.5
faction = list("spiders")
/mob/living/simple_animal/hostile/giant_spider/badnana_spider/AttackingTarget()
. = ..()
if(iscarbon(target))
var/mob/living/carbon/carbon_target = target
carbon_target.reagents.add_reagent(/datum/reagent/consumable/laughter, 10)