cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ice cream

Browse Source
This commit is contained in:
Layne
2020-07-04 00:35:30 -04:00
committed by VirgoBot
parent 33e07ac92d
commit 989ca48282
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -49,9 +49,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["hair_red"] << pref.r_hair S["hair_red"] << pref.r_hair
S["hair_green"] << pref.g_hair S["hair_green"] << pref.g_hair
S["hair_blue"] << pref.b_hair S["hair_blue"] << pref.b_hair
S["grad_red"] >> pref.r_grad S["grad_red"] << pref.r_grad
S["grad_green"] >> pref.g_grad S["grad_green"] << pref.g_grad
S["grad_blue"] >> pref.b_grad S["grad_blue"] << pref.b_grad
S["facial_red"] << pref.r_facial S["facial_red"] << pref.r_facial
S["facial_green"] << pref.g_facial S["facial_green"] << pref.g_facial
S["facial_blue"] << pref.b_facial S["facial_blue"] << pref.b_facial

5
vorestation.dme
View File

@@ -1647,9 +1647,14 @@
#include "code\modules\ai\ai_holder_targeting_vr.dm" #include "code\modules\ai\ai_holder_targeting_vr.dm"
#include "code\modules\ai\interfaces.dm" #include "code\modules\ai\interfaces.dm"
#include "code\modules\ai\say_list.dm" #include "code\modules\ai\say_list.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
=======
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
>>>>>>> 21d0112... ice cream 2: electric boogaloo (#7319):polaris.dme
#include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm.dm"
#include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\alarm_handler.dm"
#include "code\modules\alarm\atmosphere_alarm.dm" #include "code\modules\alarm\atmosphere_alarm.dm"