From b07c6d9680089506ab05242ddb92558a33c75025 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 26 Feb 2021 10:19:19 -0500 Subject: [PATCH 1/2] Merge pull request #9801 from VOREStation/upstream-merge-7924 [MIRROR] Adds some tacticooler undershirts --- code/datums/underwear/undershirts.dm | 12 +++++++++++- icons/mob/human.dmi | Bin 46685 -> 48294 bytes 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/datums/underwear/undershirts.dm b/code/datums/underwear/undershirts.dm index 7da82fa580..6b2cc3d10f 100644 --- a/code/datums/underwear/undershirts.dm +++ b/code/datums/underwear/undershirts.dm @@ -186,4 +186,14 @@ /datum/category_item/underwear/undershirt/pinkblack_tshirt name = "Pink and Black T-Shirt" - icon_state = "pinkblack_tshirt" \ No newline at end of file + icon_state = "pinkblack_tshirt" + +/datum/category_item/underwear/undershirt/turtle + name = "Turtleneck" + icon_state = "turtleneck" + has_color = TRUE + +/datum/category_item/underwear/undershirt/sleevelessturtle + name = "Turtleneck, Sleeveless" + icon_state = "sleevelessturtle" + has_color = TRUE \ No newline at end of file diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 62f8883880252caec00bc472634ea89983965bba..c7b0cc26b6c0a0e9b5f8b47c028ab944eff00235 100644 GIT binary patch delta 6150 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 delta 4528 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 AUjP6A