Skip to content

Commit

Permalink
Buffs lightning holoparasite to not be total shit
Browse files Browse the repository at this point in the history
Adds two new, admin-only guardian types
  • Loading branch information
ChangelingRain committed Mar 22, 2016
1 parent a86ce5e commit 905a720
Show file tree
Hide file tree
Showing 15 changed files with 634 additions and 507 deletions.
7 changes: 7 additions & 0 deletions code/_onclick/hud/alert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,13 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
desc = "Your queen has been killed, you will suffer movement penalties and loss of hivemind. A new queen cannot be made until you recover."
icon_state = "alien_noqueen"

//GUARDIANS

/obj/screen/alert/cancharge
name = "Charge Ready"
desc = "You are ready to charge at a location!"
icon_state = "guardian_charge"

//SILICONS

/obj/screen/alert/nocell
Expand Down
15 changes: 15 additions & 0 deletions code/game/objects/effects/overlays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,21 @@
/obj/effect/overlay/temp/guardian/phase/out
icon_state = "phaseout"

/obj/effect/overlay/temp/guardian/charge
duration = 15

/obj/effect/overlay/temp/guardian/charge/New(loc, atom/mimiced_atom)
..()
alpha = initial(alpha)
if(mimiced_atom)
icon = mimiced_atom.icon
icon_state = mimiced_atom.icon_state
dir = mimiced_atom.dir
spawn(0)
while(alpha)
alpha -= 17
sleep(1)

/obj/effect/overlay/temp/cult
randomdir = 0
duration = 10
Expand Down
Loading

0 comments on commit 905a720

Please sign in to comment.