Merge pull request #211 from Nerev4r/iskaports

Some Sprites By Iska (& NovaSector Ports)

code/modules/mob/living/carbon/human/species_types/snail.dm

@@ -4,7 +4,7 @@
 	id = SPECIES_SNAIL
 	inherent_traits = list(
 		TRAIT_MUTANT_COLORS,
-		TRAIT_NO_UNDERWEAR,
+		//TRAIT_NO_UNDERWEAR, // DOPPLER EDIT REMOVAL
 		TRAIT_NO_SLIP_ALL,
 	)
 

code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm

@@ -23,7 +23,7 @@
 	dmg_overlay_type = null
 	brute_modifier = 1.25 //ethereal are weak to brute damages
 	wing_types = NONE
-	bodypart_traits = list(TRAIT_NO_UNDERWEAR)
+	//bodypart_traits = list(TRAIT_NO_UNDERWEAR) //DOPPLER EDIT REMOVAL
 
 /obj/item/bodypart/chest/ethereal/update_limb(dropping_limb, is_creating)
 	. = ..()

modular_doppler/loadout_categories/categories/clothing.dm

@@ -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
 */

modular_doppler/loadout_categories/categories/gloves.dm

@@ -75,3 +75,11 @@
 /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
+
+/datum/loadout_item/gloves/cloth_armwraps
+	name = "Cloth Armwraps"
+	item_path = /obj/item/clothing/gloves/bracer/wraps

modular_doppler/loadout_categories/categories/undersuit.dm

@@ -117,6 +117,22 @@
 	name = "Simple Skirt"
 	item_path = /obj/item/clothing/under/shorts/shorter/skirt
 
+/datum/loadout_item/undersuit/pants/skirt/medium
+	name = "Medium Skirt"
+	item_path = /obj/item/clothing/under/dress/skirt/medium
+
+/datum/loadout_item/undersuit/pants/skirt/long
+	name = "Long Skirt"
+	item_path = /obj/item/clothing/under/dress/skirt/long
+
+/datum/loadout_item/undersuit/pants/skirt/loincloth
+	name = "Loincloth"
+	item_path = /obj/item/clothing/under/dress/skirt/loincloth
+
+/datum/loadout_item/undersuit/pants/skirt/loincloth/alt
+	name = "Loincloth, Alt"
+	item_path = /obj/item/clothing/under/dress/skirt/loincloth/loincloth_alt
+
 /*
 *	BUTTONDOWNS
 */
@@ -146,6 +162,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/dress/doppler/giant_scarf
+
 /datum/loadout_item/undersuit/dress/evening
 	name = "Evening Dress"
 	item_path = /obj/item/clothing/under/dress/eveninggown
@@ -263,3 +283,15 @@
 /datum/loadout_item/undersuit/gear_harness
 	name = "Gear Harness"
 	item_path = /obj/item/clothing/under/misc/gear_harness
+
+/datum/loadout_item/undersuit/jumpsuit
+	name = "Colorable Jumpsuit"
+	item_path = /obj/item/clothing/under/color
+
+/datum/loadout_item/undersuit/jumpskirt
+	name = "Colorable Jumpskirt"
+	item_path = /obj/item/clothing/under/color/jumpskirt
+
+/datum/loadout_item/under/jumpsuit/frontier
+	name = "Frontier Jumpsuit"
+	item_path = /obj/item/clothing/under/frontier_colonist

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_hand.dm

@@ -0,0 +1,22 @@
+/*                                 \ /  \/ \/  \/  / ,
+                                  \ \ \/ \/ \/ \ \/ \/ /
+                                .\  \/  \/ \/ \/  \/ / / /
+  *hedgehog noise*  )          '  / / \/  \/ \/ \/  \/ \ \/ \
+  This dm contains   \      .'     ) \/ \/ \/ \/  \/  \/ \ / \
+ all glove grayscales  \    /   o    ) \/ \/ \/ \/ \/ \/ \// /
+                         o'_ ',__ .'   ,.,.,.,.,.,.,.,'- '
+                                  // \\          // \\
+                                 ''  ''         ''  ''
+*/
+
+// Armwraps
+
+/datum/greyscale_config/armwraps
+	name = "Cloth Arm Wraps"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps.json'
+
+/datum/greyscale_config/armwraps/worn
+	name = "Cloth Arm Wraps (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps_worn.json'

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_under.dm

