cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-14220

Browse Source
This commit is contained in:
Razgriz
2023-01-21 22:24:10 -07:00
committed by GitHub
parent 418643dce3 a6a1af4299
commit 9197e1b95d
475 changed files with 172406 additions and 165035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+9 -1
View File
@@ -126,6 +126,14 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/halo
display_name = "halo (colorable)"
path = /obj/item/clothing/head/halo
/datum/gear/head/halo/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/cap/mbill
display_name = "cap, major bill's"
path = /obj/item/clothing/head/soft/mbill
@@ -436,4 +444,4 @@
/datum/gear/head/wheat
display_name = "straw hat"
path = /obj/item/clothing/head/wheat
path = /obj/item/clothing/head/wheat
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+1
View File
@@ -137,6 +137,7 @@ Talon winter coat
path = /obj/item/clothing/suit/storage/hooded/hoodie
/datum/gear/suit/hoodie_vr/New()
..()
var/list/hoodies = list()
for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie))
var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style