Skip to content

Commit

Permalink
HELP ME HOLY SHIT
Browse files Browse the repository at this point in the history
  • Loading branch information
Nerev4r committed Nov 2, 2024
1 parent 354bfc5 commit 7227612
Show file tree
Hide file tree
Showing 23 changed files with 109 additions and 1 deletion.
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
name = "Green Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/mad

/datum/loadout_item/suit/lalune_labcoat
name = "Sleeveless Labcoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/lalunevest

/*
* PONCHOS
*/
Expand Down
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,7 @@
/datum/loadout_item/gloves/maid_arm_covers
name = "Maid Costume"
item_path = /obj/item/clothing/gloves/maid

/datum/loadout_item/gloves/lalune_gloves
name = "Elbow Gloves"
item_path = /obj/item/clothing/gloves/lalune_long
4 changes: 4 additions & 0 deletions modular_doppler/loadout_categories/categories/undersuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@
name = "Dress"
item_path = /obj/item/clothing/under/dress

/datum/loadout_item/undersuit/dress/giantscarf
name = "Giant Scarf"
item_path = /obj/item/clothing/under/pants/giant_scarf

/datum/loadout_item/undersuit/dress/evening
name = "Evening Dress"
item_path = /obj/item/clothing/under/dress/eveninggown
Expand Down
10 changes: 10 additions & 0 deletions modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,16 @@
name = "Pentagram Strapped Dress (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi'

/datum/greyscale_config/giant_scarf
name = "Giant Scarf"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'
json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf.json'

/datum/greyscale_config/giant_scarf/worn
name = "Giant Scarf (Worn)"
icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi'


/// LUNAR JAPANESE SECTION

/datum/greyscale_config/lunar_japanese
Expand Down
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/mob/under.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/GAGS/icons/obj/under.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"giant_scarf": [
{
"type": "icon_state",
"icon_state": "giant_scarf_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"giant_scarf": [
{
"type": "icon_state",
"icon_state": "giant_scarf_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"giant_scarf": [
{
"type": "icon_state",
"icon_state": "giant_scarf_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
11 changes: 10 additions & 1 deletion modular_doppler/modular_cosmetics/code/hands/gloves.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
/obj/item/clothing/gloves/latex/nitrile
icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi'
greyscale_colors = "#B7DE5B"
greyscale_colors = "#B7DE5B"

/obj/item/clothing/gloves/lalune_long
icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi'
name = "designer long gloves"
desc = "A fancy set of bicep-length black gloves. The La Lune insignia is sewn into the rims."
icon_state = "lalune_long"
strip_delay = 40
equip_delay_other = 20
7 changes: 7 additions & 0 deletions modular_doppler/modular_cosmetics/code/suits/labcoat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@
body_parts_covered = NONE //Allows surgeries despite wearing it; hiding genitals is handled in /datum/sprite_accessory/genital/is_hidden() (Only place it'd work sadly)
armor_type = /datum/armor/none
equip_delay_other = 8

/obj/item/clothing/suit/toggle/labcoat/lalunevest
name = "sleeveless buttoned coat"
desc = "A fashionable jacket bearing the La Lune insignia on the inside. It appears similar to a labcoat in design and materials, though the tag warns against it being a replacement for such."
icon_state = "labcoat_lalune_vest"
icon = 'modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi'
worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi'
11 changes: 11 additions & 0 deletions modular_doppler/modular_cosmetics/code/under/dresses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@
greyscale_colors = "#cc0000#5f5f5f"
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/under/pants/giant_scarf
name = "giant scarf"
desc = "An absurdly massive scarf, worn as the main article of clothing over the body. Ironically, not very suitable for the cold."
icon_state = "giant_scarf"
body_parts_covered = CHEST|GROIN|LEGS
greyscale_config = /datum/greyscale_config/giant_scarf
greyscale_config_worn = /datum/greyscale_config/giant_scarf/worn
greyscale_colors = "#EEEEEE"
female_sprite_flags = NO_FEMALE_UNIFORM
flags_1 = IS_PLAYER_COLORABLE_1

/obj/item/clothing/under/dress/doppler/flower
name = "flower dress"
desc = "Lovely dress. Colored like the autumn leaves."
Expand Down
Binary file modified modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi
Binary file not shown.
Binary file modified modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/datum/sprite_accessory/tails/deer/cow
icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/canine/canine_tail.dmi'

/datum/sprite_accessory/tails/deer/cow/default
name = "Cow (Short)"
icon_state = "cows"

/datum/sprite_accessory/tails/deer/cow/long
name = "Cow (Long)"
icon_state = "cowl"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/datum/sprite_accessory/ears_more/deer/pig
icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_ears.dmi'

/datum/sprite_accessory/ears_more/deer/pig/default
name = "Floppy"
icon_state = "floppy"

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/datum/sprite_accessory/snouts/porcine
icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_snouts.dmi'
name = "Porcine"
icon_state = "pig"

/datum/sprite_accessory/snouts/porcine/boar
name = "Porcine + Tusks"
icon_state = "boar"

Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6844,6 +6844,7 @@
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\avian_accessories\avian_snout.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\avian_accessories\avian_tail.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\avian_accessories\avian_wings.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\bovine_accessories\bovine_tails.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\canine_accessories\canine_body_markings.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\canine_accessories\canine_ears.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\canine_accessories\canine_snout.dm"
Expand All @@ -6859,6 +6860,8 @@
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\leporid_accessories\leporid_tail.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_ears.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_tail.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\porcine_accessories\porcine_ears.dm"
#include "modular_doppler\modular_customization\accessories\code\non_species_specific\porcine_accessories\porcine_snouts.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_body_markings.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_ears.dm"
#include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_frills.dm"
Expand Down

0 comments on commit 7227612

Please sign in to comment.