diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 3a9a8cf776..886c55fe09 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -273,6 +273,13 @@ level = 1 cant_hold = list(/obj/item/weapon/storage/backpack/satchel/flat) //muh recursive backpacks +/obj/item/weapon/storage/backpack/satchel/duty + name = "duty satchel" + desc = "An extra trendy looking satchel." + icon_state = "satchel-duty" + + + /obj/item/weapon/storage/backpack/satchel/flat/hide(var/intact) if(intact) invisibility = INVISIBILITY_MAXIMUM diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index 7170f3127b..3d20e7f792 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -37,14 +37,29 @@ datum/species/canid /datum/species/ailurus name = "Ailurus" id = "ailurus" - default_color = "BCAC9B" + default_color = "4B4B4B" species_traits = list(EYECOLOR,LIPS,HAIR) mutant_bodyparts = list("mam_tail") default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "ailurus") attack_verb = "claw" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' - roundstart = 1 //no sprites yet + roundstart = 1 + +/datum/species/capra + name = "Capra" + id = "capra" + default_color = "4B4B4B" + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR) + mutant_bodyparts = list("mam_tail") + default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF","mam_tail" = "capra") + attack_verb = "claw" + attack_sound = 'sound/weapons/slash.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + roundstart = 1 + + + //AVIAN// /datum/species/avian @@ -60,6 +75,18 @@ datum/species/canid roundstart = 0 //no sprites yet blacklisted = 1 +/datum/species/avian + name = "Hawk" + id = "hawk" + default_color = "BCAC9B" + species_traits = list(EYECOLOR,LIPS,HAIR) + mutant_bodyparts = list("mam_tail") + default_features = list("wings" = "hawk") + attack_verb = "peck" + attack_sound = 'sound/weapons/slash.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + roundstart = 1 + //AQUATIC// /datum/species/shark name = "Shark" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index fd6957998a..b4d5b5a1b3 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1701,6 +1701,17 @@ name = "Ailurus" icon_state = "ailurus" +//Capra +/datum/sprite_accessory/mam_tails/capra + name = "Capra" + icon_state = "capra" + +//Hawk +/datum/sprite_accessory/mam_tails/hawk + name = "Hawk" + icon_state = "hawk" + + //Mammal Specific Body Markings /datum/sprite_accessory/mam_body_markings color_src = MUTCOLORS2 diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi index 7c58156298..8ebc050f6c 100644 Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 5fd9515786..f0352cbcac 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 1bb5de0267..dac5dfd819 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 65ab25858a..352adcab43 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index 8140b72a17..874d4aacb0 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index d4f27ed2b8..9d2e8af027 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