Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons #31642

Militaires · 2017-10-12T22:00:16Z

this means you can offset every individual shoe, hat, ID, uniform and whatever.

This reverts commit 5937654.

…offsets

…list, adds support for all other drawn human icons

Jordie0608 · 2017-10-12T22:02:54Z

code/modules/mob/living/carbon/human/species.dm

+				if("face" in H.dna.species.offset_features)
+					var/list/offset_list = H.dna.species.offset_features["face"]
+					hair_overlay.pixel_x += offset_list[1]
+					hair_overlay.pixel_y += offset_list[2]


No need for another list in any of these, just do
hair_overlay.pixel_y += H.dna.species.offset_features["face"][2]

Iamgoofball · 2017-10-12T22:11:27Z

👍 will help with dwarves

AnturK · 2017-10-13T13:06:17Z

code/modules/mob/living/carbon/human/species.dm

@@ -18,8 +18,7 @@

 	var/sexes = 1		// whether or not the race has sexual characteristics. at the moment this is only 0 for skeletons and shadows

-	var/face_y_offset = 0
-	var/hair_y_offset = 0
+	var/offset_features = list("uniform" = list(0,0), "id" = list(0,0), "gloves" = list(0,0), "glasses" = list(0,0), "ears" = list(0,0), "shoes" = list(0,0), "s_store" = list(0,0), "mask" = list(0,0), "head" = list(0,0),"face" = list(0,0), "belt" = list(0,0), "back" = list(0,0), "suit" = list(0,0), "neck" = list(0,0))


Don't use magic strings.

does that mean i should add it to the species on init or what

AnturK · 2017-10-13T13:06:49Z

code/modules/mob/living/carbon/update_icons.dm

@@ -125,6 +125,13 @@
 	if(wear_mask)
 		if(!(head && (head.flags_inv & HIDEMASK)))
 			overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(state = wear_mask.icon_state, default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/mask.dmi')
+			if(ishuman(src))


No. If it's human functionality you do it on human level.

sure thing boss

ninjanomnom · 2017-10-14T01:40:34Z

code/modules/mob/living/carbon/human/species.dm

+#define OFFSET_BELT "belt"
+#define OFFSET_BACK "back"
+#define OFFSET_SUIT "suit"
+#define OFFSET_NECK "neck"


These need to be under the __DEFINES directory

if they're only used in this file he can leave them here and then #undef them at the end of the file

They're not only used here, they're also used in update_icons.dm

ninjanomnom · 2017-10-14T01:41:10Z

code/modules/mob/living/carbon/human/species.dm

-				hair_overlay.pixel_y += hair_y_offset
+				if("face" in H.dna.species.offset_features)
+					hair_overlay.pixel_x += H.dna.species.offset_features["face"][1]
+					hair_overlay.pixel_y += H.dna.species.offset_features["face"][2]


Just making the defines isn't enough, you have to actualy use the things.

ninjanomnom · 2017-10-14T01:41:19Z

code/modules/mob/living/carbon/human/species.dm

-			lip_overlay.pixel_y += face_y_offset
+			if("face" in H.dna.species.offset_features)
+				lip_overlay.pixel_x += H.dna.species.offset_features["face"][1]
+				lip_overlay.pixel_y += H.dna.species.offset_features["face"][2]


ninjanomnom · 2017-10-14T01:41:26Z

code/modules/mob/living/carbon/human/species.dm

-			eye_overlay.pixel_y += face_y_offset
+			if("face" in H.dna.species.offset_features)
+				eye_overlay.pixel_x += H.dna.species.offset_features["face"][1]
+				eye_overlay.pixel_y += H.dna.species.offset_features["face"][2]


ninjanomnom · 2017-10-14T01:41:51Z

code/modules/mob/living/carbon/human/update_icons.dm

+
+		if("uniform" in dna.species.offset_features)
+			uniform_overlay.pixel_x += dna.species.offset_features["uniform"][1]
+			uniform_overlay.pixel_y += dna.species.offset_features["uniform"][2]


ninjanomnom · 2017-10-14T01:42:35Z

code/modules/mob/living/carbon/human/update_icons.dm

+		remove_overlay(HEAD_LAYER)
+		if("head" in dna.species.offset_features)
+			head_overlay.pixel_x += dna.species.offset_features["head"][1]
+			head_overlay.pixel_y += dna.species.offset_features["head"][2]


ninjanomnom · 2017-10-14T01:42:41Z

code/modules/mob/living/carbon/human/update_icons.dm

+		var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER]
+		if("belt" in dna.species.offset_features)
+			belt_overlay.pixel_x += dna.species.offset_features["belt"][1]
+			belt_overlay.pixel_y += dna.species.offset_features["belt"][2]


