Hearthkin Tribal Updates, Ashwalkers Exclusive Clothing (#2379)

* tribal conga part two * Update modular_nova/modules/icemoon_additions/code/icecat_recipes.dm * Update modular_nova/modules/primitive_structures/code/windows.dm * Apply suggestions from code review --------- Co-authored-by: MortoSasye <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Mar 12, 2024 · 55d6389 · 55d6389
1 parent 783b632
commit 55d6389
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 24 deletions.
diff --git a/modular_nova/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm b/modular_nova/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -86,8 +86,9 @@ GLOBAL_LIST_INIT(skyrat_wood_recipes, list(
 	new/datum/stack_recipe("storage barrel", /obj/structure/closet/crate/wooden/storage_barrel, 4, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = FALSE, category = CAT_STRUCTURE),
 	new/datum/stack_recipe("worm barrel", /obj/structure/wormfarm, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
 	new/datum/stack_recipe("gutlunch trough", /obj/structure/ore_container/gutlunch_trough, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
-	new/datum/stack_recipe("sturdy wooden fence", /obj/structure/railing/wooden_fencing, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
-	new/datum/stack_recipe("sturdy wooden fence gate", /obj/structure/railing/wooden_fencing/gate, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
+	new/datum/stack_recipe("sturdy wooden fence", /obj/structure/railing/wooden_fencing, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
+	new/datum/stack_recipe("sturdy wooden fence gate", /obj/structure/railing/wooden_fencing/gate, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
+	new/datum/stack_recipe("large wooden gate", /obj/structure/mineral_door/wood/large_gate, 10, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
 	new/datum/stack_recipe("wooden bowl", /obj/item/reagent_containers/cup/bowl/wood_bowl, 3, time = 2 SECONDS, check_density = FALSE, category = CAT_TOOLS),
 ))
 

diff --git a/modular_nova/master_files/code/modules/antagonists/_common/antag_datum.dm b/modular_nova/master_files/code/modules/antagonists/_common/antag_datum.dm
@@ -21,6 +21,11 @@
 		/datum/crafting_recipe/boneaxe,
 		/datum/crafting_recipe/bonespear,
 		/datum/crafting_recipe/bonedagger,
+		/datum/crafting_recipe/ash_recipe/ash_headdress,
+		/datum/crafting_recipe/ash_recipe/ash_headdress/winged,
+		/datum/crafting_recipe/ash_recipe/ash_robes,
+		/datum/crafting_recipe/ash_recipe/ash_plates,
+		/datum/crafting_recipe/ash_recipe/ash_plates/decorated,
 	)
 
 /datum/antagonist/heretic

diff --git a/modular_nova/modules/ashwalkers/code/clothing/ash_armour.dm b/modular_nova/modules/ashwalkers/code/clothing/ash_armour.dm
@@ -51,6 +51,9 @@
 	result = /obj/item/clothing/head/ash_headdress
 	category = CAT_CLOTHING
 
+	//recipe given to ashwalkers as part of their spawner/team setting
+	always_available = FALSE
+
 /obj/item/clothing/head/ash_headdress/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/armor_plate, 2, /obj/item/stack/sheet/animalhide/goliath_hide, list(MELEE = 5, BULLET = 2, LASER = 2))
@@ -63,6 +66,8 @@
 	name = "Winged Ash Headdress"
 	result = /obj/item/clothing/head/ash_headdress/winged
 
+	always_available = FALSE
+
 /obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes
 	name = "ash robes"
 	desc = "A set of hand-made robes. The bones still seem to have some muscle still attached."
@@ -82,6 +87,8 @@
 	result = /obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes
 	category = CAT_CLOTHING
 
+	always_available = FALSE
+
 /obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/armor_plate, 2, /obj/item/stack/sheet/animalhide/goliath_hide, list(MELEE = 5, BULLET = 2, LASER = 2))
@@ -106,6 +113,8 @@
 	result = /obj/item/clothing/suit/ash_plates
 	category = CAT_CLOTHING
 
+	always_available = FALSE
+
 /obj/item/clothing/suit/ash_plates/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/armor_plate, 2, /obj/item/stack/sheet/animalhide/goliath_hide, list(MELEE = 5, BULLET = 2, LASER = 2))
@@ -119,6 +128,8 @@
 	result = /obj/item/clothing/suit/ash_plates/decorated
 	category = CAT_CLOTHING
 
+	always_available = FALSE
+
 /obj/item/clothing/shoes/bone_greaves
 	name = "bone greaves"
 	desc = "For when you're expecting to step on spiky things. Offers modest protection to your feet."

diff --git a/modular_nova/modules/company_imports/code/objects/jarnsmiour/special_metals.dm b/modular_nova/modules/company_imports/code/objects/jarnsmiour/special_metals.dm
@@ -19,7 +19,7 @@
 	desc = "Cobalt-blue metal that might actually just be cobalt."
 	singular_name = "cobolterium bar"
 	icon = 'modular_nova/modules/company_imports/icons/special_metals_stack.dmi'
-	icon_state = "dracula-rapping"
+	icon_state = "precious-metals"
 	material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR
 	mats_per_unit = list(/datum/material/cobolterium = SHEET_MATERIAL_AMOUNT)
 	merge_type = /obj/item/stack/sheet/cobolterium
@@ -48,7 +48,7 @@
 	desc = "Copper colored metal that might actually just be copper."
 	singular_name = "copporcitite bar"
 	icon = 'modular_nova/modules/company_imports/icons/special_metals_stack.dmi'
-	icon_state = "dracula-rapping"
+	icon_state = "precious-metals"
 	material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR
 	mats_per_unit = list(/datum/material/copporcitite = SHEET_MATERIAL_AMOUNT)
 	merge_type = /obj/item/stack/sheet/copporcitite
@@ -77,7 +77,7 @@
 	desc = "Heavily blued, silver colored metal."
 	singular_name = "tinumium bar"
 	icon = 'modular_nova/modules/company_imports/icons/special_metals_stack.dmi'
-	icon_state = "dracula-rapping"
+	icon_state = "precious-metals"
 	material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR
 	mats_per_unit = list(/datum/material/tinumium = SHEET_MATERIAL_AMOUNT )
 	merge_type = /obj/item/stack/sheet/tinumium
@@ -106,7 +106,7 @@
 	desc = "Brassy-yellow metal that might actually just be brass."
 	singular_name = "brussite bar"
 	icon = 'modular_nova/modules/company_imports/icons/special_metals_stack.dmi'
-	icon_state = "dracula-rapping"
+	icon_state = "precious-metals"
 	material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR
 	mats_per_unit = list(/datum/material/brussite = SHEET_MATERIAL_AMOUNT )
 	merge_type = /obj/item/stack/sheet/brussite

diff --git a/modular_nova/modules/company_imports/icons/special_metals_stack.dmi b/modular_nova/modules/company_imports/icons/special_metals_stack.dmi
diff --git a/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm b/modular_nova/modules/icemoon_additions/code/icecat_recipes.dm
@@ -64,3 +64,28 @@
 	)
 
 	result = /obj/item/anointing_oil
+
+/obj/item/clothing/suit/armor/handcrafted_hearthkin_armor
+	name = "handcrafted hearthkin armor"
+	desc = "An armor obviously crafted by the expertise of a hearthkin. It has leather shoulder pads and a chain mail underneath."
+	icon_state = "chained_leather_armor"
+	icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
+	worn_icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
+	resistance_flags = FIRE_PROOF
+	body_parts_covered = GROIN|CHEST
+	obj_flags_nova = ANVIL_REPAIR
+	armor_type = /datum/armor/armor_forging_plate_armor
+
+/datum/crafting_recipe/handcrafted_hearthkin_armor
+	name = "Handcrafted Hearthkin Armor"
+	category = CAT_CLOTHING
+
+	//recipe given to icecats as part of their spawner/team setting
+	always_available = FALSE
+
+	reqs = list(
+		/obj/item/forging/complete/chain = 4,
+		/obj/item/stack/sheet/leather = 2,
+	)
+
+	result = /obj/item/clothing/suit/armor/handcrafted_hearthkin_armor
diff --git a/modular_nova/modules/primitive_catgirls/code/clothing.dm b/modular_nova/modules/primitive_catgirls/code/clothing.dm
@@ -30,7 +30,7 @@
 
 /obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress
 	name = "tailored dress"
-	desc = "A handmade dress, tailored to one's"
+	desc = "A handmade dress, tailored to fit perfectly to its wearer's body measurements."
 	icon_state = "tailored_dress"
 	icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
 	worn_icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
@@ -41,6 +41,19 @@
 	flags_1 = IS_PLAYER_COLORABLE_1
 	has_sensor = FALSE
 
+/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic
+	name = "handmade tunic"
+	desc = "A simple garment that reaches from the shoulders to above the knee. This one has a belt to secure it."
+	icon_state = "tunic"
+	icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
+	worn_icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
+	body_parts_covered = GROIN|CHEST
+	greyscale_config = /datum/greyscale_config/primitive_catgirl_tunic
+	greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_tunic/worn
+	greyscale_colors = "#cec8bf#faece4#594032"
+	flags_1 = IS_PLAYER_COLORABLE_1
+	has_sensor = FALSE
+
 // Hands
 
 /obj/item/clothing/gloves/fingerless/primitive_catgirl_armwraps
@@ -84,21 +97,6 @@
 	greyscale_colors = "#594032#cec8bf"
 	flags_1 = IS_PLAYER_COLORABLE_1
 
-/obj/item/clothing/suit/jacket/primitive_catgirl_tunic
-	name = "handmade tunic"
-	desc = "A simple garment, that reaches from the shoulders to above the knee. This one has a belt to secure it."
-	icon_state = "tunic"
-	icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
-	worn_icon = 'modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi'
-	body_parts_covered = CHEST
-	cold_protection = CHEST
-	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
-	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
-	greyscale_config = /datum/greyscale_config/primitive_catgirl_tunic
-	greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_tunic/worn
-	greyscale_colors = "#cec8bf#faece4#594032"
-	flags_1 = IS_PLAYER_COLORABLE_1
-
 /obj/item/clothing/suit/apron/chef/colorable_apron/primitive_catgirl_leather
 	greyscale_colors = "#594032"
 
@@ -171,7 +169,6 @@
 	greyscale_colors = "#f1f6ff#364660"
 	w_class = WEIGHT_CLASS_TINY
 	flags_1 = IS_PLAYER_COLORABLE_1
-	actions_types = list(/datum/action/item_action/adjust)
 
 // Misc Items
 

diff --git a/modular_nova/modules/primitive_catgirls/code/clothing_vendor.dm b/modular_nova/modules/primitive_catgirls/code/clothing_vendor.dm
@@ -12,8 +12,8 @@
 	products = list(
 		/obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps = 15,
 		/obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress = 15,
+		/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic = 15,
 		/obj/item/clothing/suit/jacket/primitive_catgirl_coat = 15,
-		/obj/item/clothing/suit/jacket/primitive_catgirl_tunic = 15,
 		/obj/item/clothing/gloves/fingerless/primitive_catgirl_armwraps = 15,
 		/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots = 15,
 		/obj/item/clothing/gloves/fingerless/primitive_catgirl_gauntlets = 10,

diff --git a/modular_nova/modules/primitive_catgirls/code/spawner.dm b/modular_nova/modules/primitive_catgirls/code/spawner.dm
@@ -291,6 +291,7 @@
 		/datum/crafting_recipe/bonespear,
 		/datum/crafting_recipe/bonedagger,
 		/datum/crafting_recipe/anointing_oil,
+		/datum/crafting_recipe/handcrafted_hearthkin_armor,
 	)
 
 /datum/antagonist/primitive_catgirl/Destroy()

diff --git a/modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi b/modular_nova/modules/primitive_catgirls/icons/clothing_greyscale.dmi
diff --git a/modular_nova/modules/primitive_structures/code/windows.dm b/modular_nova/modules/primitive_structures/code/windows.dm
@@ -8,3 +8,13 @@
 	can_be_unanchored = FALSE
 	fulltile = TRUE
 	flags_1 = PREVENT_CLICK_UNDER_1
+
+/datum/crafting_recipe/green_glass_pane
+	name = "green glass window"
+	result = /obj/structure/window/green_glass_pane
+	time = 0.2 SECONDS
+	reqs = list(
+		/datum/reagent/iron = 5,
+		/obj/item/stack/sheet/glass = 2,
+	)
+	category = CAT_STRUCTURE