From 1dcdb82a252a50fdc4f73915d7020ae47231044e Mon Sep 17 00:00:00 2001 From: theTiji0 Date: Tue, 16 Jan 2018 16:41:51 -0500 Subject: [PATCH] minor touch ups and cleaning up the files --- cfg/admin.txt | 2 +- icons/mob/BananaSpider20.dmi | Bin 1206 -> 0 bytes icons/mob/BananaSplit.dmi | Bin 589 -> 0 bytes .../code/modules/mob/living/banana_spider.dm | 43 +++++++++--------- modular_citadel/icons/mob/BananaSpider.dmi | Bin 0 -> 2394 bytes .../icons/obj/exoticbanana-harvest.dmi | Bin 1071 -> 0 bytes modular_citadel/icons/obj/inactive-banana.dmi | Bin 588 -> 0 bytes .../icons/obj/seeds_Exoticbanana.dmi | Bin 378 -> 0 bytes 8 files changed, 22 insertions(+), 23 deletions(-) delete mode 100644 icons/mob/BananaSpider20.dmi delete mode 100644 icons/mob/BananaSplit.dmi create mode 100644 modular_citadel/icons/mob/BananaSpider.dmi delete mode 100644 modular_citadel/icons/obj/exoticbanana-harvest.dmi delete mode 100644 modular_citadel/icons/obj/inactive-banana.dmi delete mode 100644 modular_citadel/icons/obj/seeds_Exoticbanana.dmi 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 1d2b8d7e7e939fbd469b967347e34c86f6c63014..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1206 zcmV;n1WEgeP)Vv?a*J zeW|G=_Vohs@hPICHn_OBlarIStzn^|5Ag8<_Vp{IqAe;aD&p2({Q6?{_5|fqy87h$?`9GmwuZkdG^jic!G8z?PPl zy1Kdm05bpp0CI67v8@OB`4YXmMWCD?p`9V$)m_NIVEp?4{QWAwybHv{PM(<`rJ^IZ zw>-AD7|Oz7?dN05!(h?MVEOtixw$UN%T(s(5zx_M%*A2t=VZ#lWul@I@9q|;rzX3=Hp@Q?+K}=HNCzl;oE8K><7)u2iG9i#sB~S0d!JMQvg8b z*k%9#0Cjp)Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1V_YZU6v6QzvsUtHT-q00K@)L_t(oh3%M$Q{pfb#-AsGqT&H~ zP(|xayl(|jK@=1fWI%K;S9f*q`}ErN_`5ghmQl2AYP#!;V}8T5q2J5*nxr#*DFBDV zxpi`K{;!V7&12W|a;f$J`2~fndSOAnjs&J6vzbjdn~O|35?G2$tX3A?YAq?Y=txjn zR&KMg=r&t*`%D7Tx8ludA&gEvG}VKL`Rq zL!-N?Sri#`5XI&ucVh#PIK>PAEv;?s9i3eskAQBjBf;b8>g;H5Yi&^yyL)>3`UeJw zhDS!n#_=H0jdT)%CvbdhbYysFaG<}hx2OB^P2lFlq}Mm)pPrcw1m}p9-8K7WSan)g4u`|x z+;vbgB^`mB(K@@4N`0SB$&Hls0|Ob9>;H^D89)-h9+L(VDAxZ;^45>V6PY0xNuXT+ zqtHeu9NCPLw>tuqx*nk$mHI#J_4yy5KoC8AlzyBx;IFYic(R3_ZtpyMzPtCrfWOB6 z;N`2=Z`^OickuqhM;2>Z{r~Cn7ufpx?fVaapZhHSwEF+x5a8(e*KgcBVeltt?+;GN z!E&axK~zOY{V!uW*WBZ(`P1wF47Be6%IK*7W$0fb)S%V>{}S5%z%abX=iEE~0B>z< U>3t-GQ~&?~07*qoM6N<$f-AD7|Oz7 z?dN05!(h?MVD|O{`T8ubtxUPOF3QVP=H?O5(PGTSVeRK+%ED!$q7v`!7O1Bt($Z}8 z^dZd5SJ260%EDmR)1l_$VeRh;si!r)z9`|_Y4Pb^?Cb}UlPk;1XU)q8i;FQ#OGwVl zg-Az8&?*b=00001bW%=J06^y0W&i*HZF*E#bVOxyV{&P5bZKvH004NLQ&w{tDg(lZ~*%y9C487z3l)10IEquK~y-6?T^O} z!axi}$61yVdWX<^@4a{U|34y$h=kZxE?hIRY)kWO%YdVAk;2RjqmoPTIr}us3cIoIp$fz$4LEoDxY&rFn+SKgnv8%NL5Ja-}K< zYV}65)$VlB>knl9a5RQCna<|GVkrYwYhbh8?e+E`y>K+r>3osjw{*ST?SaSB-hbKK bj{eXa>@^B)QPqi?00000NkvXXu0mjf*q9n? 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 0000000000000000000000000000000000000000..da65ef43fadbb0cf2bff81598fdc36ff30962cb1 GIT binary patch literal 2394 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 Y0O|Ath-*H~`~Uy|07*qoM6N<$f&`14_y7O^