shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

heterochromia

Browse Source
This commit is contained in:
Timothy Teakettle
2020-08-28 18:30:28 +01:00
parent 9799efcef2
commit 1d943a34ef
19 changed files with 209 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/implants/implant_hijack.dm
+10 -5
View File
@@ -7,7 +7,8 @@
activated = 1
var/toggled = FALSE
icon_state = "hijack"
var/eye_color
var/left_eye_color
var/right_eye_color
var/stealthmode = FALSE
var/stealthcooldown = 0
var/hijacking = FALSE
@@ -25,8 +26,10 @@
return
var/on = toggled && !stealthmode
var/mob/living/carbon/human/H = imp_in
H.eye_color = on ? "ff0" : eye_color
H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
H.left_eye_color = on ? "ff0" : left_eye_color
H.right_eye_color = on ? "ff0" : right_eye_color
H.dna.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK)
H.dna.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK)
H.update_body()
/obj/item/implant/hijack/implant(mob/living/target, mob/user, silent = FALSE)
@@ -34,7 +37,8 @@
ADD_TRAIT(target, TRAIT_HIJACKER, "implant")
if (ishuman(target))
var/mob/living/carbon/human/H = target
eye_color = H.eye_color
left_eye_color = H.left_eye_color
right_eye_color = H.right_eye_color
return TRUE
/obj/item/implant/hijack/removed(mob/living/source, silent = FALSE, special = 0)
@@ -49,7 +53,8 @@
apc.update_icon()
if (ishuman(source))
var/mob/living/carbon/human/H = source
H.eye_color = eye_color
H.left_eye_color = left_eye_color
H.right_eye_color = left_eye_color
return TRUE
/obj/item/implant/hijack/proc/InterceptClickOn(mob/living/user,params,atom/object)
code/game/objects/structures/mirror.dm
+26 -11
View File
@@ -229,17 +229,32 @@
H.update_hair()
if(BODY_ZONE_PRECISE_EYES)
var/new_eye_color = input(H, "Choose your eye color", "Eye Color","#"+H.eye_color) as color|null
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
if(new_eye_color)
var/n_color = sanitize_hexcolor(new_eye_color)
var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
if(eyes)
eyes.eye_color = n_color
H.eye_color = n_color
H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
H.dna.species.handle_body()
var/eye_type = input(H, "Choose the eye you want to color", "Eye Color") as null|anything in list("Both Eyes", "Left Eye", "Right Eye")
if(eye_type)
var/input_color = H.left_eye_color
if(eye_type == "Right Eye")
input_color = H.right_eye_color
var/new_eye_color = input(H, "Choose your eye color", "Eye Color","#"+input_color) as color|null
if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
if(new_eye_color)
var/n_color = sanitize_hexcolor(new_eye_color)
var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
var/left_color = n_color
var/right_color = n_color
if(eye_type == "Left Eye")
right_color = H.right_eye_color
else
if(eye_type == "Right Eye")
left_color = H.left_eye_color
if(eyes)
eyes.left_eye_color = left_color
eyes.right_eye_color = right_color
H.left_eye_color = left_color
H.right_eye_color = right_color
H.dna.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK)
H.dna.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK)
H.dna.species.handle_body()
if(choice)
curse(user)