From 7ef11b40bf3abbc2b463ae6cdd1b364b16cbe72a Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Mon, 5 Jul 2021 16:20:05 +0000 Subject: [PATCH 1/2] Fixes #10904 --- .../mob/new_player/sprite_accessories.dm | 6 +- .../mob/new_player/sprite_accessories_vr.dm | 81 +++++++++++++++++++ 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 1e7184f965..f25be0bec6 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1819,6 +1819,7 @@ shaved //Teshari things /datum/sprite_accessory/hair/teshari name = "Teshari Default" + icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "teshari_default" species_allowed = list(SPECIES_TESHARI) @@ -1855,8 +1856,8 @@ shaved icon_state = "teshari_mohawk" /datum/sprite_accessory/hair/teshari/pointy - name = "Teshari Pointy" - icon_state = "teshari_pointy" + name = "Teshari Pointy" + icon_state = "teshari_pointy" /datum/sprite_accessory/hair/teshari/upright name = "Teshari Upright" @@ -1875,7 +1876,6 @@ shaved icon_state = "teshari_mushroom" //Tesh things ported from Ark Station - /datum/sprite_accessory/hair/teshari/twies name = "Teshari Twies" icon_state = "teshari_twies" diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index db4b1dabae..3c525a8cad 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -243,6 +243,7 @@ icon_state = "hair_fingerwave" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) +<<<<<<< HEAD //Teshari things /datum/sprite_accessory/hair/teshari icon_add = 'icons/mob/human_face_vr_add.dmi' @@ -301,6 +302,86 @@ /datum/sprite_accessory/hair/teshari_fluffymohawk icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' +||||||| parent of a9601ad0c8... Merge pull request #10905 from VOREStation/Fixes/10904 +//Teshari things +/datum/sprite_accessory/hair/teshari + name = "Teshari Default" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_altdefault + name = "Teshari Default (Alt)" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_tight + name = "Teshari Tight" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_excited + name = "Teshari Excited" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_spike + name = "Teshari Spike" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_long + name = "Teshari Long" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_burst + name = "Teshari Burst" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_shortburst + name = "Teshari Shortburst" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_mohawk + name = "Teshari Mohawk" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_pointy + name = "Teshari Pointy" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_upright + name = "Teshari Upright" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_mane + name = "Teshari Mane" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_droopy + name = "Teshari Droopy" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_mushroom + name = "Teshari Mushroom" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_twies + name = "Teshari Twies" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_backstrafe + name = "Teshari Backstrafe" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_longway + name = "Teshari Longway" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_tree + name = "Teshari Tree" + icon_add = 'icons/mob/human_face_vr_add.dmi' + +/datum/sprite_accessory/hair/teshari_fluffymohawk + name = "Teshari Fluffy Mohawk" + icon = 'icons/mob/human_face_vr.dmi' + icon_add = 'icons/mob/human_face_vr_add.dmi' +======= +>>>>>>> a9601ad0c8... Merge pull request #10905 from VOREStation/Fixes/10904 //Skrell 'hairstyles' - these were requested for a chimera and screw it, if one wants to eat seafood, go nuts /datum/sprite_accessory/hair/skr_tentacle_veryshort From 5280baea219c0f9cde5c95e3af707af8ed749554 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Mon, 5 Jul 2021 16:03:02 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- .../mob/new_player/sprite_accessories_vr.dm | 139 ------------------ 1 file changed, 139 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 3c525a8cad..0c8c108c82 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -243,145 +243,6 @@ icon_state = "hair_fingerwave" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) -<<<<<<< HEAD -//Teshari things -/datum/sprite_accessory/hair/teshari - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_altdefault - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_tight - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_excited - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_spike - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_long - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_burst - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_shortburst - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_mohawk - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_pointy - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_upright - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_mane - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_droopy - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_mushroom - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_twies - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_backstrafe - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_longway - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_tree - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_fluffymohawk - icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' -||||||| parent of a9601ad0c8... Merge pull request #10905 from VOREStation/Fixes/10904 -//Teshari things -/datum/sprite_accessory/hair/teshari - name = "Teshari Default" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_altdefault - name = "Teshari Default (Alt)" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_tight - name = "Teshari Tight" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_excited - name = "Teshari Excited" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_spike - name = "Teshari Spike" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_long - name = "Teshari Long" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_burst - name = "Teshari Burst" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_shortburst - name = "Teshari Shortburst" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_mohawk - name = "Teshari Mohawk" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_pointy - name = "Teshari Pointy" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_upright - name = "Teshari Upright" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_mane - name = "Teshari Mane" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_droopy - name = "Teshari Droopy" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_mushroom - name = "Teshari Mushroom" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_twies - name = "Teshari Twies" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_backstrafe - name = "Teshari Backstrafe" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_longway - name = "Teshari Longway" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_tree - name = "Teshari Tree" - icon_add = 'icons/mob/human_face_vr_add.dmi' - -/datum/sprite_accessory/hair/teshari_fluffymohawk - name = "Teshari Fluffy Mohawk" - icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' -======= ->>>>>>> a9601ad0c8... Merge pull request #10905 from VOREStation/Fixes/10904 //Skrell 'hairstyles' - these were requested for a chimera and screw it, if one wants to eat seafood, go nuts /datum/sprite_accessory/hair/skr_tentacle_veryshort