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

Merge branch 'master' into upstream-merge-13710

Browse Source
This commit is contained in:
Nadyr
2022-09-10 22:11:06 -04:00
committed by GitHub
parent 61ddc608f1 04b97a536f
commit 684c4467fd
86 changed files with 6246 additions and 5838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
View File

@@ -49,6 +49,14 @@
display_name = "pink tiger pelt"
path = /obj/item/clothing/head/pelt/tigerpeltpink
/datum/gear/head/magic_hat
display_name = "wizard hat, colorable"
path = /obj/item/clothing/head/wizard/fake/realistic/colorable
/datum/gear/head/magic_hat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/*
Talon hats
*/

7
code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
View File

@@ -94,10 +94,8 @@
/datum/gear/suit/taur/white_dress
display_name = "white wedding dress (Wolf/Horse-taur)"
path = /obj/item/clothing/suit/taur_dress/white
path = /obj/item/clothing/suit/taur/dress
sort_category = "Xenowear"
<<<<<<< HEAD
=======
/datum/gear/suit/taur/colorable_skirt
display_name = "colorable skirt (Wolf/Horse-taur)"
@@ -106,5 +104,4 @@
/datum/gear/suit/taur/colorable_skirt/New()
..()
gear_tweaks += gear_tweak_free_color_choice
>>>>>>> 15b60b17e2... Merge pull request #13710 from Novacat/nova-basicfixes
gear_tweaks += gear_tweak_free_color_choice