mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 14:07:51 +01:00
Nerfs Lava Staff (#13971)
* Nerfs Lava Staff so it cannot be used outside mining z level Added a timer and a spark system to spawn sparks when lava staff malfuntions. Lava staff will check what z level is his user on, and if it's not mining will only spawn a few sparks. * Updates description Old description made little sense as lava staff will no longer work at the emergency shuttle. * Update code/modules/mining/lavaland/loot/ashdragon_loot.dm Adds spaces between method call parameters. Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com> * Removes unused spark effect system Since I'm using do_spark() I don t really need a whole spark system. * Gets rid of "timerMalfuntion" var Instead of using 2 variables to do the same, "timer" will now control the cooldown for when the staff works and for when it malfunctions. * Removes unnecesary time check * Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82 Co-authored-by: farie82 <joepvelden@hotmail.com> * Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82 Co-authored-by: farie82 <joepvelden@hotmail.com> Co-authored-by: awdaw <uo251631@uniovi.es> Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com> Co-authored-by: farie82 <joepvelden@hotmail.com>
This commit is contained in:
co-authored by
Kyep
farie82
awdaw
parent
1687fbce7a
commit
1123476af6
@@ -158,7 +158,7 @@
|
||||
|
||||
/obj/item/lava_staff
|
||||
name = "staff of lava"
|
||||
desc = "The ability to fill the emergency shuttle with lava. What more could you want out of life?"
|
||||
desc = "The power of fire and rocks in your hands!"
|
||||
icon_state = "staffofstorms"
|
||||
item_state = "staffofstorms"
|
||||
icon = 'icons/obj/guns/magic.dmi'
|
||||
@@ -192,6 +192,12 @@
|
||||
if(is_type_in_typecache(target, banned_turfs))
|
||||
return
|
||||
|
||||
if(!is_mining_level(user.z)) //Will only spawn a few sparks if not on mining z level
|
||||
timer = world.time + create_delay + 1
|
||||
user.visible_message("<span class='danger'>[user]'s [src] malfunctions!</span>")
|
||||
do_sparks(5, FALSE, user)
|
||||
return
|
||||
|
||||
if(target in view(user.client.view, get_turf(user)))
|
||||
|
||||
var/turf/simulated/T = get_turf(target)
|
||||
|
||||
Reference in New Issue
Block a user