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

Suit collars

Browse Source 
Adds a collar overlay above the helmet layer if the suit has one
Suit needs an identically named sprite in icons/mob/collar.dmi
Suit also needs 'collar = 1' set in utility.dm

Trenchcoats are go!

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
This commit is contained in:
Loganbacca
2014-02-01 19:03:39 -05:00
committed by ZomgPonies
parent 1d725c056b
commit 695726b36f
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/update_icons.dm
+28 -8
View File
@@ -113,14 +113,15 @@ Please contact me on #coderbus IRC. ~Carn x
#define HAIR_LAYER 14 //TODO: make part of head layer?
#define FACEMASK_LAYER 15
#define HEAD_LAYER 16
#define HANDCUFF_LAYER 17
#define LEGCUFF_LAYER 18
#define L_HAND_LAYER 19
#define R_HAND_LAYER 20
#define TAIL_LAYER 21 //bs12 specific. this hack is probably gonna come back to haunt me
#define TARGETED_LAYER 22 //BS12: Layer for the target overlay from weapon targeting system
#define FIRE_LAYER 23 //If you're on fire
#define TOTAL_LAYERS 23
#define COLLAR_LAYER 17
#define HANDCUFF_LAYER 18
#define LEGCUFF_LAYER 19
#define L_HAND_LAYER 20
#define R_HAND_LAYER 21
#define TAIL_LAYER 22 //bs12 specific. this hack is probably gonna come back to haunt me
#define TARGETED_LAYER 23 //BS12: Layer for the target overlay from weapon targeting system
#define FIRE_LAYER 24 //If you're on fire
#define TOTAL_LAYERS 24
//////////////////////////////////
/mob/living/carbon/human
@@ -725,6 +726,8 @@ proc/get_damage_icon_part(damage_state, body_part)
update_tail_showing(0)
update_collar(0)
if(update_icons) update_icons()
/mob/living/carbon/human/update_inv_pockets(var/update_icons=1)
@@ -847,6 +850,22 @@ proc/get_damage_icon_part(damage_state, body_part)
if(update_icons)
update_icons()
//Adds a collar overlay above the helmet layer if the suit has one
// Suit needs an identically named sprite in icons/mob/collar.dmi
// Suit also needs 'collar = 1' set
/mob/living/carbon/human/proc/update_collar(var/update_icons=1)
if(wear_suit)
if(wear_suit:collar) //hackish - but checks before getting to this point anyway
overlays_standing[COLLAR_LAYER] = image("icon" = 'icons/mob/collar.dmi', "icon_state" = "[wear_suit.icon_state]")
else
overlays_standing[COLLAR_LAYER] = null
else
overlays_standing[COLLAR_LAYER] = null
if(update_icons) update_icons()
// Used mostly for creating head items
/mob/living/carbon/human/proc/generate_head_icon()
//gender no longer matters for the mouth, although there should probably be seperate base head icons.
@@ -899,6 +918,7 @@ proc/get_damage_icon_part(damage_state, body_part)
#undef BACK_LAYER
#undef HAIR_LAYER
#undef HEAD_LAYER
#undef COLLAR_LAYER
#undef HANDCUFF_LAYER
#undef LEGCUFF_LAYER
#undef L_HAND_LAYER