cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict resolution.

Browse Source
This commit is contained in:
KasparoVy
2016-08-18 03:28:03 -04:00
parent d7b7df692a 28bf6c38f3
commit 29a90bff9f
273 changed files with 6630 additions and 45490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences.dm
+8 -5
View File
@@ -23,7 +23,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
// ROLE_GANG = 21,
ROLE_BORER = 21,
ROLE_NINJA = 21,
ROLE_MUTINEER = 21,
ROLE_ABDUCTOR = 30,
)
@@ -1986,12 +1985,16 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
character.age = age
character.b_type = b_type
character.r_eyes = r_eyes
character.g_eyes = g_eyes
character.b_eyes = b_eyes
character.change_eye_color(r_eyes, g_eyes, b_eyes)
//Head-specific
var/obj/item/organ/external/head/H = character.get_organ("head")
var/obj/item/organ/internal/eyes/eyes_organ = character.get_int_organ(/obj/item/organ/internal/eyes)
eyes_organ.eye_colour[1] = r_eyes
eyes_organ.eye_colour[2] = g_eyes
eyes_organ.eye_colour[3] = b_eyes
H.r_hair = r_hair
H.g_hair = g_hair
H.b_hair = b_hair
@@ -2159,4 +2162,4 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
popup.open(0)
/datum/preferences/proc/close_load_dialog(mob/user)
user << browse(null, "window=saves")
user << browse(null, "window=saves")