diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index 6e26507b22c..aef93f220ed 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -130,6 +130,7 @@ #define LIGHT_RANGE_FIRE 3 #define LIGHTING_PLANE_ALPHA_VISIBLE 255 +#define LIGHTING_PLANE_ALPHA_ALMOST_VISIBLE 223 #define LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE 192 #define LIGHTING_PLANE_ALPHA_SOMEWHAT_INVISIBLE 127 #define LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE 80 diff --git a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm index 2a38a09bc5a..511f0a24c11 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm @@ -25,7 +25,6 @@ default_language = LANGUAGE_REVENANT unarmed_types = list(/datum/unarmed_attack/claws/shredding) - darksight = 8 siemens_coefficient = 0 rarity_value = 10 diff --git a/code/modules/mob/living/carbon/human/species/outsider/undead.dm b/code/modules/mob/living/carbon/human/species/outsider/undead.dm index 929ffaf62c1..72e9a03a17e 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/undead.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/undead.dm @@ -23,7 +23,7 @@ language = LANGUAGE_CULT name_language = LANGUAGE_CULT unarmed_types = list(/datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/sharp) - darksight = 8 + default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE has_organ = list() //skeletons are empty shells for now, maybe we can add something in the future siemens_coefficient = 0 ethanol_resistance = -1 //no drunk skeletons @@ -158,7 +158,7 @@ default_language = LANGUAGE_GIBBERING unarmed_types = list(/datum/unarmed_attack/bite/infectious, /datum/unarmed_attack/claws/strong/zombie) - darksight = 8 + default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE has_fine_manipulation = FALSE diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 5f82ff5e63d..631e29063fd 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -300,8 +300,6 @@ var/has_fine_manipulation = 1 /// The lower, the thicker the skin and better the insulation. var/siemens_coefficient = 1 - /// Native darksight distance. - var/darksight = 2 /// Various specific features. var/flags = 0 /// Appearance/display related features. diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 9261ad5c158..2297c37c89f 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -181,7 +181,7 @@ warning_low_pressure = 50 hazard_low_pressure = 0 siemens_coefficient = 0.2 - darksight = 8 + default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE death_message = "chitters faintly before crumbling to the ground, their eyes dead and lifeless..." halloss_message = "crumbles to the ground, too weak to continue fighting." heat_discomfort_strings = list( diff --git a/code/modules/mob/living/carbon/human/species/station/slime.dm b/code/modules/mob/living/carbon/human/species/station/slime.dm index 9b356b4747f..d22faf58c3d 100644 --- a/code/modules/mob/living/carbon/human/species/station/slime.dm +++ b/code/modules/mob/living/carbon/human/species/station/slime.dm @@ -11,7 +11,7 @@ flags = NO_SCAN | NO_SLIP | NO_BREATHE | NO_EMBED spawn_flags = IS_RESTRICTED siemens_coefficient = 3 //conductive - darksight = 3 + default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE rarity_value = 5 fall_mod = 0 grab_mod = 1.5 diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm index 3ab0ac68452..484753ccabf 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm @@ -24,7 +24,6 @@ maneuvers = list( /singleton/maneuver/leap/tajara ) - darksight = 8 slowdown = -0.4 brute_mod = 1.1 diff --git a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm index ab98f183eff..0d63e516347 100644 --- a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm @@ -24,11 +24,10 @@ /datum/unarmed_attack/bite/sharp ) primitive_form = SPECIES_MONKEY_UNATHI - darksight = 3 + default_lighting_alpha = LIGHTING_PLANE_ALPHA_ALMOST_VISIBLE gluttonous = GLUT_MESSY|GLUT_ITEM_TINY stomach_capacity = 7 slowdown = 0.5 - brute_mod = 0.8 fall_mod = 1.2 radiation_mod = 0.9 // how else did they survive nuclear armageddon? diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm index 5c66bf1f1cc..4a1f6e347f6 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm @@ -30,7 +30,6 @@ meat_type = /obj/item/reagent_containers/food/snacks/meat/bug rarity_value = 4 slowdown = 1 - darksight = 8 //Allows you to see through black k'ois if the night vision is on eyes = "vaurca_eyes" //makes it so that eye colour is not changed when skin colour is. eyes_are_impermeable = TRUE diff --git a/html/changelogs/mattatlas-darksightfix.yml b/html/changelogs/mattatlas-darksightfix.yml new file mode 100644 index 00000000000..3814fa83fb8 --- /dev/null +++ b/html/changelogs/mattatlas-darksightfix.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Removed defunct darksight variables on species. Unathi now have the darksight they were supposed to have."