Skip to content

Commit

Permalink
does the fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Thera-Pissed committed Jun 20, 2024
1 parent 7924ea9 commit 2fc8707
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
6 changes: 1 addition & 5 deletions code/game/machinery/hologram.dm
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/

/obj/machinery/holopad/proc/SetLightsAndPower()
var/total_users = LAZYLEN(masters) + LAZYLEN(holo_calls)
if(total_users > 0)
set_active_power()
else
set_idle_power()
active_power_usage = initial(active_power_usage) * total_users
//active_power_usage = initial(active_power_usage) * total_users
if(total_users || replay_mode)
set_light(2)
else
Expand Down
19 changes: 19 additions & 0 deletions code/modules/antagonists/revenant/revenant_abilities.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,3 +375,22 @@
tray.pestlevel = rand(8, 10)
tray.weedlevel = rand(8, 10)
tray.toxic = rand(45, 55)

/obj/effect/proc_holder/spell/targeted/revenant/recall
charge_max = 100
name = "Return"
desc = "Return to your cursed object."
action_icon = 'icons/mob/actions/actions_revenant.dmi'
action_icon_state = "r_nightvision"
action_background_icon_state = "bg_revenant"

/obj/effect/proc_holder/spell/targeted/revenant/recall/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
var/object = user.marked_object
if(!object)
for(var/obj/item/thing in loc.contents)
user.marked_object = thing
to_chat(src, "<span class='revenminor'>You bind your soul to the [thing], You may return to it at will.</span>")
return
else
src.forceMove(object)

0 comments on commit 2fc8707

Please sign in to comment.