forked from Cosmic-Overlord/TerraGov-Marine-Corps
-
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.
Adds capes by saro. (Cosmic-Overlord#353)
* capes1 * regaly highlight * hmm * Update loadout_variants.dm * Update greyscale_configs.dm * Revert "Update greyscale_configs.dm" This reverts commit 5663bde. * hmmmmmm * Update loadout_variants.dm * Update capes_highlight.dmi * should do it * Update loadout_variants.dm * Update loadout_variants.dm * hair flags to facepaint loadout doesn't work yet, i think so * Робит * Update _item_representation.dm * Update loadout_variants.dm * Update _item_representation.dm * palette * hair
- Loading branch information
Showing
24 changed files
with
490 additions
and
32 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
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
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #define CAPE_LONG "cape_long" | ||
| #define CAPE_REGALY "cape_regaly" | ||
| #define CAPE_ONELONG "cape_onelong" | ||
|
|
||
| GLOBAL_LIST_INIT(loadout_variant_keys, list( | ||
| CAPE_KAMA = "kama", | ||
| CAPE_KILT = "kilt", | ||
| CAPE_KILT_ALT = "kilt (alt)", | ||
| CAPE_LONG = "long", | ||
| CAPE_REGALY = "regaly", | ||
| CAPE_ONELONG = "onelong", | ||
| CAPE_HIGHLIGHT_NONE = "none", | ||
| NORMAL = "normal", // just so it doesn't cause runtimes even when don't use it | ||
| CAPE_HIGHLIGHT_NORMAL_ALT = "normal (alt)", | ||
| MARK_FIVE_WEBBING = "webbing", | ||
| MARK_THREE_WEBBING = "webbing", | ||
| MARK_ONE_WEBBING = "webbing", | ||
| SOM_BLACK = "black", | ||
| )) |
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
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
66 changes: 66 additions & 0 deletions
66
modular_RUtgmc/code/datums/greyscale/json_configs/cape.json
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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| { | ||
| "cape_kama": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "kama" | ||
| } | ||
| ], | ||
| "cape_kilt": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "kilt" | ||
| }, | ||
| { | ||
| "type":"icon_state", | ||
| "icon_state":"kilt_no_color", | ||
| "blend_mode":"overlay" | ||
| } | ||
| ], | ||
| "cape_kilt (alt)": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "kilt_alt" | ||
| }, | ||
| { | ||
| "type":"icon_state", | ||
| "icon_state":"kilt_no_color", | ||
| "blend_mode":"overlay" | ||
| } | ||
| ], | ||
| "cape_long": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "long" | ||
| } | ||
| ], | ||
| "cape_long_h": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "long_h" | ||
| } | ||
| ], | ||
| "cape_regaly": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "regaly" | ||
| } | ||
| ], | ||
| "cape_regaly_h": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "regaly_h" | ||
| } | ||
| ], | ||
| "cape_onelong": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "onelong" | ||
| } | ||
| ], | ||
| "cape_onelong_h": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "onelong_h" | ||
| } | ||
| ] | ||
| } |
52 changes: 52 additions & 0 deletions
52
modular_RUtgmc/code/datums/greyscale/json_configs/cape_highlight.json
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 |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| { | ||
| "highlight_kama":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "kama" | ||
| } | ||
| ], | ||
| "highlight_kilt": [ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "kilt" | ||
| } | ||
| ], | ||
| "highlight_long":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "long" | ||
| } | ||
| ], | ||
| "highlight_long_h":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "long" | ||
| } | ||
| ], | ||
|
|
||
| "highlight_regaly":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "regaly" | ||
| } | ||
| ], | ||
| "highlight_regaly_h":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "regaly_h" | ||
| } | ||
| ], | ||
| "highlight_onelong":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "onelong" | ||
| } | ||
| ], | ||
|
|
||
| "highlight_onelong_h":[ | ||
| { | ||
| "type": "hyperscale", | ||
| "icon_state": "onelong" | ||
| } | ||
| ] | ||
| } |
39 changes: 39 additions & 0 deletions
39
modular_RUtgmc/code/datums/loadout/item_representation/_item_representation.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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /datum/item_representation | ||
| ///If the item has hair concealing changed, save it. | ||
| var/hair_concealing_option | ||
|
|
||
| /datum/item_representation/New(obj/item/item_to_copy) | ||
| if(!item_to_copy) | ||
| return | ||
| item_type = item_to_copy.type | ||
| if(item_to_copy.current_variant && item_to_copy.colorable_allowed & ICON_STATE_VARIANTS_ALLOWED) | ||
| for(var/key in GLOB.loadout_variant_keys) | ||
| var/val = GLOB.loadout_variant_keys[key] | ||
| if(val != item_to_copy.current_variant) | ||
| continue | ||
| variant = key | ||
| break | ||
|
|
||
| if(item_to_copy.current_hair_concealment && item_to_copy.colorable_allowed & HAIR_CONCEALING_CHANGE_ALLOWED) | ||
| hair_concealing_option = item_to_copy.current_hair_concealment | ||
|
|
||
| if(!item_to_copy.greyscale_config) | ||
| return | ||
| colors = item_to_copy.greyscale_colors | ||
|
|
||
| /datum/item_representation/instantiate_object(datum/loadout_seller/seller, master = null, mob/living/carbon/human/user) | ||
| if(seller && !bypass_vendor_check && !buy_item_in_vendor(item_type, seller, user)) | ||
| return | ||
| if(!text2path("[item_type]")) | ||
| to_chat(user, span_warning("[item_type] in your loadout is an invalid item, it has probably been changed or removed.")) | ||
| return | ||
| var/obj/item/item = new item_type(master) | ||
| if(item.greyscale_config) | ||
| item.set_greyscale_colors(colors) | ||
| if(item.current_variant && item.colorable_allowed & ICON_STATE_VARIANTS_ALLOWED) | ||
| item.current_variant = GLOB.loadout_variant_keys[variant] | ||
| item.update_icon() | ||
| if(item.colorable_allowed & HAIR_CONCEALING_CHANGE_ALLOWED) | ||
| item.current_hair_concealment = hair_concealing_option | ||
| item.switch_hair_concealment_flags(user) | ||
| return item |
Oops, something went wrong.