mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 01:53:35 +01:00
The damage zone selector bit should properly highlight the groin when you have it targeted.
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user