cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

The damage zone selector bit should properly highlight the groin when you have it targeted.

Browse Source 
Apparently the cat ears gimmick item were supposed to match the hair color of the owner. So they do now. Included some commented-out code for when the sprites for the pink ear bits get located so they can be overlayed over the recolored icons as intended.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1351 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3
2011-04-03 01:26:54 +00:00
parent 8d544eddb7
commit 79ecd42fce
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/gimmick.dm
+15
View File
@@ -9,6 +9,21 @@
desc = "Meow?"
icon_state = "kitty"
flags = FPRINT | TABLEPASS | HEADSPACE
var/icon/mob
var/icon/mob2
update_icon(var/mob/living/carbon/human/user)
if(!istype(user)) return
mob = new/icon("icon" = 'head.dmi', "icon_state" = "kitty")
mob2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2")
mob.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
mob2.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
// var/icon/earbit = new/icon("icon" = 'head.dmi', "icon_state" = "kitty")
// var/icon/earbit2 = new/icon("icon" = 'head.dmi', "icon_state" = "kitty2")
// mob.Blend(earbit, ICON_OVERLAY)
// mob2.Blend(earbit2, ICON_OVERLAY)
// Once you've dug up the sprites, update the first two lines then uncomment them. --NEO
/obj/item/clothing/under/blackskirt
name = "Black skirt"
code/modules/mob/living/carbon/human/human.dm
+4 -5
View File
@@ -827,6 +827,8 @@
return
src.u_equip(W)
src.head = W
if(istype(W,/obj/item/clothing/head/kitty))
W.update_icon(src)
W.equipped(src, text)
if("ears")
if (src.ears)
@@ -1253,6 +1255,8 @@
if (src.head)
var/t1 = src.head.icon_state
var/icon/head_icon = icon('head.dmi', text("[][]", t1, (!( src.lying ) ? null : "2")))
if(istype(src.head,/obj/item/clothing/head/kitty))
head_icon = (( src.lying ) ? src.head:mob2 : src.head:mob)
src.overlays += image("icon" = head_icon, "layer" = MOB_LAYER)
if (src.head.blood_DNA)
var/icon/stain_icon = icon('blood.dmi', "helmetblood[!src.lying ? "" : "2"]")
@@ -1347,11 +1351,6 @@
shielded = 2
break
for (var/obj/item/clothing/suit/space/space_ninja/S in src)
if (S.active)
shielded = 2
break
if (shielded == 2)
src.invisibility = 2
else