forked from discordia-space/CEV-Eris
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Optimizing and some recast of loadout (discordia-space#3701)
* .Gitignore Update * Loadout update
- Loading branch information
1 parent
cd122ca
commit 39a6186
Showing
11 changed files
with
206 additions
and
263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,20 @@ | ||
| #ignore misc BYOND files | ||
| Thumbs.db | ||
| *.sav | ||
| *.log | ||
| *.int | ||
| *.rsc | ||
| *.dmb | ||
| *.lk | ||
| *.backup | ||
| *.before | ||
| tools/ | ||
| data/ | ||
| cfg/ | ||
| tmp/ | ||
| build_log.txt | ||
| .vscode | ||
| __pycache__ | ||
|
|
||
| #vscode | ||
| .vscode | ||
| .history |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
|
|
||
| /datum/gear/clothing/ | ||
| sort_category = "Clothing Pieces" | ||
| category = /datum/gear/clothing/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 30 additions & 41 deletions
71
code/modules/client/preference_setup/loadout/lists/gloves.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,44 @@ | ||
| // Gloves | ||
| /datum/gear/gloves | ||
| display_name = "gloves, black" | ||
| path = /obj/item/clothing/gloves/thick | ||
| cost = 2 | ||
| /datum/gear/gloves/ | ||
| slot = slot_gloves | ||
| sort_category = "Gloves and Handwear" | ||
| category = /datum/gear/gloves/ | ||
|
|
||
| /datum/gear/gloves/blue | ||
| display_name = "gloves, blue" | ||
| path = /obj/item/clothing/gloves/color/blue | ||
|
|
||
| /datum/gear/gloves/yellow | ||
| display_name = "gloves, yellow" | ||
| path = /obj/item/clothing/gloves/color/yellow | ||
|
|
||
| /datum/gear/gloves/brown | ||
| display_name = "gloves, brown" | ||
| path = /obj/item/clothing/gloves/color/brown | ||
|
|
||
| /datum/gear/gloves/light_brown | ||
| display_name = "gloves, light-brown" | ||
| path = /obj/item/clothing/gloves/color/light_brown | ||
|
|
||
| /datum/gear/gloves/green | ||
| display_name = "gloves, green" | ||
| path = /obj/item/clothing/gloves/color/green | ||
|
|
||
| /datum/gear/gloves/grey | ||
| display_name = "gloves, grey" | ||
| path = /obj/item/clothing/gloves/color/grey | ||
| /datum/gear/gloves/work | ||
| display_name = "gloves, work" | ||
| path = /obj/item/clothing/gloves/thick | ||
| cost = 3 | ||
|
|
||
| /datum/gear/gloves/latex | ||
| display_name = "gloves, latex" | ||
| path = /obj/item/clothing/gloves/latex | ||
|
|
||
| /datum/gear/gloves/orange | ||
| display_name = "gloves, orange" | ||
| path = /obj/item/clothing/gloves/color/orange | ||
|
|
||
| /datum/gear/gloves/purple | ||
| display_name = "gloves, purple" | ||
| path = /obj/item/clothing/gloves/color/purple | ||
|
|
||
| /datum/gear/gloves/rainbow | ||
| display_name = "gloves, rainbow" | ||
| path = /obj/item/clothing/gloves/color/rainbow | ||
| cost = 2 | ||
|
|
||
| /datum/gear/gloves/colored | ||
| display_name = "gloves, colored" | ||
| flags = GEAR_HAS_COLOR_SELECTION | ||
| path = /obj/item/clothing/gloves/color | ||
|
|
||
| /datum/gear/gloves/red | ||
| display_name = "gloves, red" | ||
| path = /obj/item/clothing/gloves/color/red | ||
| /datum/gear/gloves/color_presets | ||
| display_name = "gloves, color presets" | ||
| path = /obj/item/clothing/gloves/color/blue | ||
|
|
||
| /datum/gear/gloves/white | ||
| display_name = "gloves, white" | ||
| path = /obj/item/clothing/gloves/color/white | ||
| /datum/gear/gloves/color_presets/New() | ||
| ..() | ||
| var/gloves = list( | ||
| "Blue" = /obj/item/clothing/gloves/color/blue, | ||
| "Yellow" = /obj/item/clothing/gloves/color/yellow, | ||
| "White" = /obj/item/clothing/gloves/color/white, | ||
| "Red" = /obj/item/clothing/gloves/color/red, | ||
| "Purple" = /obj/item/clothing/gloves/color/purple, | ||
| "Orange" = /obj/item/clothing/gloves/color/orange, | ||
| "Grey" = /obj/item/clothing/gloves/color/grey, | ||
| "Green" = /obj/item/clothing/gloves/color/green, | ||
| "Light-Brown" = /obj/item/clothing/gloves/color/light_brown, | ||
| "Brown" = /obj/item/clothing/gloves/color/brown | ||
| ) | ||
| gear_tweaks += new /datum/gear_tweak/path(gloves) |
Oops, something went wrong.