From 2c228571f3fb83bbee0e7ef5c4c74b0909368ff0 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 16 Dec 2019 15:39:22 -0700 Subject: [PATCH] nerfs --- code/__HELPERS/icons.dm | 4 ++-- code/controllers/configuration/entries/game_options.dm | 3 +++ code/modules/mob/living/silicon/pai/pai.dm | 1 + code/modules/mob/living/silicon/pai/pai_defense.dm | 3 ++- code/modules/mob/living/silicon/pai/pai_shell.dm | 5 ++++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index cb50db74b6..1af3143d9d 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -949,8 +949,8 @@ world /proc/getPAIHologramIcon(icon/A, safety = TRUE) var/icon/flat_icon = safety? A : new(A) - flat_icon.SetIntensity(0.8, 1, 0.9) - flat_icon.ChangeOpacity(0.8) + flat_icon.SetIntensity(0.75, 1, 0.75) + flat_icon.ChangeOpacity(0.7) var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanlineslow")//Scanline effect. flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect. return flat_icon diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index fdddbda344..3d3806e9e0 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -379,3 +379,6 @@ /datum/config_entry/number/auto_transfer_delay config_entry_value = 72000 min_val = 0 + +/datum/config_entry/flag/pai_custom_holoforms + config_entry_value = TRUE diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index e649ff8296..3666324770 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -72,6 +72,7 @@ var/emittermaxhealth = 20 var/emitterregen = 0.25 var/emitter_next_use = 0 + var/emitter_emp_cd = 300 var/emittercd = 50 var/emitteroverloadcd = 100 diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index 10a3171428..8fad29d846 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -8,9 +8,10 @@ return take_holo_damage(50/severity) Knockdown(400/severity) - silent = max(30/severity, silent) + silent = max((3 MINUTES)/severity, silent) if(holoform) fold_in(force = TRUE) + emitter_next_use = world.time + emitter_emp_cd //Need more effects that aren't instadeath or permanent law corruption. /mob/living/silicon/pai/ex_act(severity, target) diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm index 8c70c36fa6..853abdb561 100644 --- a/code/modules/mob/living/silicon/pai/pai_shell.dm +++ b/code/modules/mob/living/silicon/pai/pai_shell.dm @@ -74,7 +74,10 @@ if(!isturf(loc) && loc != card) to_chat(src, "You can not change your holochassis composite while not on the ground or in your card!") return FALSE - var/choicetype = input(src, "What type of chassis do you want to use?") as null|anything in list("Preset - Basic", "Custom", "Preset - Dynamic") + var/list/choices = list("Preset - Basic", "Preset - Dynamic") + if(CONFIG_GET(flag/pai_custom_holoforms)) + choices += "Custom" + var/choicetype = input(src, "What type of chassis do you want to use?") as null|anything in choices if(!choicetype) return FALSE switch(choicetype)