Human leather color now depends on the color of their species' skin color (#30965)

* Human leather color now depends on the color of their species' skin color

* derp

* grey flesh color
This commit is contained in:
DeityLink
2021-10-04 15:21:14 +02:00
committed by GitHub
parent efd2d52de7
commit 52aa104581
4 changed files with 20 additions and 5 deletions

View File

@@ -148,10 +148,6 @@
result = /obj/item/stack/sheet/animalhide/human
amount = 3
/datum/butchering_product/skin/gondola
result = /obj/item/stack/sheet/animalhide/gondola
amount = 2
/datum/butchering_product/skin/human/spawn_result(location, mob/parent)
if(!amount)
return
@@ -159,7 +155,7 @@
if(ishuman(parent))
var/mob/living/carbon/human/H = parent
var/obj/item/stack/sheet/animalhide/A = new result(location)
var/obj/item/stack/sheet/animalhide/human/A = new result(location)
if(!isjusthuman(H) && H.species) //Grey skin, unathi skin, etc.
A.name = H.species.name ? "[lowertext(H.species.name)] skin" : A.name
@@ -169,6 +165,14 @@
A.name = "[lowertext(H.mind.assigned_role)] skin"
A.source_string = lowertext(H.mind.assigned_role)
if (H.species)
A.skin_color = H.species.flesh_color
A.color = A.skin_color
/datum/butchering_product/skin/gondola
result = /obj/item/stack/sheet/animalhide/gondola
amount = 2
/datum/butchering_product/skin/deer
result = /obj/item/stack/sheet/animalhide/deer
amount = 3

View File

@@ -17,6 +17,16 @@
icon_state = "sheet-human"
source_string = "human"
origin_tech = ""
var/skin_color = DEFAULT_FLESH
/obj/item/stack/sheet/animalhide/human/New()
..()
color = skin_color
/obj/item/stack/sheet/animalhide/human/copy_evidences(var/obj/item/stack/sheet/animalhide/human/from)
..()
skin_color = from.skin_color
color = skin_color
/obj/item/stack/sheet/animalhide/corgi
name = "corgi hide"

View File

@@ -603,6 +603,7 @@ var/global/list/whitelisted_species = list("Human")
max_hurt_damage = 3 // From 5 (for humans)
tacklePower = 25
flesh_color = "#B5B5B5"
max_skin_tone = 4
primitive = /mob/living/carbon/monkey/grey

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB