From 07d0466e0489fc5c4bd9cf3677ba199471c219a3 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Wed, 18 Oct 2023 01:13:40 -0700 Subject: [PATCH 1/2] Nerfs Pyro Mouse and Buffs Living Statue --- .../subtypes/animal/space/mouse_army.dm | 4 +- .../subtypes/occult/living_statue.dm | 42 ++++++++++++++++++- .../subtypes/vore/shadekin/ability_objects.dm | 2 +- .../modules/projectiles/projectile/bullets.dm | 5 ++- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm index f3ffbce3f6db..656cc43fa520 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army.dm @@ -207,8 +207,8 @@ "bio" = 100, "rad" = 100) - projectiletype = /obj/projectile/bullet/incendiary/flamethrower - base_attack_cooldown = 10 + projectiletype = /obj/projectile/bullet/incendiary/flamethrower/weak + base_attack_cooldown = 40 ai_holder_type = /datum/ai_holder/simple_mob/ranged diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm b/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm index 87e350ba2fb0..5f1d801e5cb9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm @@ -38,11 +38,16 @@ max_n2 = 0 minbodytemp = 0 - movement_cooldown = -100 + movement_cooldown = -5 ai_holder_type = /datum/ai_holder/simple_mob/statue - +/mob/living/simple_mob/living_statue/death() + new /obj/item/ectoplasm (src.loc) + new /obj/item/stack/material/marble (src.loc) + ..(null,"shatters into a pile of rubble.") + ghostize() + qdel(src) //# Statue Subtypes @@ -75,6 +80,7 @@ // Give spells add_spell(new/spell/aoe_turf/flicker_lights) add_spell(new/spell/aoe_turf/blindness) + add_spell(new/spell/aoe_turf/veil_of_darkness) //? Cannot talk @@ -147,3 +153,35 @@ /spell/aoe_turf/blindness/cast(list/targets, mob/user = usr) for(var/mob/living/victim as anything in targets) victim.Blind(4) + +/// Veil of Darkness Spell +/spell/aoe_turf/veil_of_darkness + name = "Veil of Darkness" + desc = "You sheathe yourself in a powerful veil of darkness." + + override_base = "grey" + hud_state = "wiz_smoke" + + message = "You call upon the void." + + cooldown_min = 5 MINUTE + + +/spell/aoe_turf/veil_of_darkness/cast(list/targets, mob/user = usr) + var/mob/living/simple_mob/living_statue/S = holder + playsound(usr.loc, 'sound/effects/bamf.ogg', 50, 1, 5) + S.add_modifier(/datum/modifier/veil_of_darkness, 3 SECONDS) + +/datum/modifier/veil_of_darkness + name = "Veil of Darkness" + desc = "You pull upon the unreality of The Dark to mask your movements. The attempt is heavily taxing." + mob_overlay_state = "purple_electricity_constant" + + on_created_text = "Your edges warp and dim!" + on_expired_text = "You are no longer shrouded in darkness." + +/datum/modifier/veil_of_darkness/on_applied() + holder.set_light(8, -10, "#FFFFFF") + +/datum/modifier/veil_of_darkness/on_expire() + holder.set_light(0) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm index b59ca72eea99..0395c0583443 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm @@ -138,7 +138,7 @@ if(my_kin.ability_flags & AB_PHASE_SHIFTED) expire() -/datum/modifier/shadekin/create_shade/on_applied() +/datum/modifier/shadekin//on_applied() my_kin = holder holder.glow_toggle = TRUE holder.glow_range = 8 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index fdf9ba48f277..f08a7dd7ce4b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -483,12 +483,15 @@ icon_state = "fireball" damage = 10 embed_chance = 0 - incendiary = 2 + //incendiary = 2 //The Trail of Fire doesn't work. flammability = 4 agony = 30 range = 4 vacuum_traversal = 0 +/obj/projectile/bullet/incendiary/flamethrower/weak + flammability = 2 + /obj/projectile/bullet/incendiary/flamethrower/large damage = 15 range = 6 From a175af6e5a04a9db613ca67e7490be4102ece50b Mon Sep 17 00:00:00 2001 From: Captain277 Date: Wed, 18 Oct 2023 21:03:27 -0700 Subject: [PATCH 2/2] Fixes Statue Shadowgen and Buffs Cast Times --- .../subtypes/occult/living_statue.dm | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm b/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm index 5f1d801e5cb9..76ad12e2c09b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/living_statue.dm @@ -38,7 +38,7 @@ max_n2 = 0 minbodytemp = 0 - movement_cooldown = -5 + movement_cooldown = -1 ai_holder_type = /datum/ai_holder/simple_mob/statue @@ -58,6 +58,13 @@ icon_state = "human_female" gender = NEUTER +//Statue Shadow Organ +/obj/item/statue_darkness + name = "void organ" + desc = "You shouldn't be seeing this. Contact a Maintainer." + icon = 'icons/obj/items.dmi' + icon_state = "gift1" + //# Mob AI Code. /datum/ai_holder/simple_mob/statue @@ -92,8 +99,6 @@ /mob/living/simple_mob/living_statue/gib() dust() - - //# Statue powers /// Flicker lights AOE Spell @@ -104,8 +109,8 @@ override_base = "grey" hud_state = "blackout" - cooldown_min = 1 MINUTE // Overkill but by request. charge_max = 300 + cooldown_min = 300 range = 14 @@ -135,7 +140,8 @@ message = "You glare your eyes." - cooldown_min = 2 MINUTE // Overkill but by request. + charge_max = 600 + cooldown_min = 600 range = 10 /spell/aoe_turf/blindness/choose_targets(mob/user = usr) @@ -149,7 +155,6 @@ return things - /spell/aoe_turf/blindness/cast(list/targets, mob/user = usr) for(var/mob/living/victim as anything in targets) victim.Blind(4) @@ -164,24 +169,12 @@ message = "You call upon the void." - cooldown_min = 5 MINUTE - + charge_max = 1200 + cooldown_min = 1200 /spell/aoe_turf/veil_of_darkness/cast(list/targets, mob/user = usr) - var/mob/living/simple_mob/living_statue/S = holder playsound(usr.loc, 'sound/effects/bamf.ogg', 50, 1, 5) - S.add_modifier(/datum/modifier/veil_of_darkness, 3 SECONDS) - -/datum/modifier/veil_of_darkness - name = "Veil of Darkness" - desc = "You pull upon the unreality of The Dark to mask your movements. The attempt is heavily taxing." - mob_overlay_state = "purple_electricity_constant" - - on_created_text = "Your edges warp and dim!" - on_expired_text = "You are no longer shrouded in darkness." - -/datum/modifier/veil_of_darkness/on_applied() - holder.set_light(8, -10, "#FFFFFF") - -/datum/modifier/veil_of_darkness/on_expire() - holder.set_light(0) + var/obj/item/statue_darkness/S = new + usr.contents.Add(S) + S.set_light(5, -10, "#FFFFFF") + QDEL_IN(S, 2 SECONDS)