mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
Replaced all instances of armour/armoury with armor/armory (#9593)
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
var/announced = FALSE // Whether or not we have been announced to our holder yet.
|
||||
var/suppressed = TRUE // Whether or not we are suppressing our psi powers.
|
||||
var/use_psi_armour = TRUE // Whether or not we should automatically deflect/block incoming damage.
|
||||
var/use_psi_armor = TRUE // Whether or not we should automatically deflect/block incoming damage.
|
||||
var/rebuild_power_cache = TRUE // Whether or not we need to rebuild our cache of psi powers.
|
||||
|
||||
var/rating = 0 // Overall psi rating.
|
||||
@@ -17,7 +17,7 @@
|
||||
var/list/base_ranks // Assoc list of psi faculties to base rank, in case reset is needed
|
||||
var/list/manifested_items // List of atoms manifested/maintained by psychic power.
|
||||
var/next_latency_trigger = 0 // world.time minimum before a trigger can be attempted again.
|
||||
var/last_armor_check // world.time of last armour check.
|
||||
var/last_armor_check // world.time of last armor check.
|
||||
var/last_aura_size
|
||||
var/last_aura_alpha
|
||||
var/last_aura_color
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
ui.update_icon()
|
||||
cancel()
|
||||
|
||||
/datum/psi_complexus/proc/get_armour(var/armourtype)
|
||||
/datum/psi_complexus/proc/get_armor(var/armortype)
|
||||
if(can_use_passive())
|
||||
last_armor_check = world.time
|
||||
return round(Clamp(Clamp(4 * rating, 0, 20) * get_rank(SSpsi.armour_faculty_by_type[armourtype]), 0, 100) * (stamina/max_stamina))
|
||||
return round(Clamp(Clamp(4 * rating, 0, 20) * get_rank(SSpsi.armor_faculty_by_type[armortype]), 0, 100) * (stamina/max_stamina))
|
||||
else
|
||||
last_armor_check = 0
|
||||
return 0
|
||||
|
||||
Reference in New Issue
Block a user