diff --git a/cfg/admin.txt b/cfg/admin.txt
index b7aefa5acd..5a06cec4a9 100644
--- a/cfg/admin.txt
+++ b/cfg/admin.txt
@@ -122,4 +122,4 @@ excessiveuseofcobby role=admin
plizzard role=admin
octareenroon91 role=admin
serpentarium role=admin
-guest970715707 role=admin
+
diff --git a/icons/mob/BananaSpider20.dmi b/icons/mob/BananaSpider20.dmi
deleted file mode 100644
index 1d2b8d7e7e..0000000000
Binary files a/icons/mob/BananaSpider20.dmi and /dev/null differ
diff --git a/icons/mob/BananaSplit.dmi b/icons/mob/BananaSplit.dmi
deleted file mode 100644
index 2a96c170b6..0000000000
Binary files a/icons/mob/BananaSplit.dmi and /dev/null differ
diff --git a/modular_citadel/code/modules/mob/living/banana_spider.dm b/modular_citadel/code/modules/mob/living/banana_spider.dm
index 7cc23b934b..8400853864 100644
--- a/modular_citadel/code/modules/mob/living/banana_spider.dm
+++ b/modular_citadel/code/modules/mob/living/banana_spider.dm
@@ -2,38 +2,37 @@
. = ..()
mutatelist += /obj/item/seeds/banana/exotic_banana
+
/obj/item/seeds/banana/exotic_banana
name = "pack of exotic banana seeds"
desc = "They're seeds that grow into banana trees. However, those bananas might be alive."
- icon = 'modular_citadel/icons/obj/seeds_Exoticbanana.dmi'
+ icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
icon_state = "seed_ExoticBanana"
species = "banana"
plantname = "Exotic Banana Tree"
product = /obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable
- lifespan = 50
- endurance = 30
- //harvest_icon = 'modular_citadel/icons/obj/exoticbanana-harvest.dmi'
- growing_icon = 'modular_citadel/icons/obj/exoticbanana-harvest.dmi'
+ growing_icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
icon_dead = "banana-dead"
-// icon_harvest = "banana-harvest"
- genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
+ mutatelist = list()
+ genes = list(/datum/plant_gene/trait/slip)
reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
+
/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable
seed = /obj/item/seeds/banana/exotic_banana
name = "banana spider"
desc = "You do not know what it is, but you can bet the clown would love it."
- icon = 'modular_citadel/icons/obj/inactive-banana.dmi'
+ icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
icon_state = "banana"
item_state = "banana"
filling_color = "#FFFF00"
- bitesize = 5
list_reagents = list("nutriment" = 3, "vitamin" = 2)
- foodtype = GROSS | MEAT | RAW
+ foodtype = GROSS | MEAT | RAW | FRUIT
grind_results = list("blood" = 20, "liquidgibs" = 5)
juice_results = list("banana" = 0)
var awakening = 0
+
/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable/attack_self(mob/user)
if(awakening || isspaceturf(user.loc))
return
@@ -42,13 +41,14 @@
spawn(30)
if(!QDELETED(src))
- var/mob/living/simple_animal/banana_spider/K = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
- K.speed += round(10 / seed.potency)
- K.visible_message("The banana spider chitters as it stretches its legs.")
+ var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
+ S.speed += round(10 / seed.potency)
+ S.visible_message("The banana spider chitters as it stretches its legs.")
qdel(src)
+
/mob/living/simple_animal/banana_spider
- icon = 'icons/mob/BananaSpider20.dmi'
+ icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
name = "banana spider"
desc = "What the fuck is this abomination?"
icon_state = "banana"
@@ -76,6 +76,7 @@
var/squish_chance = 50
del_on_death = 1
+
/mob/living/simple_animal/banana_spider/Initialize()
. = ..()
var/area/A = get_area(src)
@@ -83,11 +84,12 @@
notify_ghosts("A banana spider has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
GLOB.poi_list |= src
+
/mob/living/simple_animal/banana_spider/attack_ghost(mob/user)
if(src.key)
return
if(CONFIG_GET(flag/use_age_restriction_for_jobs))
- if(!isnum(user.client.player_age)) //apparently what happens when there's no DB connected. just don't let anybody be a drone without admin intervention
+ if(!isnum(user.client.player_age))
return
if(!SSticker.mode)
to_chat(user, "Can't become a banana spider before the game has started.")
@@ -98,17 +100,12 @@
src.sentience_act()
src.key = user.key
-/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/ComponentInitialize()
. = ..()
AddComponent(/datum/component/slippery, 80)
-
/mob/living/simple_animal/banana_spider/Crossed(var/atom/movable/AM)
. = ..()
if(ismob(AM))
@@ -117,7 +114,7 @@
if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING))
if(prob(squish_chance))
A.visible_message("[A] squashed [src].", "You squashed [src] under your weight as you fell.")
- adjustBruteLoss(1) //kills a normal cockroach
+ adjustBruteLoss(1)
else
visible_message("[src] avoids getting crushed.")
else
@@ -131,10 +128,11 @@
/mob/living/simple_animal/banana_spider/ex_act()
return
+
/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 = 'modular_citadel/icons/mob/BananaSpider.dmi'
icon_state = "banana_peel"
bitesize = 3
eatverb = "devours"
@@ -143,6 +141,7 @@
grind_results = list("blood" = 20, "liquidgibs" = 5)
juice_results = list("banana" = 0)
+
/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize()
. = ..()
AddComponent(/datum/component/slippery, 80)
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/BananaSpider.dmi b/modular_citadel/icons/mob/BananaSpider.dmi
new file mode 100644
index 0000000000..da65ef43fa
Binary files /dev/null and b/modular_citadel/icons/mob/BananaSpider.dmi differ
diff --git a/modular_citadel/icons/obj/exoticbanana-harvest.dmi b/modular_citadel/icons/obj/exoticbanana-harvest.dmi
deleted file mode 100644
index 043573bb7a..0000000000
Binary files a/modular_citadel/icons/obj/exoticbanana-harvest.dmi and /dev/null differ
diff --git a/modular_citadel/icons/obj/inactive-banana.dmi b/modular_citadel/icons/obj/inactive-banana.dmi
deleted file mode 100644
index a5a331d4c6..0000000000
Binary files a/modular_citadel/icons/obj/inactive-banana.dmi and /dev/null differ
diff --git a/modular_citadel/icons/obj/seeds_Exoticbanana.dmi b/modular_citadel/icons/obj/seeds_Exoticbanana.dmi
deleted file mode 100644
index 2a9fc805d5..0000000000
Binary files a/modular_citadel/icons/obj/seeds_Exoticbanana.dmi and /dev/null differ