Skip to content

Commit

Permalink
My career was built upon fake "I love you"s
Browse files Browse the repository at this point in the history
This is love, in my own way
  • Loading branch information
Matt Atlas committed Jul 25, 2023
1 parent 84c9550 commit ad0195c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/controllers/subsystems/processing/psi.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ var/global/list/psychic_ranks_to_strings = list("Psionically Sensitive", "Psioni
NEW_SS_GLOBAL(SSpsi)

/datum/controller/subsystem/processing/psi/fire(resumed)
..()
if((world.time >= (last_nlom_awareness_check + 30 MINUTES)) && !checking_nlom && !completing_nlom)
checking_nlom = TRUE
nlom_votes = list(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/psionics/abilities/hollow_purple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

/obj/item/projectile/hollow_purple
name = "hollow purple"
icon_state = "bfg"
icon_state = "hollow_purple"
color = COLOR_PURPLE
damage = 1000
armor_penetration = 1000
Expand Down
2 changes: 1 addition & 1 deletion code/modules/psionics/abilities/psi_drain.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/singleton/psionic_power/psi_drain
name = "Psi-Drain"
desc = "Destroy a living being's Zona Bovinae. This will make them psionically deaf."
desc = "Drain psi-stamina from a living being. This can be used both in melee and at range."
icon_state = "gen_project"
point_cost = 0
ability_flags = PSI_FLAG_APEX
Expand Down
2 changes: 1 addition & 1 deletion code/modules/psionics/abilities/psi_sunder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
cooldown = 30
psi_cost = 20

/obj/item/spell/rend/on_melee_cast(atom/hit_atom, mob/living/user, def_zone)
/obj/item/spell/sunder/on_melee_cast(atom/hit_atom, mob/living/user, def_zone)
if(!isliving(hit_atom))
return

Expand Down
Binary file modified icons/obj/projectiles.dmi
Binary file not shown.

0 comments on commit ad0195c

Please sign in to comment.