forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into naaka-polishening-1
- Loading branch information
Showing
46 changed files
with
1,056 additions
and
11 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
50 changes: 50 additions & 0 deletions
50
modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.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,50 @@ | ||
| /* | ||
| _..---...,""-._ ,/}/) | ||
| .'' , ``..'(/-< ( This dm file contains greyscale datums for ensembles or 'sets' of items, so | ||
| / _ { ) \ / that they can be found all together in one place! To qualify as a set or | ||
| ; _ `. `. < a( / ensemble the items in question should explicitly be intended to be worn together, | ||
| ,' ( \ ) `. \ __.._ .: y such as the combination of maid dress, head piece, gloves, and neck piece below. ) | ||
| ( <\_-) )'-.____...\ `._ //-' | ||
| `. `-' /-._))) `-._))) | ||
| `...' | ||
| */ | ||
|
|
||
| //////////////// | ||
| //MAID COSTUME// | ||
| //////////////// | ||
|
|
||
| /datum/greyscale_config/maid_neck_cover | ||
| name = "Maid Neck Cover" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_neck_cover.json' | ||
|
|
||
| /datum/greyscale_config/maid_neck_cover/worn | ||
| name = "Maid Neck Cover (Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' | ||
|
|
||
| /datum/greyscale_config/maid_arm_covers | ||
| name = "Maid Arm Covers" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_arm_covers.json' | ||
|
|
||
| /datum/greyscale_config/maid_arm_covers/worn | ||
| name = "Maid Arm Covers (Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' | ||
|
|
||
| /datum/greyscale_config/maid_costume | ||
| name = "Maid Costume" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_costume.json' | ||
|
|
||
| /datum/greyscale_config/maid_costume/worn | ||
| name = "Maid Costume (Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' | ||
|
|
||
| /datum/greyscale_config/maid_headband | ||
| name = "Maid Headband" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/maid_costume.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/maid/maid_headband.json' | ||
|
|
||
| /datum/greyscale_config/maid_headband/worn | ||
| name = "Maid Headband (Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi' |
64 changes: 64 additions & 0 deletions
64
modular_doppler/modular_cosmetics/GAGS/greyscale_configs_suit.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,64 @@ | ||
| /* ( *snores* this dm file contains greyscale datums for suit slot clothes! ) | ||
| / | ||
| |\ _,,,---,,_ / | ||
| /,`.-'`' -. ;-;;,_ | ||
| |,4- ) )-,_..;\ ( `'-' | ||
| '---''(_/--' `-'\_) | ||
| */ | ||
|
|
||
| /datum/greyscale_config/chokha | ||
| name = "Chokha" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha.json' | ||
|
|
||
| /datum/greyscale_config/chokha/worn | ||
| name = "Chokha (Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/chokha_worn.json' | ||
|
|
||
| /datum/greyscale_config/crop_jacket | ||
| name = "Tailored Jacket" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket.json' | ||
|
|
||
| /datum/greyscale_config/crop_jacket/worn | ||
| name = "Tailored Jacket (Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' | ||
|
|
||
| /datum/greyscale_config/shortsleeve_crop_jacket | ||
| name = "Tailored Jacket (Short-Sleeved)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_short.json' | ||
|
|
||
| /datum/greyscale_config/shortsleeve_crop_jacket/worn | ||
| name = "Tailored Jacket (Short-Sleeved, Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' | ||
|
|
||
| /datum/greyscale_config/sleeveless_crop_jacket | ||
| name = "Tailored Jacket (Sleeveless)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/crop_jacket_none.json' | ||
|
|
||
| /datum/greyscale_config/sleeveless_crop_jacket/worn | ||
| name = "Tailored Jacket (Sleeveless, Worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' | ||
|
|
||
| /datum/greyscale_config/big_jacket | ||
| name = "Alpha Atelier pilot jacket" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket.json' | ||
|
|
||
| /datum/greyscale_config/big_jacket/worn | ||
| name = "Alpha Atelier pilot jacket (worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/jacket.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/big_jacket_worn.json' | ||
|
|
||
| /datum/greyscale_config/dagger_mantle | ||
| name = "'dagger' designer mantle" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/shirt.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle.json' | ||
|
|
||
| /datum/greyscale_config/dagger_mantle/worn | ||
| name = "'dagger' designer mantle (worn)" | ||
| icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/shirt.dmi' | ||
| json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/suit/dagger_mantle_worn.json' |
Oops, something went wrong.