diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 9c6bf37bcf3..27ae9b54040 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -220,6 +220,7 @@ /obj/item/clothing/under/costume/swagoutfit = 1, /obj/item/clothing/shoes/swagshoes = 1, /obj/item/clothing/shoes/jackboots/timbs = 2, //SKYRAT EDIT ADDITION + /obj/item/clothing/head/soft/yankee = 3, //SKYRAT EDIT ADDITION /obj/item/instrument/piano_synth/headphones/spacepods = 1, /obj/item/clothing/suit/brownbattlecoat = 1, //SKYRAT EDIT ADDITION BEGIN /obj/item/clothing/suit/blackfurrich = 1, diff --git a/modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi index 4ca4cfaa693..be6a968989d 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/feet_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi index 7523b5456f0..01fed602a64 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/dog/corgi_head.dmi b/modular_skyrat/master_files/icons/mob/dog/corgi_head.dmi new file mode 100644 index 00000000000..9c46342a391 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/dog/corgi_head.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi index 8d32c38cd95..01e7e4d8762 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/modules/customization/datums/components/crafting/clothing.dm b/modular_skyrat/modules/customization/datums/components/crafting/clothing.dm new file mode 100644 index 00000000000..ed07ee22018 --- /dev/null +++ b/modular_skyrat/modules/customization/datums/components/crafting/clothing.dm @@ -0,0 +1,7 @@ +/datum/crafting_recipe/rimlessyankee + name = "Rimless fashionable hat" + result = /obj/item/clothing/head/soft/yankee/rimless + time = 120 + tool_behaviors = list(TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/head/soft/yankee = 1) + category = CAT_CLOTHING diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index 516f260291a..fd46c199959 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -421,3 +421,21 @@ icon_state = "deputy_hat" mutant_variants = NONE desc = "A light brown hat with a smell of iron. There's a small set of antlers embroidered on the inside." + +/obj/item/clothing/head/soft/yankee + name = "fashionable baseball cap" + desc = "Rimmed and brimmed." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "yankeesoft" + soft_type = "yankee" + dog_fashion = /datum/dog_fashion/head/yankee + mutant_variants = NONE + +/obj/item/clothing/head/soft/yankee/rimless + name = "rimless fashionable baseball cap" + desc = "Rimless for her pleasure." + icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' + icon_state = "yankeenobrimsoft" + soft_type = "yankeenobrim" diff --git a/modular_skyrat/modules/dogfashion/code/datums/head.dm b/modular_skyrat/modules/dogfashion/code/datums/head.dm new file mode 100644 index 00000000000..a1ab46e43a1 --- /dev/null +++ b/modular_skyrat/modules/dogfashion/code/datums/head.dm @@ -0,0 +1,5 @@ +/datum/dog_fashion/head/yankee + name = "MC REAL_NAME" + desc = "They're a big deal in the dog rapping world, apperently." + icon_file = 'modular_skyrat/master_files/icons/mob/dog/corgi_head.dmi' + emote_see = list("mumbles some bars.", "practises their beatboxing.") diff --git a/tgstation.dme b/tgstation.dme index 549221f5d46..a502ef4eaef 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4174,6 +4174,7 @@ #include "modular_skyrat\modules\customization\_globalvars\lists.dm" #include "modular_skyrat\modules\customization\_globalvars\names.dm" #include "modular_skyrat\modules\customization\datums\dna.dm" +#include "modular_skyrat\modules\customization\datums\components\crafting\clothing.dm" #include "modular_skyrat\modules\customization\datums\components\crafting\recipes.dm" #include "modular_skyrat\modules\customization\datums\elements\polychromic.dm" #include "modular_skyrat\modules\customization\datums\keybinding\communication.dm" @@ -4356,6 +4357,7 @@ #include "modular_skyrat\modules\decay_subsystem\code\decaySS.dm" #include "modular_skyrat\modules\decay_subsystem\code\nests.dm" #include "modular_skyrat\modules\digi_bloodsole\code\modules\clothing\shoes\_shoes.dm" +#include "modular_skyrat\modules\dogfashion\code\datums\head.dm" #include "modular_skyrat\modules\electric_welder\code\electric_welder.dm" #include "modular_skyrat\modules\emotes\code\dna_screams.dm" #include "modular_skyrat\modules\emotes\code\emotes.dm" diff --git a/tools/build/build.js b/tools/build/build.js old mode 100755 new mode 100644