From cd0aba3806195526adec053c6d1cc37b15f893d5 Mon Sep 17 00:00:00 2001 From: NPC1314 Date: Mon, 16 Dec 2024 01:37:43 +0100 Subject: [PATCH] dyeee --- _maps/map_files/stonehamlet/stonehamlet.dmm | 29 ++++---- code/__DEFINES/colors.dm | 8 ++- code/__DEFINES/jobs.dm | 8 +-- .../items/rogueweapons/melee/knives.dm | 4 +- code/game/objects/structures/dystation.dm | 31 +++++---- code/modules/clothing/rogueclothes/pants.dm | 10 +-- code/modules/clothing/rogueclothes/shirts.dm | 2 +- code/modules/clothing/rogueclothes/storage.dm | 2 + .../adventurer/types/pilgrim/weaver.dm | 5 +- .../jobs/job_types/roguetown/serfs/tailor.dm | 6 ++ code/modules/jobs/jobs.dm | 4 +- code/modules/roguetown/roguecrafting/items.dm | 64 +++++++----------- .../roguetown/roguecrafting/structure.dm | 12 ---- icons/roguetown/items/misc.dmi | Bin 44861 -> 45806 bytes modular/Neu_Farming/code/bin.dm | 5 +- 15 files changed, 87 insertions(+), 103 deletions(-) diff --git a/_maps/map_files/stonehamlet/stonehamlet.dmm b/_maps/map_files/stonehamlet/stonehamlet.dmm index 18abacc45e..865b6c49c7 100644 --- a/_maps/map_files/stonehamlet/stonehamlet.dmm +++ b/_maps/map_files/stonehamlet/stonehamlet.dmm @@ -3628,9 +3628,6 @@ /turf/open/floor/rogue/sandstone, /area/rogue/indoors/town/church/chapel) "dOs" = ( -/obj/machinery/light/rogue/torchholder{ - pixel_y = 32 - }, /obj/item/roguebin/water/gross, /turf/open/floor/rogue/twig, /area/rogue/indoors/town/shop) @@ -4628,13 +4625,6 @@ "eDh" = ( /turf/open/floor/rogue/ruinedwood/turned, /area/rogue/outdoors) -"eDs" = ( -/obj/structure/chair/wood/rogue/fancy{ - dir = 8; - icon_state = "chair1" - }, -/turf/open/floor/rogue/ruinedwood/spiralfade, -/area/rogue/indoors/town/shop) "eDG" = ( /obj/effect/decal/turfedge_neu{ dir = 6 @@ -5569,7 +5559,7 @@ "fsl" = ( /obj/item/rogueweapon/knife/dagger/steel/special, /obj/structure/closet/crate/chest/neu_iron, -/obj/item/rogueweapon/knife/dagger, +/obj/item/rogueweapon/mace/cudgel, /obj/machinery/light/rogue/torchholder/c{ pixel_y = -32 }, @@ -13920,10 +13910,7 @@ /turf/open/floor/rogue/dirt, /area/rogue/outdoors/exposed/under/basement) "nSX" = ( -/obj/structure/chair/wood/rogue/fancy{ - dir = 4; - icon_state = "chair1" - }, +/obj/structure/chair/wood/rogue/fancy, /turf/open/floor/rogue/ruinedwood/spiralfade, /area/rogue/indoors/town/shop) "nTd" = ( @@ -18090,6 +18077,9 @@ /obj/item/reagent_containers/food/snacks/rogue/crackerscooked{ pixel_y = 3 }, +/obj/machinery/light/rogue/torchholder{ + pixel_y = 32 + }, /turf/open/floor/rogue/twig, /area/rogue/indoors/town/shop) "rHl" = ( @@ -18523,7 +18513,12 @@ /obj/structure/table/wood{ icon_state = "tablewood1" }, -/obj/item/clothing/mask/cigarette/rollie/nicotine, +/obj/item/clothing/mask/cigarette/rollie/nicotine{ + pixel_x = 8 + }, +/obj/item/candle/yellow/lit/infinite{ + pixel_x = -9 + }, /turf/open/floor/rogue/twig, /area/rogue/indoors/town/shop) "sjL" = ( @@ -86179,7 +86174,7 @@ cGL pBo pwX wnB -eDs +nSX jDn mqm mqm diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 085f6c126a..8498f16bc8 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -90,7 +90,7 @@ #define CLOTHING_ROYAL_BLACK "#2f352f" #define CLOTHING_BOG_GREEN "#58793f" #define CLOTHING_ROYAL_TEAL "#249589" -#define CLOTHING_PEAR_YELLOW "#b5b004" +#define CLOTHING_PEAR_YELLOW "#a19d20" #define CLOTHING_CHALK_WHITE "#c7c0b5" @@ -99,8 +99,8 @@ #define CLOTHING_SOOT_BLACK "#4b4b50" #define CLOTHING_WINESTAIN_RED "#6b3737" -#define CLOTHING_PEASANT_BROWN "#705243" -#define CLOTHING_MUD_BROWN "#685542" +#define CLOTHING_PEASANT_BROWN "#574a43" +#define CLOTHING_MUD_BROWN "#57493a" #define CLOTHING_CHESTNUT "#5f3d21" #define CLOTHING_OLD_LEATHER "#473a30" #define CLOTHING_SPRING_GREEN "#435436" @@ -125,6 +125,8 @@ return CLOTHING_ROYAL_PURPLE if("Forest Green") return CLOTHING_FOREST_GREEN + if("Spring Green") + return CLOTHING_SPRING_GREEN if("Sky Blue") return CLOTHING_SKY_BLUE if("Mustard Yellow") diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index e340e7fa66..352b09cecd 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -133,10 +133,10 @@ #define FELDSHER (1<<4) #define INNKEEP (1<<5) #define COOK (1<<6) -#define NIGHTMAN (1<<7) -#define NITEMAIDEN (1<<8) -#define ALCHEMIST (1<<9) -#define TAILOR (1<<10) +#define TAILOR (1<<7) +#define NIGHTMAN (1<<8) +#define NITEMAIDEN (1<<9) +#define ALCHEMIST (1<<10) #define SCRIBE (1<<11) diff --git a/code/game/objects/items/rogueweapons/melee/knives.dm b/code/game/objects/items/rogueweapons/melee/knives.dm index 31d1591e30..18f79fe1f3 100644 --- a/code/game/objects/items/rogueweapons/melee/knives.dm +++ b/code/game/objects/items/rogueweapons/melee/knives.dm @@ -403,8 +403,8 @@ desc = "A tool favored by poor woodland inhabitants, easy to make, useful for skinning the flesh of beast and man alike." icon_state = "stone_knife" resistance_flags = FLAMMABLE // Weapon made mostly of wood - max_integrity = 30 - max_blade_int = 30 + max_integrity = 28 + max_blade_int = 28 wdefense = TERRIBLE_PARRY smeltresult = /obj/item/ash sellprice = 5 diff --git a/code/game/objects/structures/dystation.dm b/code/game/objects/structures/dystation.dm index 56f7c8c2cf..3d171bc2d4 100644 --- a/code/game/objects/structures/dystation.dm +++ b/code/game/objects/structures/dystation.dm @@ -42,32 +42,39 @@ "Ash Grey" ="#999999", "Chalk White" ="#c7c0b5", "Cream" ="#b0ae80", - "Blood Red" ="#770d0d", - "Plum Purple" ="#4b2265", + "Soot Black" ="#4b4b50", "Dark Ink" ="#372b2b", - "Forest Green" ="#3f8b24", - "Sky Blue" ="#1b3c7a", - "Mustard Yellow" ="#979044", - "Royal Black" ="#2f352f", + "Winestain Red" ="#6b3737", + "Blood Red" ="#770d0d", "Royal Red" ="#8f3636", "Royal Majenta" ="#822b52", + "Red Ochre" = "#6f2d28", + "Maroon" ="#672c0d", + "Salmon" ="#a56176", + "Russet" ="#733f18", + "Peasant Brown" ="#705243", + "Chestnut" ="#5f3d21", + "Bark Brown"="#685542", + "Mud Brown" ="#685542", + "Old Leather" ="#473a30", + "Spring Green" ="#435436", + "Forest Green" ="#3f8b24", "Bog Green" ="#58793f", "Mage Green" ="#759259", "Royal Teal" ="#249589", + "Berry Blue" ="#38455b", "Pear Yellow" ="#b5b004", "Mage Yellow" ="#d2bc2b", + "Mustard Yellow" ="#979044", + "Yellow Ochre" ="#9b7a02", "Fyritius Orange" ="#b47011", "Mage Orange" ="#ad5e29", "Royal Purple" ="#865c9c", + "Plum Purple" ="#4b2265", "Mage Blue" ="#4756d8", - - "Salmon" ="#a56176", - "Russet" ="#733f18", - "Yellow Ochre" ="#9b7a02", - "Red Ochre" = "#6f2d28", - "Maroon" ="#672c0d" + "Sky Blue" ="#1b3c7a", ) diff --git a/code/modules/clothing/rogueclothes/pants.dm b/code/modules/clothing/rogueclothes/pants.dm index 9bd3ea90df..11629c17c2 100644 --- a/code/modules/clothing/rogueclothes/pants.dm +++ b/code/modules/clothing/rogueclothes/pants.dm @@ -89,7 +89,7 @@ body_parts_covered = GROIN|LEG_RIGHT /obj/item/clothing/under/roguetown/tights/vagrant/Initialize() - color = pick("#6b5445", "#435436", "#704542", "#79763f") + color = pick(CLOTHING_MUD_BROWN, CLOTHING_OLD_LEATHER, CLOTHING_SPRING_GREEN, CLOTHING_BARK_BROWN, CLOTHING_SOOT_BLACK ) ..() /obj/item/clothing/under/roguetown/tights/sailor @@ -213,7 +213,7 @@ name = "leather trousers" desc = "Standard leather pants for hardy workers." icon_state = "leathertrou" - + armor = ARMOR_LEATHER_BAD prevent_crits = CUT_AND_MINOR_CRITS max_integrity = INTEGRITY_POOR @@ -226,7 +226,7 @@ sleeved = 'icons/roguetown/clothing/onmob/helpers/stonekeep_merc.dmi' detail_tag = "_detail" colorgrenz = TRUE - + armor = ARMOR_PADDED prevent_crits = MINOR_CRITICALS max_integrity = INTEGRITY_STANDARD @@ -281,11 +281,11 @@ name = "iron chain chausses" desc = "Chain mail chausses made of iron rings woven together, offering protection against cuts and stabs." smeltresult = /obj/item/ingot/iron - + armor = ARMOR_MAILLE_IRON max_integrity = INTEGRITY_STRONG //250 Integrity. prevent_crits = ALL_EXCEPT_BLUNT_AND_STAB //Non-riveted, iron chain can be broken apart with a powerful thrust. - + //.................................................................................................................................. /*---------------\ diff --git a/code/modules/clothing/rogueclothes/shirts.dm b/code/modules/clothing/rogueclothes/shirts.dm index 7bc80c41e7..747771dd27 100644 --- a/code/modules/clothing/rogueclothes/shirts.dm +++ b/code/modules/clothing/rogueclothes/shirts.dm @@ -110,7 +110,7 @@ body_parts_covered = CHEST|ARM_RIGHT|VITALS /obj/item/clothing/suit/roguetown/shirt/undershirt/vagrant/Initialize() - color = pick(CLOTHING_MUD_BROWN, CLOTHING_PEAR_YELLOW, CLOTHING_BOG_GREEN, CLOTHING_BARK_BROWN ) + color = pick(CLOTHING_MUD_BROWN, CLOTHING_OLD_LEATHER, CLOTHING_SPRING_GREEN, CLOTHING_BARK_BROWN ) ..() /obj/item/clothing/suit/roguetown/shirt/shortshirt diff --git a/code/modules/clothing/rogueclothes/storage.dm b/code/modules/clothing/rogueclothes/storage.dm index 96d8e70636..feea63bf68 100644 --- a/code/modules/clothing/rogueclothes/storage.dm +++ b/code/modules/clothing/rogueclothes/storage.dm @@ -141,6 +141,8 @@ /obj/item/storage/belt/rogue/leather/cloth/lady color = "#575160" +/obj/item/storage/belt/rogue/leather/cloth/lady/Initialize() + new /obj/item/needle(src) /obj/item/storage/belt/rogue/leather/cloth/tailor color = "#756889" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm index 3361e843b1..a263bad8d7 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm @@ -20,7 +20,6 @@ H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) head = /obj/item/clothing/head/roguetown/fashionablehat belt = /obj/item/storage/belt/rogue/leather/cloth/lady pants = /obj/item/clothing/under/roguetown/tights/random @@ -28,10 +27,10 @@ backl = /obj/item/storage/backpack/rogue/satchel neck = /obj/item/storage/belt/rogue/pouch/coins/mid shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt - beltr = /obj/item/rogueweapon/knife/dagger + beltr = /obj/item/rogueweapon/knife/hunting cloak = /obj/item/clothing/cloak/raincloak/furcloak beltl = /obj/item/reagent_containers/glass/bottle/waterskin/half - backpack_contents = list(/obj/item/natural/bundle/cloth/partial = 1, /obj/item/needle = 1, /obj/item/natural/bundle/fibers = 1, /obj/item/natural/fur/volf = 1) + backpack_contents = list(/obj/item/natural/bundle/cloth/partial = 1, /obj/item/cheap_dyes = 1, /obj/item/natural/bundle/fibers = 1, /obj/item/natural/fur/volf = 1) H.change_stat("intelligence", 2) H.change_stat("speed", 2) H.change_stat("perception", 1) diff --git a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm index 6b5325edc7..5f7e7df9c8 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm @@ -61,3 +61,9 @@ desc = "Adding these to a dye bin will let you use even the rarest, most expensive dyes." icon = 'icons/roguetown/items/misc.dmi' icon_state = "luxury_dyes" + +/obj/item/cheap_dyes + name = "cheap dyes" + desc = "Adding these to a wooden bin will let you use it to dye clothing." + icon = 'icons/roguetown/items/misc.dmi' + icon_state = "cheap_dyes" diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 9b28f4e357..d83f9c7159 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -103,6 +103,8 @@ GLOBAL_LIST_INIT(towner_positions, list( "Feldsher", "Innkeep", "Tailor", + "Niteman", + "Nitemaiden", "Alchemist", "Scribe", )) @@ -116,8 +118,6 @@ GLOBAL_LIST_INIT(peasant_positions, list( "Hunter", "Fisher", "Towner", - "Niteman", - "Nitemaiden", "Prisoner", "Beggar", diff --git a/code/modules/roguetown/roguecrafting/items.dm b/code/modules/roguetown/roguecrafting/items.dm index 1d57ec8e64..ff48676dfc 100644 --- a/code/modules/roguetown/roguecrafting/items.dm +++ b/code/modules/roguetown/roguecrafting/items.dm @@ -123,6 +123,29 @@ verbage = "braid" verbage_tp = "braids" +/datum/crafting_recipe/roguetown/cheapdyes + name = "cheap dyes" + result = /obj/item/cheap_dyes + reqs = list( + /obj/item/reagent_containers/food/snacks/produce/jacksberry = 1, + /obj/item/natural/dirtclod = 1) + subtype_reqs = TRUE // so you can use any subtype of the berries and swampweed + +/datum/crafting_recipe/roguetown/cheapdyes/alt + reqs = list( + /obj/item/reagent_containers/food/snacks/produce/swampweed = 1, + /obj/item/natural/dirtclod = 1) + +/datum/crafting_recipe/roguetown/cheapdyes/alto + reqs = list( + /obj/item/reagent_containers/food/snacks/produce/swampweed = 1, + /obj/item/ash = 1) + +/datum/crafting_recipe/roguetown/cheapdyes/altest + reqs = list( + /obj/item/reagent_containers/food/snacks/produce/jacksberry = 1, + /obj/item/ash = 1) + /* /datum/crafting_recipe/roguetown/net name = "net" @@ -255,48 +278,9 @@ /obj/item/grown/log/tree/stick = 3, /obj/item/natural/fibers = 2) craftdiff = 1 -/* -/datum/crafting_recipe/roguetown/plankaxe - name = "crude wooden plank" - result = list(/obj/item/natural/plank) - reqs = list(/obj/item/grown/log/tree/small = 1) - tools = list(/obj/item/rogueweapon/axe) - skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 - verbage = "cut" - verbage_tp = "cuts" -/datum/crafting_recipe/roguetown/plank - name = "wooden plank" - result = list(/obj/item/natural/plank,/obj/item/natural/plank) - reqs = list(/obj/item/grown/log/tree/small = 1) - tools = list(/obj/item/rogueweapon/handsaw) - skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 - verbage = "saw" - verbage_tp = "saws" - -/datum/crafting_recipe/roguetown/plankshort - name = "short wooden plank" - result = list(/obj/item/natural/plankshort, /obj/item/natural/plankshort) - reqs = list(/obj/item/natural/plank = 1) - tools = list(/obj/item/rogueweapon/handsaw) - skillcraft = /datum/skill/craft/carpentry - craftdiff = 1 - verbage = "saw" - verbage_tp = "saws" -/datum/crafting_recipe/roguetown/stoneblock - name = "stone block" - result = list(/obj/item/natural/stoneblock) - reqs = list(/obj/item/natural/stone = 1) - tools = list(/obj/item/rogueweapon/chisel) - skillcraft = /datum/skill/craft/masonry - craftdiff = 1 - verbage = "chisel" - verbage_tp = "chisels" -*/ -/datum/crafting_recipe/roguetown/stoneblocprimitive +/datum/crafting_recipe/roguetown/stoneblocprimitive // replace with intent coded strike at some point TO DO name = "crude stone block" result = list(/obj/item/natural/stoneblock) reqs = list(/obj/item/natural/stone = 1) diff --git a/code/modules/roguetown/roguecrafting/structure.dm b/code/modules/roguetown/roguecrafting/structure.dm index b26b594fec..eaf4899fd1 100644 --- a/code/modules/roguetown/roguecrafting/structure.dm +++ b/code/modules/roguetown/roguecrafting/structure.dm @@ -22,18 +22,6 @@ /obj/item/chair/stool/bar/rogue/crafted sellprice = 6 -/datum/crafting_recipe/roguetown/structure/dye_bin - name = "dye bin" - result = /obj/machinery/simple_dye_bin - reqs = list(/obj/item/grown/log/tree/small = 1, - /obj/item/reagent_containers/food/snacks/produce/jacksberry = 1, - /obj/item/natural/dirtclod = 1) - verbage = "construct" - verbage_tp = "carpents" - craftsound = 'sound/foley/Building-01.ogg' - skillcraft = /datum/skill/craft/carpentry - subtype_reqs = TRUE // so you can use any subtype of the berries and swampweed - /* === SKILL LEVEL 1 === */ /datum/crafting_recipe/roguetown/structure/chair diff --git a/icons/roguetown/items/misc.dmi b/icons/roguetown/items/misc.dmi index e5966ac30311c0fa691bad8dc9d6724d1d2e292d..bf1f10686f53a7c490deed1aea811d416adad4cc 100644 GIT binary patch delta 8777 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 JN@>%O{|CA$c$5GD delta 7824 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 P>Ug4Ip#DwOKKlOvi-#$2 diff --git a/modular/Neu_Farming/code/bin.dm b/modular/Neu_Farming/code/bin.dm index 77bba54d6a..6b814aa29c 100644 --- a/modular/Neu_Farming/code/bin.dm +++ b/modular/Neu_Farming/code/bin.dm @@ -144,10 +144,11 @@ return FALSE /obj/item/roguebin/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/ash) || istype(I, /obj/item/natural/dirtclod) || istype(I, /obj/item/reagent_containers/food/snacks/produce/jacksberry)) + if(istype(I, /obj/item/cheap_dyes)) + playsound(src, "bubbles", 50, 1) if(do_after(user,3 SECONDS, target = src)) qdel(I) - user.visible_message("[user] mixed in some dye into [src].") + user.visible_message("[user] adds dye to [src].") new /obj/machinery/simple_dye_bin(src.loc) qdel(src) return