cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-16 02:17:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from Alphas00/master

Browse Source 
Hair gradients fix and Beltbuster use fixed
This commit is contained in:
evilew
2023-12-23 16:04:17 +01:00
committed by GitHub
parent 55dd5d10ae 800d6689fd
commit 9e19b4de82
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm
+1 -1
View File
@@ -53,7 +53,7 @@
shot_glass_icon_state = "shotglassgold"
hydration = 4
/datum/reagent/consumable/beltbuster_mead/on_mob_life(mob/living/carbon/M)
/datum/reagent/consumable/ethanol/beltbuster_mead/on_mob_life(mob/living/carbon/M)
if(M && M?.client?.prefs.weight_gain_chems) // GS13
M.nutrition += 30 * REAGENTS_METABOLISM
else
code/modules/client/preferences.dm
+1 -1
View File
@@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/wing_color = "fff" //Wing color
// GS13: Hair gradients from Skyrat
var/grad_color = "FFFFFF" //Hair gradient color
var/grad_style = "000" //Hair gradient style
var/grad_style = "None" //Hair gradient style
//HS13
var/body_size = 100 //Body Size in percent
code/modules/mob/living/carbon/human/human_defines.dm
+1 -1
View File
@@ -12,7 +12,7 @@
// GS13: Hair gradients from Skyrat
var/grad_color = "FFFFFF"
var/grad_style = "000"
var/grad_style = "None"
//Facial hair colour and style
var/facial_hair_color = "000"
code/modules/mob/living/carbon/human/species.dm
+2 -2
View File
@@ -468,8 +468,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
hair_overlay.color = "#" + H.hair_color
// GS13: Hair gradients from Skyrat
grad_style = H.grad_style
grad_color = H.grad_color
var/grad_style = H.grad_style
var/grad_color = H.grad_color
if(grad_style)
var/datum/sprite_accessory/gradient = GLOB.hair_gradients_list[grad_style]
var/icon/temp = icon(gradient.icon, gradient.icon_state)