@@ -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/mob/under.dmi'
+
+
 /// LUNAR JAPANESE SECTION
 
 /datum/greyscale_config/lunar_japanese
@@ -282,3 +292,21 @@
 /datum/greyscale_config/skimpypants/worn/digi
 	name = "Skimpy Pants (Worn, Digi)"
 	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/pants_digi.dmi'
+
+/datum/greyscale_config/medium_skirt
+	name = "Medium Skirt"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/medium_skirt.json'
+
+/datum/greyscale_config/medium_skirt/worn
+	name = "Medium Skirt (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'
+
+/datum/greyscale_config/long_skirt
+	name = "Long Skirt"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/obj/under/miscellania.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/under/long_skirt.json'
+
+/datum/greyscale_config/long_skirt/worn
+	name = "Long Skirt (Worn)"
+	icon_file = 'modular_doppler/modular_cosmetics/icons/mob/under/miscellania.dmi'

modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps.json

@@ -0,0 +1,10 @@
+{
+	"arm_wraps": [
+		{
+			"type": "icon_state",
+			"icon_state": "arm_wraps",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/hand/arm_wraps_worn.json

@@ -0,0 +1,10 @@
+{
+	"arm_wraps": [
+		{
+			"type": "icon_state",
+			"icon_state": "arm_wraps",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf.json

@@ -0,0 +1,10 @@
+{
+	"giant_scarf": [
+	{
+	"type": "icon_state",
+	"icon_state": "giant_scarf_base",
+	"blend_mode": "overlay",
+	"color_ids": [ 1 ]
+	}
+	]
+	}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/giant_scarf_worn.json

@@ -0,0 +1,10 @@
+{
+	"giant_scarf": [
+	{
+	"type": "icon_state",
+	"icon_state": "giant_scarf_base",
+	"blend_mode": "overlay",
+	"color_ids": [ 1 ]
+	}
+	]
+	}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/long_skirt.json

@@ -0,0 +1,10 @@
+{
+	"long_skirt": [
+		{
+			"type": "icon_state",
+			"icon_state": "long_skirt",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/GAGS/json_configs/under/medium_skirt.json

@@ -0,0 +1,10 @@
+{
+	"medium_skirt": [
+		{
+			"type": "icon_state",
+			"icon_state": "medium_skirt",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

modular_doppler/modular_cosmetics/code/hands/gloves.dm

@@ -1,4 +1,25 @@
 /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
+
+/obj/item/clothing/gloves/bracer/wraps
+	name = "cloth arm wraps"
+	desc = "Used for aesthetics, used for wiping sweat from the brow, used for... well, what about you?"
+	icon = 'modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi'
+	icon_state = "arm_wraps"
+	inhand_icon_state = "greyscale_gloves"
+	greyscale_config = /datum/greyscale_config/armwraps
+	greyscale_config_worn = /datum/greyscale_config/armwraps/worn
+	greyscale_colors = "#FFFFFF"
+	flags_1 = IS_PLAYER_COLORABLE_1

modular_doppler/modular_cosmetics/code/suits/labcoat.dm

@@ -10,3 +10,11 @@
 	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_lalunevest"
+	icon = 'modular_doppler/modular_cosmetics/icons/obj/suit/labcoat.dmi'
+	worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/suit/labcoat.dmi'
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

modular_doppler/modular_cosmetics/code/under/dresses.dm

@@ -26,6 +26,18 @@
 	greyscale_colors = "#cc0000#5f5f5f"
 	flags_1 = IS_PLAYER_COLORABLE_1
 
+/obj/item/clothing/under/dress/doppler/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
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
 /obj/item/clothing/under/dress/doppler/flower
 	name = "flower dress"
 	desc = "Lovely dress. Colored like the autumn leaves."

modular_doppler/modular_cosmetics/code/under/pants.dm

@@ -108,3 +108,26 @@
 	name = "simple skirt"
 	desc = "A lone skirt, suitable to combo with your favorite getup."
 	icon_state = "skirt"
+
+/obj/item/clothing/under/dress/skirt/medium
+	name = "medium skirt"
+	desc = "An appealing medium-length skirt. Top not included."
+	icon_state = "medium_skirt"
+	body_parts_covered = GROIN
+	greyscale_config = /datum/greyscale_config/medium_skirt
+	greyscale_config_worn = /datum/greyscale_config/medium_skirt/worn
+	greyscale_colors = "#3a3c45"
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
+	flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/under/dress/skirt/long
+	name = "long skirt"
+	desc = "An appealing long skirt. At this point does it qualify as a dress?"
+	icon_state = "long_skirt"
+	body_parts_covered = GROIN|LEGS
+	greyscale_config = /datum/greyscale_config/long_skirt
+	greyscale_config_worn = /datum/greyscale_config/long_skirt/worn
+	greyscale_colors = "#3a3c45"
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY|FEMALE_UNIFORM_NO_BREASTS
+	alternate_worn_layer = ABOVE_SHOES_LAYER
+	flags_1 = IS_PLAYER_COLORABLE_1

modular_doppler/modular_customization/accessories/code/aquatic_accessories/aquatic_tail.dm

@@ -30,6 +30,11 @@
 	name = "Azulean"
 	icon_state = "akula"
 
+/datum/sprite_accessory/tails/fish/shrimp
+	name = "Shrimp (Fish)"
+	icon = 'modular_doppler/modular_customization/accessories/icons/insectoid/insect_tail.dmi'
+	icon_state = "segmentedtail"
+
 /datum/sprite_accessory/tails/fish/big // big .dmi starts here
 	name = "Sea Slug"
 	icon = 'modular_doppler/modular_customization/accessories/icons/aquatic/aquatic_tail_big.dmi'

modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_ears.dm

@@ -12,3 +12,15 @@
 /datum/sprite_accessory/ears_more/bug/default
 	name = "Royal"
 	icon_state = "royal"
+
+/datum/sprite_accessory/ears_more/bug/setaceous
+	name = "Setaceous Antenna"
+	icon_state = "setaceous"
+
+/datum/sprite_accessory/ears_more/bug/setaceousm
+	name = "Medium Setaceous Antenna"
+	icon_state = "setaceousm"
+
+/datum/sprite_accessory/ears_more/bug/geniculate
+	name = "Geniculate Antenna"
+	icon_state = "geniculate"

modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_snouts.dm

@@ -0,0 +1,4 @@
+/datum/sprite_accessory/snouts/insect
+	icon = 'modular_doppler/modular_customization/accessories/icons/insectoid/insect_snouts.dmi'
+	name = "Mandibles"
+	icon_state = "mandibles"

modular_doppler/modular_customization/accessories/code/insectoid_accessories/insect_tail.dm

@@ -4,3 +4,7 @@
 /datum/sprite_accessory/tails/bug/default
 	name = "Bug"
 	icon_state = "bug"
+
+/datum/sprite_accessory/tails/bug/shrimp
+	name = "Shrimp (Insect)"
+	icon_state = "segmentedtail"

modular_doppler/modular_customization/accessories/code/lizard_accessories/lizard_tail.dm

@@ -25,6 +25,9 @@
 	name = "Rattlesnake"
 	icon_state = "rattlesnake"
 
+/datum/sprite_accessory/tails/lizard/gecko
+	name = "Gecko"
+	icon_state = "gecko"
 
 /datum/sprite_accessory/tails/lizard/big
 	icon = 'modular_doppler/modular_customization/accessories/icons/lizard/lizard_tail_big.dmi'

modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm

@@ -0,0 +1,8 @@
+/datum/sprite_accessory/tails/deer/cow
+	name = "Cow (Short)"
+	icon_state = "cows"
+	icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi'
+
+/datum/sprite_accessory/tails/deer/cow/long
+	name = "Cow (Long)"
+	icon_state = "cowl"

modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm

@@ -0,0 +1,4 @@
+/datum/sprite_accessory/ears_more/deer/pig
+	name = "Floppy"
+	icon_state = "floppy"
+	icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi'

modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm

@@ -0,0 +1,9 @@
+/datum/sprite_accessory/snouts/pig
+	icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi'
+	name = "Pig"
+	icon_state = "pig"
+
+/datum/sprite_accessory/snouts/pig/boar
+	name = "Pig + Tusks"
+	icon_state = "boar"
+