Skip to content

Commit e47af5c

Browse files
authored
Shadekin-Spacekin-Futureproofing (#7192)
## About The Pull Request Biggest change is that Space turf counts as dark for Shadekin, and those Shadekin who would lose energy in the light (Yellow, Purple, Orange) now instead have minimal regeneration in the light. This will be important for the future change to Shadekin with them travelling through space, since space is always bright. Siemens Coeff is also returned to the previous value, as it was before needless drama happened. HUD values were updated since sometimes regeneration would put the value to one which wasn't checked by the switch, causing the HUD to mess up for a short time. (i.e. value goes to 24.1 which wasn't covered.) ## Why It's Good For The Game Current plan for the future of Shadekin will have them move through space, and during such discussion I was told to go ahead and make Space tiles count as dark to ensure those Shadekin don't suddenly get stranded in space. ## Changelog :cl: add: Check to see if the turf is a space turf. tweak: Degeneration values replaced with minor regeneration. (Only affects Admin Shadekin.) /:cl:
1 parent f6d9002 commit e47af5c

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

code/modules/species/shadekin/shadekin.dm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/datum/melee_attack/unarmed/bite/sharp/shadekin,
3838
)
3939

40-
siemens_coefficient = 1
40+
siemens_coefficient = 0
4141
vision_innate = /datum/vision/baseline/species_tier_3/for_snowflake_ocs
4242
vision_organ = O_EYES
4343

@@ -118,8 +118,6 @@
118118
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right),
119119
)
120120

121-
vision_innate = /datum/vision/baseline/species_tier_3/for_snowflake_ocs
122-
123121
var/list/shadekin_abilities = list(
124122
/datum/power/shadekin/phase_shift,
125123
/datum/power/shadekin/regenerate_other,
@@ -181,6 +179,8 @@
181179
var/brightness = T.get_lumcount() //Brightness in 0.0 to 1.0
182180
darkness = 1-brightness //Invert
183181
var/is_dark = (darkness >= 0.5)
182+
if(isspaceturf(T))
183+
is_dark = 1
184184

185185
if(H.ability_flags & AB_PHASE_SHIFTED)
186186
dark_gains = 0
@@ -259,13 +259,13 @@
259259
l_icon = 4
260260

261261
switch(get_energy(H))
262-
if(0 to 24)
262+
if(0 to 24.99)
263263
e_icon = 0
264-
if(25 to 49)
264+
if(25 to 49.99)
265265
e_icon = 1
266-
if(50 to 74)
266+
if(50 to 74.99)
267267
e_icon = 2
268-
if(75 to 99)
268+
if(75 to 99.99)
269269
e_icon = 3
270270
if(100 to INFINITY)
271271
e_icon = 4

code/modules/species/shadekin/shadekin_traits.dm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
/datum/trait/kintype/purple
4747
name = "Shadekin Purple Adaptation"
4848
color = PURPLE_EYES
49-
desc = "Very good energy regeneration in darkness, minor degeneration in the light and increased health!"
49+
desc = "Very good energy regeneration in darkness, minor regeneration in the light and increased health!"
5050
var_changes = list(
5151
"total_health" = 150,
52-
"energy_light" = -0.5,
52+
"energy_light" = 0.25,
5353
"energy_dark" = 1.5,
5454
"unarmed_types" = list(
5555
/datum/melee_attack/unarmed/stomp,
@@ -67,10 +67,10 @@
6767
/datum/trait/kintype/yellow
6868
name = "Shadekin Yellow Adaptation"
6969
color = YELLOW_EYES
70-
desc = "Highest energy regeneration in darkness, high degeneration in the light and unchanged health!"
70+
desc = "Highest energy regeneration in darkness, minor regeneration in the light and unchanged health!"
7171
var_changes = list(
7272
"total_health" = 100,
73-
"energy_light" = -1,
73+
"energy_light" = 0.25,
7474
"energy_dark" = 3,
7575
"unarmed_types" = list(
7676
/datum/melee_attack/unarmed/stomp,
@@ -109,10 +109,10 @@
109109
/datum/trait/kintype/orange
110110
name = "Shadekin Orange Adaptation"
111111
color = ORANGE_EYES
112-
desc = "Good energy regeneration in darkness, small degeneration in the light and increased health!"
112+
desc = "Good energy regeneration in darkness, minor regeneration in the light and increased health!"
113113
var_changes = list(
114114
"total_health" = 175,
115-
"energy_light" = -0.5,
115+
"energy_light" = 0.25,
116116
"energy_dark" = 1,
117117
"unarmed_types" = list(
118118
/datum/melee_attack/unarmed/stomp,

0 commit comments

Comments
 (0)