cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2419 from CHOMPStationBot/upstream-merge-10905

Browse Source 
[MIRROR] Fixes #10904
This commit is contained in:
Nadyr
2021-07-05 16:19:36 -04:00
committed by GitHub
parent 78698322b8 221dffa8b9
commit b40f14fc6b
2 changed files with 3 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -1819,6 +1819,7 @@ shaved
//Teshari things //Teshari things
/datum/sprite_accessory/hair/teshari /datum/sprite_accessory/hair/teshari
name = "Teshari Default" name = "Teshari Default"
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "teshari_default" icon_state = "teshari_default"
species_allowed = list(SPECIES_TESHARI) species_allowed = list(SPECIES_TESHARI)
@@ -1855,8 +1856,8 @@ shaved
icon_state = "teshari_mohawk" icon_state = "teshari_mohawk"
/datum/sprite_accessory/hair/teshari/pointy /datum/sprite_accessory/hair/teshari/pointy
name = "Teshari Pointy" name = "Teshari Pointy"
icon_state = "teshari_pointy" icon_state = "teshari_pointy"
/datum/sprite_accessory/hair/teshari/upright /datum/sprite_accessory/hair/teshari/upright
name = "Teshari Upright" name = "Teshari Upright"
@@ -1875,7 +1876,6 @@ shaved
icon_state = "teshari_mushroom" icon_state = "teshari_mushroom"
//Tesh things ported from Ark Station //Tesh things ported from Ark Station
/datum/sprite_accessory/hair/teshari/twies /datum/sprite_accessory/hair/teshari/twies
name = "Teshari Twies" name = "Teshari Twies"
icon_state = "teshari_twies" icon_state = "teshari_twies"

77
code/modules/mob/new_player/sprite_accessories_vr.dm
View File

@@ -243,83 +243,6 @@
icon_state = "hair_fingerwave" icon_state = "hair_fingerwave"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
//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'
//Skrell 'hairstyles' - these were requested for a chimera and screw it, if one wants to eat seafood, go nuts //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 /datum/sprite_accessory/hair/skr_tentacle_veryshort