ninjanomnom · 2017-10-14T01:42:45Z

code/modules/mob/living/carbon/human/update_icons.dm

+		var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER]
+		if("suit" in dna.species.offset_features)
+			suit_overlay.pixel_x += dna.species.offset_features["suit"][1]
+			suit_overlay.pixel_y += dna.species.offset_features["suit"][2]


ninjanomnom · 2017-10-14T01:42:50Z

code/modules/mob/living/carbon/human/update_icons.dm

+	remove_overlay(FACEMASK_LAYER)
+	if("mask" in dna.species.offset_features)
+		mask_overlay.pixel_x += dna.species.offset_features["mask"][1]
+		mask_overlay.pixel_y += dna.species.offset_features["mask"][2]


ninjanomnom · 2017-10-14T01:42:54Z

code/modules/mob/living/carbon/human/update_icons.dm

+	remove_overlay(BACK_LAYER)
+	if("back" in dna.species.offset_features)
+		back_overlay.pixel_x += dna.species.offset_features["back"][1]
+		back_overlay.pixel_y += dna.species.offset_features["back"][2]


AnturK · 2017-10-14T15:05:43Z

code/modules/mob/living/carbon/human/update_icons.dm

@@ -124,7 +124,7 @@ There are several things that need to be remembered:
 		else if(U.adjusted == DIGITIGRADE_STYLE)
 			t_color = "[t_color]_l"

-		var/mutable_appearance/uniform_overlay
+		var/mutable_appearance/uniform_overlay = overlays_standing[UNIFORM_LAYER]


You changed the default here so the uniform won't update for species without gender variants.

lzimann · 2017-10-14T17:36:57Z

code/modules/mob/living/carbon/human/species.dm

@@ -18,8 +17,7 @@

 	var/sexes = 1		// whether or not the race has sexual characteristics. at the moment this is only 0 for skeletons and shadows

-	var/face_y_offset = 0
-	var/hair_y_offset = 0
+	var/offset_features = list(OFFSET_UNIFORM = list(0,0), OFFSET_ID = list(0,0), OFFSET_GLOVES = list(0,0), OFFSET_GLASSES = list(0,0), OFFSET_EARS = list(0,0), OFFSET_SHOES = list(0,0), OFFSET_S_STORE = list(0,0), OFFSET_FACEMASK = list(0,0), OFFSET_HEAD = list(0,0), OFFSET_FACE = list(0,0), OFFSET_BELT = list(0,0), OFFSET_BACK = list(0,0), OFFSET_SUIT = list(0,0), OFFSET_NECK = list(0,0))


var/list/offset_features = ...

how embarrassing

AnturK · 2017-10-15T16:01:13Z

code/modules/mob/living/carbon/human/update_icons.dm

@@ -351,8 +399,24 @@ There are several things that need to be remembered:

 /mob/living/carbon/human/update_inv_wear_mask()
 	..()
+	var/mutable_appearance/mask_overlay = overlays_standing[FACEMASK_LAYER]
+	remove_overlay(FACEMASK_LAYER)
+	if(OFFSET_FACEMASK in dna.species.offset_features)


