Skip to content

Commit

Permalink
pacifistem and dumb mistakes (ParadiseSS13#23125)
Browse files Browse the repository at this point in the history
  • Loading branch information
Qwertytoforty authored Nov 3, 2023
1 parent 6c7067d commit eb3d953
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/modules/mining/lavaland/loot/hierophant_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@
if(world.time < timer)
return

if((!is_mining_level(user.z) && !iswizard(user)) || istype(get_area(user), /area/ruin/space/bubblegum_arena)) //Will only spawn a few sparks if not on mining z level, unless a wizard uses it.
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
return

if((!is_mining_level(user.z) && !iswizard(user) && !istype(get_area(user), /area/ruin/space/bubblegum_arena))) //Will only spawn a few sparks if not on mining z level, unless a wizard uses it.
timer = world.time + cooldown_time
user.visible_message("<span class='danger'>[user]'s hierophant club malfunctions!</span>")
do_sparks(5, FALSE, user)
Expand Down

0 comments on commit eb3d953

Please sign in to comment.