Skip to content

Commit

Permalink
Nerfs Pyro Mouse and Tweaks/Buffs Living Statue (Citadel-Station-13#6086
Browse files Browse the repository at this point in the history
)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. *Nerfs Pyro Mouse Fire Rate and Projectile.*
2. *Gives Living Statue Bespoke Darkness Spell.*
3. *Living Statue Drops Materials On Death.*

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
balance: Pyro Mouse fire rate reduced.
add: Adds Veil of Shadows ability to Living Statue.
tweak: Living Statues drop items on death.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Captain277 authored Oct 24, 2023
1 parent 5267237 commit baad801
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,16 @@
max_n2 = 0
minbodytemp = 0

movement_cooldown = -100
movement_cooldown = -1

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

Expand All @@ -53,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
Expand All @@ -75,6 +87,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
Expand All @@ -86,8 +99,6 @@
/mob/living/simple_mob/living_statue/gib()
dust()



//# Statue powers

/// Flicker lights AOE Spell
Expand All @@ -98,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


Expand Down Expand Up @@ -129,7 +140,8 @@

message = "<span class='notice'>You glare your eyes.</span>"

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)
Expand All @@ -143,7 +155,26 @@

return things


/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 = "<span class='notice'>You call upon the void.</span>"

charge_max = 1200
cooldown_min = 1200

/spell/aoe_turf/veil_of_darkness/cast(list/targets, mob/user = user)
playsound(user, 'sound/effects/bamf.ogg', 50, 1, 5)
var/obj/item/statue_darkness/S = new
user.contents.Add(S)
S.set_light(5, -10, "#FFFFFF")
QDEL_IN(S, 2 SECONDS)
5 changes: 4 additions & 1 deletion code/modules/projectiles/projectile/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit baad801

Please sign in to comment.