You need to check if overlay actually exists here in and in the one below

…o offsets

… list, adds support for all other standing icons (#31642) * Fixes shambrero penguin's name * Revert "Fixes shambrero penguin's name" This reverts commit 59376543da685167c14eb683342bda2edb8b8eeb. * Refactors species-based offsets, condenses all offsets into a single list, adds support for all other drawn human icons * de commit go SKKKRRAAH * I ZOI EN TAFO * STOP magic * take my twix by force * uniform_overlay = ''' >>> uniform_overlay * var/x >>> var/list/x * if(overlay) sanity checks in place * if(DEFINE) >>>>>>>> if(overlay)

militaires added 4 commits October 12, 2017 18:18

Fixes shambrero penguin's name

5937654

Revert "Fixes shambrero penguin's name"

84cf8bf

This reverts commit 5937654.

Merge branch 'master' of https://github.com/tgstation/tgstation into …

2dd4d81

…offsets

Refactors species-based offsets, condenses all offsets into a single …

ccc5d4d

…list, adds support for all other drawn human icons

tgstation-server added the Refactor Makes the code harder to read label Oct 12, 2017

Jordie0608 suggested changes Oct 12, 2017

View reviewed changes

de commit go SKKKRRAAH

c2f9177

tgstation-server added the Ready for Review label Oct 12, 2017

AnturK requested changes Oct 13, 2017

View reviewed changes

Cyberboss removed the Ready for Review label Oct 13, 2017

militaires added 2 commits October 13, 2017 23:43

I ZOI EN TAFO

37da5c5

STOP magic

a6c4326

tgstation-server added the Ready for Review label Oct 14, 2017

ninjanomnom requested changes Oct 14, 2017

View reviewed changes

take my twix by force

944b5eb

AnturK requested changes Oct 14, 2017

View reviewed changes

uniform_overlay = ''' >>> uniform_overlay

200c720

lzimann reviewed Oct 14, 2017

View reviewed changes

var/x >>> var/list/x

0099f9d

AnturK requested changes Oct 15, 2017

View reviewed changes

militaires added 3 commits October 15, 2017 22:44

if(overlay) sanity checks in place

5309e18

Merge branch 'offsets' of https://github.com/Militaires/tgstation int…

9f40fa7

…o offsets

if(DEFINE) >>>>>>>> if(overlay)

a86763e

AnturK merged commit 068f91e into tgstation:master Oct 15, 2017

ghost mentioned this pull request Oct 15, 2017

[MIRROR] Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons HippieStation/HippieStationdeprecated2020#4066

Merged

CitadelStationBot mentioned this pull request Oct 15, 2017

[MIRROR] Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons Citadel-Station-13/Citadel-Station-13#3417

Merged

FTL13-Bot mentioned this pull request Oct 15, 2017

[MIRROR] Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons FTL13/FTL13#3012

Closed

SamHPurp mentioned this pull request Apr 6, 2018

Ports a few code improvements OracleStation/OracleStation#823

Merged

Deahaka mentioned this pull request Jan 23, 2024

TG species icon offsetting TauCetiStation/TauCetiClassic#12767

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons #31642

Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons #31642

Militaires commented Oct 12, 2017

Jordie0608 Oct 12, 2017

Militaires Oct 12, 2017

Iamgoofball commented Oct 12, 2017

AnturK Oct 13, 2017

Militaires Oct 13, 2017

AnturK Oct 13, 2017

Militaires Oct 13, 2017

ninjanomnom Oct 14, 2017

duncathan Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

ninjanomnom Oct 14, 2017

AnturK Oct 14, 2017

lzimann Oct 14, 2017

Militaires Oct 14, 2017

AnturK Oct 15, 2017

Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons #31642

Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons #31642

Conversation

Militaires commented Oct 12, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Iamgoofball commented Oct 12, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment