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

Merge pull request #5758 from CHOMPStation2/upstream-merge-14505

Browse Source 
[MIRROR] Even more sprites including decent hoodies
This commit is contained in:
Razgriz
2023-02-20 16:32:45 -07:00
committed by GitHub
parent ab2fde09be f32ba89785
commit c0d2768edb
28 changed files with 460 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,22 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/halo/alt
display_name = "halo, alt"
path = /obj/item/clothing/head/halo/alt
/datum/gear/head/buckethat
display_name = "hat, bucket"
path = /obj/item/clothing/head/buckethat
/datum/gear/head/buckethat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/nonla
display_name = "hat, non la"
path = /obj/item/clothing/head/nonla
/*
Talon hats
*/

9
code/modules/client/preference_setup/loadout/loadout_mask.dm
View File

@@ -74,4 +74,11 @@
for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
var/obj/item/clothing/accessory/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
/datum/gear/mask/lace
display_name = "lace veil"
path = /obj/item/clothing/mask/lacemask
/datum/gear/mask/lace/New()
gear_tweaks += gear_tweak_free_color_choice

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

@@ -30,5 +30,9 @@
path = /obj/item/clothing/shoes/boots/singer/yellow
/datum/gear/shoes/antediluvian
display_name = "antediluvian legwraps"
path = /obj/item/clothing/shoes/antediluvian
display_name = "legwraps, antediluvian"
path = /obj/item/clothing/shoes/antediluvian
/datum/gear/shoes/flats/alt
display_name = "flats, alt"
path = /obj/item/clothing/shoes/flats/white/color/alt

89
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -225,4 +225,91 @@ Talon winter coat
"blue mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop,
"gold mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap
)
gear_tweaks += new/datum/gear_tweak/path(mantles)
gear_tweaks += new/datum/gear_tweak/path(mantles)
//Boat cloaks
/datum/gear/suit/roles/boatcloak
display_name = "boat cloak, colorable"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat
/datum/gear/suit/roles/boatcloak/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/roles/capboatcloak
display_name = "boat cloak, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap
allowed_roles = list("Site Manager")
/datum/gear/suit/roles/hopboatcloak
display_name = "boat cloak, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop
allowed_roles = list("Head of Personnel")
/datum/gear/suit/roles/boatcloaks
display_name = "boat cloak selection"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/security
/datum/gear/suit/roles/boatcloaks/New()
..()
var/list/boatcloaks = list(
"security boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/security,
"engineering boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering,
"atmospherics boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos,
"medical boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical,
"service boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/service,
"cargo boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo,
"mining boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining,
"research boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/science
)
gear_tweaks += new/datum/gear_tweak/path(boatcloaks)
//Shrouds
/datum/gear/suit/roles/shroud
display_name = "shroud, colorable"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud
/datum/gear/suit/roles/shroud/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/roles/capshroud
display_name = "shroud, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap
allowed_roles = list("Site Manager")
/datum/gear/suit/roles/hopshroud
display_name = "shroud, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop
allowed_roles = list("Head of Personnel")
/datum/gear/suit/roles/shrouds
display_name = "shroud selection"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/security
/datum/gear/suit/roles/shrouds/New()
..()
var/list/shrouds = list(
"security shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security,
"engineering shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering,
"atmospherics shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos,
"medical shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical,
"service shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service,
"cargo shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo,
"mining shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining,
"research shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science
)
gear_tweaks += new/datum/gear_tweak/path(shrouds)
//Actually colorable hoodies
/datum/gear/suit/roles/choodies
display_name = "hoodie selection, colorable"
path = /obj/item/clothing/suit/storage/hooded/toggle/colorable
/datum/gear/suit/roles/choodies/New()
..()
var/list/choodies = list(
"normal hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable,
"sleeveless hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless,
"cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += new/datum/gear_tweak/path(choodies)

25
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -346,4 +346,27 @@ Talon jumpsuit
/datum/gear/uniform/antediluvianalt
display_name = "corset, antediluvian alt"
path = /obj/item/clothing/under/dress/antediluvian/sheerless
path = /obj/item/clothing/under/dress/antediluvian/sheerless
//Colorable skirts
/datum/gear/uniform/coloredskirts
display_name = "skirt selection, colorable"
path = /obj/item/clothing/under/skirt/colorable
/datum/gear/uniform/coloredskirts/New()
..()
var/list/skirts = list(
"casual skirt"=/obj/item/clothing/under/skirt/colorable,
"puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy,
"skater skirt"=/obj/item/clothing/under/skirt/colorable/skater,
"pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated,
"pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil,
"plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid,
"tube skirt"=/obj/item/clothing/under/skirt/colorable/tube,
"long skirt"=/obj/item/clothing/under/skirt/colorable/long,
"high skirt"=/obj/item/clothing/under/skirt/colorable/high,
"swept skirt"=/obj/item/clothing/under/skirt/colorable/swept,
"jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper,
"jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress
)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)