From 33f997c10d240624cf02295a2bc27850aeeb157b Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 11 Dec 2018 08:34:22 -0800 Subject: [PATCH 1/2] Update banana_spider.dm --- .../mob/living/simple_animal/banana_spider.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm b/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm index 80e8234914..e896ca5bc2 100644 --- a/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm +++ b/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm @@ -38,7 +38,7 @@ return to_chat(user, "You decide to wake up the banana spider...") awakening = 1 - + spawn(30) if(!QDELETED(src)) var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc)) @@ -67,7 +67,7 @@ response_harm = "splats" speak_emote = list("chitters") mouse_opacity = 2 - density = FALSE + density = TRUE ventcrawler = VENTCRAWLER_ALWAYS gold_core_spawnable = FRIENDLY_SPAWN verb_say = "chitters" @@ -75,9 +75,9 @@ verb_exclaim = "chitters loudly" verb_yell = "chitters loudly" var/squish_chance = 50 + var/projectile_density = TRUE //griffons get shot del_on_death = 1 - /mob/living/simple_animal/banana_spider/Initialize() . = ..() var/area/A = get_area(src) @@ -85,9 +85,8 @@ 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) + if(key) //please stop using src. without a good reason. return if(CONFIG_GET(flag/use_age_restriction_for_jobs)) if(!isnum(user.client.player_age)) @@ -104,11 +103,13 @@ /mob/living/simple_animal/banana_spider/ComponentInitialize() . = ..() - AddComponent(/datum/component/slippery, 80) + AddComponent(/datum/component/slippery, 40) - -/mob/living/simple_animal/banana_spider/Crossed(var/atom/movable/AM) +/mob/living/simple_animal/banana_spider/Crossed(atom/movable/AM) //no /var in proc headers . = ..() + if(istype(AM, /obj/item/projectile) && projectile_density) //forced projectile density + var/obj/item/projectile/P = AM + P.Bump(src) if(ismob(AM)) if(isliving(AM)) var/mob/living/A = AM @@ -147,4 +148,4 @@ /obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize() . = ..() - AddComponent(/datum/component/slippery, 80) + AddComponent(/datum/component/slippery, 20) From df55b465b1cad91134c316d5f66524bf68fe225d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 11 Dec 2018 08:37:10 -0800 Subject: [PATCH 2/2] removes poi spam and cleans up code --- .../modules/mob/living/simple_animal/banana_spider.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm b/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm index e896ca5bc2..d2006cd12c 100644 --- a/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm +++ b/modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm @@ -55,7 +55,8 @@ icon_dead = "banana_peel" health = 1 maxHealth = 1 - turns_per_move = 5 + turns_per_move = 5 //this isn't player speed =| + speed = 2 //this is player speed 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 @@ -76,14 +77,13 @@ verb_yell = "chitters loudly" var/squish_chance = 50 var/projectile_density = TRUE //griffons get shot - del_on_death = 1 + del_on_death = TRUE /mob/living/simple_animal/banana_spider/Initialize() . = ..() var/area/A = get_area(src) if(A) 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(key) //please stop using src. without a good reason. @@ -97,8 +97,8 @@ var/be_spider = alert("Become a banana spider? (Warning, You can no longer be cloned!)",,"Yes","No") if(be_spider == "No" || QDELETED(src) || !isobserver(user)) return - src.sentience_act() - src.key = user.key + sentience_act() + key = user.key density = TRUE /mob/living/simple_animal/banana_spider/ComponentInitialize()