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

Merge master into loadout-crystals

Browse Source
This commit is contained in:
TheGreatKitsune
2023-04-01 08:56:27 -05:00
parent f999bf66be 7a7233a702
commit 99d9295bc3
574 changed files with 165186 additions and 5283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+6 -6
View File
@@ -169,13 +169,13 @@
display_name = "cowboy boots, snake skin"
path = /obj/item/clothing/shoes/boots/cowboy/snakeskin
/datum/gear/shoes/cowboy/lizard
display_name = "cowboy boots, lizard skin"
path = /obj/item/clothing/shoes/boots/cowboy/lizard
/datum/gear/shoes/cowboy/green
display_name = "cowboy boots, green"
path = /obj/item/clothing/shoes/boots/cowboy/green
/datum/gear/shoes/cowboy/lizard/masterwork
display_name = "cowboy boots, lizard skin (masterwork)"
path = /obj/item/clothing/shoes/boots/cowboy/lizard/masterwork
/datum/gear/shoes/cowboy/blue
display_name = "cowboy boots, blue"
path = /obj/item/clothing/shoes/boots/cowboy/blue
/datum/gear/shoes/jungle
display_name = "jungle boots"
code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
+14 -1
View File
@@ -35,4 +35,17 @@
/datum/gear/shoes/flats/alt
display_name = "flats, alt"
path = /obj/item/clothing/shoes/flats/white/color/alt
path = /obj/item/clothing/shoes/flats/white/color/alt
//CHOMP ADDITION, trying to make a no shoes shoe option
/datum/gear/shoes/none
display_name = "Adjust - No Shoes"
path = /obj/item/clothing/shoes/none
cost = 0
/obj/item/clothing/shoes/none
name = "No Shoes"
desc = "shoeless?"
icon_state = ""
/obj/item/clothing/shoes/none/New()
qdel(src)
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+19
View File
@@ -299,6 +299,25 @@ Talon winter coat
)
gear_tweaks += new/datum/gear_tweak/path(shrouds)
/datum/gear/suit/roles/cropjackets
display_name = "crop jacket selection"
path = /obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket
/datum/gear/suit/roles/cropjackets/New()
..()
var/list/shrouds = list(
"white crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket,
"blue crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/blue,
"red crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/red,
"green crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/green,
"purple crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/purple,
"orange crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/orange,
"charcoal crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/charcoal,
"faded reflec crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/marine,
"drab crop jacket"=/obj/item/clothing/accessory/poncho/roles/cloak/crop_jacket/drab
)
gear_tweaks += new/datum/gear_tweak/path(shrouds)
//Actually colorable hoodies
/datum/gear/suit/roles/choodies
display_name = "hoodie selection, colorable"