diff --git a/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm b/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm index 7ba81054896e..c627754e05fe 100644 --- a/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm +++ b/modular_nova/master_files/code/modules/clothing/suits/labcoat.dm @@ -35,6 +35,12 @@ icon_state = "labcoat_regular" gets_cropped_on_taurs = FALSE +/obj/item/clothing/suit/toggle/labcoat/nova/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" + gets_cropped_on_taurs = FALSE + /obj/item/clothing/suit/toggle/labcoat/nova/pharmacist name = "pharmacist's labcoat" desc = "A standard labcoat for chemistry which protects the wearer from acid spills." diff --git a/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm b/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm index 7b8487308abc..7e12a1dff8bc 100644 --- a/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm +++ b/modular_nova/master_files/code/modules/clothing/under/skirts_dresses.dm @@ -216,6 +216,17 @@ greyscale_config = /datum/greyscale_config/wedding_dress_ribbon greyscale_config_worn = /datum/greyscale_config/wedding_dress_ribbon/worn +/obj/item/clothing/under/dress/nova/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 + /* * Others */ diff --git a/modular_nova/master_files/icons/mob/clothing/hands.dmi b/modular_nova/master_files/icons/mob/clothing/hands.dmi index acc0efab98e9..cae8c981681e 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/hands.dmi and b/modular_nova/master_files/icons/mob/clothing/hands.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi b/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi index ac9fe47496aa..d8ec78fb9256 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi and b/modular_nova/master_files/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi b/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi index 5e24a4e01a1a..2f22e469c9f4 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi and b/modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi index c271e055c478..00bba4bb9da9 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/ears.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi index a1d5cfcbd890..c3017d39e7ae 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/horns.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi index 3817ae015916..2be9e8a63598 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/snouts.dmi differ diff --git a/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi b/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi index 4ccc42f5775c..b6c9c0c7bbdd 100644 Binary files a/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi and b/modular_nova/master_files/icons/mob/sprite_accessory/taur.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/gloves.dmi b/modular_nova/master_files/icons/obj/clothing/gloves.dmi index 83c167227ddb..8dc31ff3b82a 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/gloves.dmi and b/modular_nova/master_files/icons/obj/clothing/gloves.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi b/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi index abe9f39089b3..05aed77e092e 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi and b/modular_nova/master_files/icons/obj/clothing/suits/labcoat.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi b/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi index e9820dd18b2c..a57509a028ac 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi and b/modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi differ diff --git a/modular_nova/modules/GAGS/greyscale_configs.dm b/modular_nova/modules/GAGS/greyscale_configs.dm index 21ca55ad28da..93e6ed830447 100644 --- a/modular_nova/modules/GAGS/greyscale_configs.dm +++ b/modular_nova/modules/GAGS/greyscale_configs.dm @@ -1346,6 +1346,15 @@ name = "Wedding Dress With Ribbon (Worn)" icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi' +/datum/greyscale_config/giant_scarf + name = "Giant Scarf" + icon_file = 'modular_nova/master_files/icons/obj/clothing/under/skirts_dresses.dmi' + json_config = 'modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json' + +/datum/greyscale_config/giant_scarf/worn + name = "Giant Scarf (Worn)" + icon_file = 'modular_nova/master_files/icons/mob/clothing/under/skirts_dresses.dmi' + // KILT // COSTUMES diff --git a/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json b/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json new file mode 100644 index 000000000000..59ce4991e5bb --- /dev/null +++ b/modular_nova/modules/GAGS/json_configs/pants_shorts_skirts_dresses/giant_scarf.json @@ -0,0 +1,10 @@ +{ + "giant_scarf": [ + { + "type": "icon_state", + "icon_state": "giant_scarf", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_nova/modules/customization/modules/clothing/hands/hands.dm b/modular_nova/modules/customization/modules/clothing/hands/hands.dm index 1daa85fa65e6..08d4be8811ee 100644 --- a/modular_nova/modules/customization/modules/clothing/hands/hands.dm +++ b/modular_nova/modules/customization/modules/clothing/hands/hands.dm @@ -9,6 +9,15 @@ cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT +/obj/item/clothing/gloves/lalune_long + icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi' + worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.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 = 4 SECONDS + equip_delay_other = 2 SECONDS + /obj/item/clothing/gloves/kim icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi' worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi' diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm index d7342de1ef13..411de18f525b 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -175,6 +175,10 @@ icon_state = "fish" color_src = USE_ONE_COLOR +/datum/sprite_accessory/ears/mutant/floppy + name = "Floppy" + icon_state = "floppy" + /datum/sprite_accessory/ears/mutant/vulpkanin/fox name = "Fox" icon_state = "fox" diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm index 1b86771e9096..eeea4204e808 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -140,6 +140,26 @@ name = "Broad Curls" icon_state = "broadcurls" +/datum/sprite_accessory/horns/antenna_fuzzball_v2 + name = "Fuzzball Antenna" + icon_state = "antenna_fuzzballv2" + color_src = USE_MATRIXED_COLORS + +/datum/sprite_accessory/horns/setaceous + name = "Setaceous Antenna" + icon_state = "setaceous" + color_src = USE_ONE_COLOR + +/datum/sprite_accessory/horns/setaceousm + name = "Medium Setaceous Antenna" + icon_state = "setaceousm" + color_src = USE_ONE_COLOR + +/datum/sprite_accessory/horns/geniculate + name = "Geniculate Antenna" + icon_state = "geniculate" + color_src = USE_ONE_COLOR + /datum/sprite_accessory/horns/moogle_pom icon = 'modular_nova/master_files/icons/mob/sprite_accessory/moogle_pom.dmi' color_src = USE_MATRIXED_COLORS diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm index f57869179e77..1313f879cd67 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm @@ -232,6 +232,14 @@ name = "Scolipede" icon_state = "pede" +/datum/sprite_accessory/snouts/mammal/pig + name = "Porcine" + icon_state = "pig" + +/datum/sprite_accessory/snouts/mammal/pig/boar + name = "Porcine + Tusks" + icon_state = "boar" + /datum/sprite_accessory/snouts/mammal/sergal name = "Sergal" icon_state = "sergal" diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm index 4bb4a3ad8288..86f9ebba93b1 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm @@ -198,3 +198,11 @@ /datum/sprite_accessory/taur/biglegs/stanced/bird name = "Big Legs, Stanced Bird" icon_state = "biglegs_bird_stanced" + +/datum/sprite_accessory/taur/biglegs/peg + name = "Big Legs, Pegs" + icon_state = "biglegs_peg" + +/datum/sprite_accessory/taur/biglegs/stanced/peg + name = "Big Legs, Stanced Pegs" + icon_state = "biglegs_peg_stanced" diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm index 39c13ddfb991..e9894a1d10da 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_gloves.dm @@ -28,6 +28,10 @@ name = "Fingerless Gloves" item_path = /obj/item/clothing/gloves/fingerless +/datum/loadout_item/gloves/lalune_long + name = "Designer Black Gloves" + item_path = /obj/item/clothing/gloves/lalune_long + /datum/loadout_item/gloves/black name = "Black Gloves" item_path = /obj/item/clothing/gloves/color/black diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm index 1648fdb8b977..84077209678c 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -304,6 +304,10 @@ item_path = /obj/item/clothing/neck/security_cape/tarkon blacklisted_roles = list(JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_QUARTERMASTER, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_CORRECTIONS_OFFICER) +/datum/loadout_item/neck/security_cape + name = "Security Cape" + item_path = /obj/item/clothing/neck/security_cape + /* * DONATOR */ diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm index 71c6f3dd6ff3..ed848d61993a 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -127,6 +127,10 @@ name = "Researcher's Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/nova/regular +/datum/loadout_item/suit/labcoat_lalunevest + name = "Designer Buttoned Coat" + item_path = /obj/item/clothing/suit/toggle/labcoat/nova/lalunevest + /datum/loadout_item/suit/labcoat_pharmacist name = "Pharmacist's Labcoat" item_path = /obj/item/clothing/suit/toggle/labcoat/nova/pharmacist diff --git a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 69f24fe47553..ecc6972e949d 100644 --- a/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -464,6 +464,10 @@ name = "Wedding Dress With Ribbon" item_path = /obj/item/clothing/under/dress/wedding_dress/ribbon +/datum/loadout_item/under/miscellaneous/giant_scarf + name = "Giant Scarf" + item_path = /obj/item/clothing/under/dress/nova/giant_scarf + /datum/loadout_item/under/miscellaneous/red_skirt name = "Red Bra and Skirt" item_path = /obj/item/clothing/under/dress/skirt/nova/red_skirt diff --git a/modular_nova/modules/modular_vending/code/clothesmate.dm b/modular_nova/modules/modular_vending/code/clothesmate.dm index 25d060c5acbb..2f3e3c1aa17a 100644 --- a/modular_nova/modules/modular_vending/code/clothesmate.dm +++ b/modular_nova/modules/modular_vending/code/clothesmate.dm @@ -90,6 +90,7 @@ /obj/item/clothing/under/suit/nova/helltaker/skirt = 3, /obj/item/clothing/under/dress/skirt/nova/medium = 5, /obj/item/clothing/under/dress/skirt/nova/long = 5, + /obj/item/clothing/under/dress/nova/giant_scarf = 5, ), ), @@ -182,6 +183,8 @@ /obj/item/clothing/suit/brownbattlecoat = 1, /obj/item/clothing/suit/blackfurrich = 1, /obj/item/clothing/suit/frenchtrench = 1, + /obj/item/clothing/suit/toggle/labcoat/nova/lalunevest = 2, + /obj/item/clothing/gloves/lalune_long = 2, ) contraband_nova = list(