diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 4f2be1729e..d2f950fdf8 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -788,3 +788,15 @@ item_state = "hoodcowl" flags_inv = HIDEHAIR dynamic_hair_suffix = "" + +/obj/item/clothing/head/canadian + name = "canadian mounty hat" + desc = "smells like maple syrup" + icon_state = "canadian" + item_state = "canadian" + +/obj/item/clothing/head/ncr_ranger + name = "ncr ranger helmet" + desc = "Is a helmet. Yep." + icon_state = "ncr_ranger" + item_state = "ncr_ranger" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index dc9ceedbea..a6066cc10e 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -368,6 +368,25 @@ var/mob/living/carbon/C = user C.head_update(src, forced = 1) +/obj/item/clothing/head/slouch/colorable + name = "Colorable Slouch Hat" + desc = "A fur felt hat adopted by the Australian army in the late 1800s, it has a puggaree hat band and has a cattleman esk crease. Was in use as its standard head gear before the bombs fell" + icon_state = "slouch_colorable" + item_state = "slouch_colorable" + can_toggle = 1 + actions_types = list(/datum/action/item_action/toggle) + +/obj/item/clothing/head/slouch/colorable/attack_self(mob/user) + if(can_toggle && !user.incapacitated(allow_crit = TRUE)) + up = !up + icon_state = "[initial(icon_state)][up ? "up" : ""]" + to_chat(user, "you button \the [src]'s brim [up ? "up" : "down"]") + + user.update_inv_head() + if(iscarbon(user)) + var/mob/living/carbon/C = user + C.head_update(src, forced = 1) + ////////////////////////////////// //Fenis Helmet & Hat-a-polooza/// @@ -581,7 +600,7 @@ icon_state = "samurai_warrior3" item_state = "samurai_warrior3" pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/rushelmet - + /obj/item/clothing/head/coyote/samuraiwarriorfour name = "Stylish Samurai Helmet - Black" desc = "Oda Nobunag-on-my-balls." @@ -595,7 +614,7 @@ icon_state = "samurai_warrior5" item_state = "samurai_warrior5" pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/rushelmet - + /obj/item/clothing/head/coyote/samuraiguard1 name = "Simple Samurai Helmet - Reddish Brown" desc = "Oda Nobunag-on-my-balls." diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 8779a8e707..ba91b49377 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -581,6 +581,12 @@ icon_state = "putt" mutantrace_variation = STYLE_DIGITIGRADE +/obj/item/clothing/shoes/putt/brown + name = "long puttees - tan" + desc = "Long woolen leg wraps used sense the first world war" + icon_state = "putt_brown" + mutantrace_variation = STYLE_DIGITIGRADE + /obj/item/clothing/shoes/cowboy/ranger name = "Ranger Cowboy" desc = "A set of cowboy boots. Yeehaw!" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 49c5545ae2..53b34260dd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1156,6 +1156,13 @@ item_state = "trench_colorable" armor = ARMOR_VALUE_LIGHT +/obj/item/clothing/suit/toggle/labcoat/ranger/sack_coat + name = "Sack coat, colorable" + desc = "It's a coat. Might keep you warm. Or not.." + icon_state = "sack_coat" + item_state = "sack_coat" + armor = ARMOR_VALUE_LIGHT + /obj/item/clothing/suit/eris/poncho name = "Rainbow Poncho" desc = "A rainbow poncho" @@ -1582,3 +1589,9 @@ item_state = "whitemagerobes" icon_state = "whitemagerobes" +/obj/item/clothing/suit/coat/coyote/british_jacket + name = "british jacket" + desc = "A big comfy jacket!" + icon_state = "british_jacket" + item_state = "british_jacket" + body_parts_covered = CHEST|ARMS diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index 41fb8f879c..dcc01b00d5 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index b0a5590e63..4ffc18e51b 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index c11a6ceafb..734b2fd7a7 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 456d48586e..ad65076fdf 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index cd914ba62e..91802e9977 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 71401fc229..91321b1a74 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 1710ed8428..cc05e8211d 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -634,6 +634,10 @@ name = "khaki slouch hat, alt version" path = /obj/item/clothing/head/slouch/alt +/datum/gear/head/slouch/colorable + name = "slouch hat, colorable" + path = /obj/item/clothing/head/slouch/colorable + /datum/gear/head/turban name = "Military Turban" path = /obj/item/clothing/head/military_turban @@ -1484,3 +1488,13 @@ /datum/gear/head/hoodcowl name = "Hood cowl" path= /obj/item/clothing/head/hoodcowl + +/datum/gear/head/canadian + name = "Canadian Mountie Hat" + path= /obj/item/clothing/head/canadian + +/datum/gear/head/ncrranger + name = "NCR Ranger Helmet" + path= /obj/item/clothing/head/ncr_ranger + + diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm index 333eef07c9..6a5c8432a1 100644 --- a/modular_citadel/code/modules/client/loadout/shoes.dm +++ b/modular_citadel/code/modules/client/loadout/shoes.dm @@ -190,6 +190,10 @@ name = "long puttees" path = /obj/item/clothing/shoes/putt +/datum/gear/shoes/putt/brown + name = "long puttees, tan" + path = /obj/item/clothing/shoes/putt/brown + /datum/gear/shoes/cowboy/alt name = "Alt Cowboy Boots" path = /obj/item/clothing/shoes/cowboy/alt diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 05cbd6a3c1..ea53cbcbdf 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -1856,6 +1856,11 @@ path = /obj/item/clothing/suit/toggle/labcoat/aurora/ashjacket subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS +/datum/gear/suit/aurora/britishjacket + name = "British Jacket" + path = /obj/item/clothing/suit/coat/coyote/british_jacket + subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS + /datum/gear/suit/aurora/robesuit name = "Green and Yellow Robe" path = /obj/item/clothing/suit/aurora/robesuit diff --git a/modular_coyote/code/flora_coyote.dm b/modular_coyote/code/flora_coyote.dm index f77e052fc8..707575fbe9 100644 --- a/modular_coyote/code/flora_coyote.dm +++ b/modular_coyote/code/flora_coyote.dm @@ -1134,13 +1134,13 @@ /obj/structure/flora/tree/cypress_tree name = "cypress tree" - icon = 'modular_coyote/icons/objects/trees.dmi' + icon = 'modular_coyote/icons/objects/cypress.dmi' icon_state = "cypress_tree" anchored = TRUE /obj/structure/flora/tree/rainforest_tree name = "rainforest tree" - icon = 'modular_coyote/icons/objects/trees.dmi' + icon = 'modular_coyote/icons/objects/cypress.dmi' icon_state = "rainforest_tree" anchored = TRUE diff --git a/modular_coyote/code/mob.dm b/modular_coyote/code/mob.dm index 5ecca3c5ba..23763f37f9 100644 --- a/modular_coyote/code/mob.dm +++ b/modular_coyote/code/mob.dm @@ -1492,3 +1492,69 @@ icon_state = "unicorn" icon_living = "unicorn" icon_dead = "unicorn_dead" + +//Ranger Creatures + +/mob/living/simple_animal/advanced/longjaw + name = "longjaw" + desc = "A spotted grey creature." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "longjaw" + icon_living = "longjaw" + icon_dead = "longjaw_dead" + +/mob/living/simple_animal/advanced/uttie + name = "utahraptor" + desc = "A dinosaur. Oh my." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "uttie" + icon_living = "uttie" + icon_dead = "uttie_dead" + +/mob/living/simple_animal/advanced/gorgon + name = "gorgon" + desc = "A dinosaur. Oh my." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "gorgon" + icon_living = "gorgon" + icon_dead = "gorgon_dead" + +/mob/living/simple_animal/advanced/rack_deer + name = "rack deer" + desc = "A strange type of deer." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "rack_deer" + icon_living = "rack_deer" + icon_dead = "rack_deer_dead" + +/mob/living/simple_animal/advanced/lightening + name = "lightening Raptor" + desc = "A very green raptor." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "lightening" + icon_living = "lightening" + icon_dead = "lightening_dead" + +/mob/living/simple_animal/advanced/hyena + name = "Hyena" + desc = "Cackle." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "hyena" + icon_living = "hyena" + icon_dead = "hyena_dead" + +/mob/living/simple_animal/advanced/saber_cat + name = "saber cat" + desc = "My kitty, what long teeth you have." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "saber_cat" + icon_living = "saber_cat" + icon_dead = "saber_cat_dead" + +/mob/living/simple_animal/advanced/malkia + name = "malkia" + desc = "A strange canine like being." + icon = 'modular_coyote/icons/mob/rangercritters.dmi' + icon_state = "malkia" + icon_living = "malkia" + icon_dead = "malkia_dead" diff --git a/modular_coyote/icons/mob/rangercritters.dmi b/modular_coyote/icons/mob/rangercritters.dmi new file mode 100644 index 0000000000..94e382b825 Binary files /dev/null and b/modular_coyote/icons/mob/rangercritters.dmi differ