Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
@Catalaria
Catalaria committed Dec 18, 2024
1 parent ea03e7d commit b5570bc
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 107 deletions.
35 changes: 0 additions & 35 deletions code/modules/clothing/rogueclothes/pants.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,41 +322,6 @@
max_integrity = INTEGRITY_STRONGER //350 Integrity, middle ground between bulky chestpieces and peripheral pieces.
prevent_crits = ALL_EXCEPT_STAB

/obj/item/clothing/under/roguetown/loincloth
name = "loincloth"
desc = "Protects your modesty, but not much else."
icon_state = "loincloth"
item_state = "loincloth"
// adjustable = CAN_CADJUST
r_sleeve_status = SLEEVE_NOMOD
l_sleeve_status = SLEEVE_NOMOD

/obj/item/clothing/under/roguetown/loincloth/brown
color = CLOTHING_BROWN

/obj/item/clothing/under/roguetown/loincloth/pink
color = "#b98ae3"

/obj/item/clothing/under/roguetown/grenzelpants
name = "grenzelhoftian paumpers"
desc = "Padded pants for extra comfort and protection, adorned in vibrant colors."
icon_state = "grenzelpants"
item_state = "grenzelpants"
sleeved = 'icons/roguetown/clothing/onmob/helpers/stonekeep_merc.dmi'
detail_tag = "_detail"
armor = list("melee" = 15, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
prevent_crits = list(BCLASS_BITE, BCLASS_LASHING, BCLASS_TWIST)
colorgrenz = TRUE

/obj/item/clothing/under/roguetown/grenzelpants/update_icon()
cut_overlays()
if(get_detail_tag())
var/mutable_appearance/pic = mutable_appearance(icon(icon, "[icon_state][detail_tag]"))
pic.appearance_flags = RESET_COLOR
if(get_detail_color())
pic.color = get_detail_color()
add_overlay(pic)


///////////////////////////////////////////////////////////////////
// Part of Kaizoku project. Usage ONLY for Stonekeep/Warmonger, //
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/rogueclothes/wrists.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@

/obj/item/clothing/wrists/roguetown/shrinekeeper
slot_flags = ITEM_SLOT_WRISTS
name = "purificators"
desc = "Blessed gauntlets for those who believes they can punch spirits."
icon = 'icons/roguetown/kaizoku/clothingicon/wrists.dmi'
mob_overlay_icon = 'icons/roguetown/kaizoku/clothing/wrists.dmi'
sleeved = 'icons/roguetown/kaizoku/clothing/wrists.dmi'
Expand Down
30 changes: 9 additions & 21 deletions code/modules/roguetown/roguecrafting/leather.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,24 @@
result = list(/obj/item/storage/belt/rogue/pouch)

/datum/crafting_recipe/roguetown/leather/gloves
name = "leather gloves"
name = "leather gloves {ip}"
result = /obj/item/clothing/gloves/roguetown/leather
name = "leather gloves (x2){ip}"
result = list(/obj/item/clothing/gloves/roguetown/leather,
/obj/item/clothing/gloves/roguetown/leather)
req_antikaizoku = TRUE


/datum/crafting_recipe/roguetown/leather/bracers
name = "leather bracers"
name = "leather bracers {ip}"
result = /obj/item/clothing/wrists/roguetown/bracers/leather
name = "leather bracers (x2){ip}"
result = list(/obj/item/clothing/wrists/roguetown/bracers/leather,
/obj/item/clothing/wrists/roguetown/bracers/leather)
req_antikaizoku = TRUE


/datum/crafting_recipe/roguetown/leather/pants
name = "leather pants {ip}"
result = list(/obj/item/clothing/under/roguetown/trou/leather)
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/leather/shoes
name = "leather shoes"
name = "leather shoes {ip}"
result = /obj/item/clothing/shoes/roguetown/simpleshoes
name = "leather shoes (x2){ip}"
result = list(/obj/item/clothing/shoes/roguetown/simpleshoes,
/obj/item/clothing/shoes/roguetown/simpleshoes,)
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/leather/boots
Expand All @@ -69,16 +61,14 @@
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/leather/hood
name = "leather hood"
name = "leather hood {ip}"
result = /obj/item/clothing/head/roguetown/roguehood/brown
reqs = list(/obj/item/natural/fur = 1)

/datum/crafting_recipe/roguetown/leather/papakha
name = "papakha hat"
result = /obj/item/clothing/head/roguetown/papakha
reqs = list(/obj/item/natural/fur = 1)
name = "leather hood {ip}"
result = /obj/item/clothing/head/roguetown/roguehood
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/leather/cloak
name = "leather cloak"
Expand Down Expand Up @@ -145,8 +135,7 @@
craftdiff = 1

/datum/crafting_recipe/roguetown/leather/heavygloves
name = "fur-lined gloves"
name = "heavy leather gloves {ip}"
name = "fur-lined gloves {ip}"
result = /obj/item/clothing/gloves/roguetown/angle
reqs = list(/obj/item/natural/hide = 1,
/obj/item/natural/fur = 1)
Expand Down Expand Up @@ -190,8 +179,7 @@
craftdiff = 2

/datum/crafting_recipe/roguetown/leather/hidearmor
name = "fur-lined armor"
name = "hide armor {ip}"
name = "fur-lined armor {ip}"
result = /obj/item/clothing/suit/roguetown/armor/leather/hide
reqs = list(/obj/item/natural/hide = 2,
/obj/item/natural/fur = 1)
Expand Down
61 changes: 10 additions & 51 deletions code/modules/roguetown/roguecrafting/sewing.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,15 @@
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/shortshirt
name = "cloth short shirt"
result = list(/obj/item/clothing/suit/roguetown/shirt/shortshirt/uncolored)
name = "cloth short shirt {ip}"
result = list(/obj/item/clothing/suit/roguetown/shirt/shortshirt)
result = list(/obj/item/clothing/suit/roguetown/shirt/shortshirt/uncolored)
reqs = list(/obj/item/natural/cloth = 1,
/obj/item/natural/fibers = 1)
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/clothshirt
name = "cloth shirt"
result = list(/obj/item/clothing/suit/roguetown/shirt/undershirt/uncolored)
name = "cloth shirt {ip}"
result = list(/obj/item/clothing/suit/roguetown/shirt/undershirt)
result = list(/obj/item/clothing/suit/roguetown/shirt/undershirt/uncolored)
reqs = list(/obj/item/natural/cloth = 2,
/obj/item/natural/fibers = 1)
req_antikaizoku = TRUE
Expand All @@ -84,10 +80,8 @@
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/clothtights
name = "cloth tights"
result = list(/obj/item/clothing/under/roguetown/tights/uncolored)
name = "cloth tights {ip}"
result = list(/obj/item/clothing/under/roguetown/tights)
result = list(/obj/item/clothing/under/roguetown/tights/uncolored)
reqs = list(/obj/item/natural/cloth = 2,
/obj/item/natural/fibers = 1)
req_antikaizoku = TRUE
Expand Down Expand Up @@ -126,15 +120,9 @@
name = "cloth anklet"
result = list(/obj/item/clothing/shoes/roguetown/boots/clothlinedanklets)

/datum/crafting_recipe/roguetown/sewing/strawhat
name = "crude straw hat"
result = list(/obj/item/clothing/head/roguetown/strawhat)
reqs = list(/obj/item/natural/fibers = 3)

/datum/crafting_recipe/roguetown/sewing/fisherhat
name = "straw fisher hat"
result = list(/obj/item/clothing/head/roguetown/fisherhat)
reqs = list(/obj/item/natural/fibers = 3)
reqs = list(/obj/item/natural/fibers = 1, /obj/item/natural/cloth = 1)
tools = list(/obj/item/needle)
req_antikaizoku = TRUE
Expand All @@ -160,22 +148,12 @@

/*========= SKILL LEVEL: 1 REQUIRED ==========*/


/datum/crafting_recipe/roguetown/sewing/stripedtunic
name = "striped tunic"
name = "striped tunic {ip}"
result = list(/obj/item/clothing/suit/roguetown/armor/gambeson/light/striped)
/datum/crafting_recipe/roguetown/sewing/fisherhat
name = "straw fisher hat {ip}"
result = list(/obj/item/clothing/head/roguetown/fisherhat)
reqs = list(/obj/item/natural/fibers = 3)
craftdiff = 1
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/sack
name = "sack hood"
result = list(/obj/item/clothing/head/roguetown/menacing)
reqs = list(/obj/item/natural/cloth = 3,)
craftdiff = 1

/datum/crafting_recipe/roguetown/sewing/pcoif
name = "cloth coif"
result = list(/obj/item/clothing/neck/roguetown/coif/cloth)
Expand Down Expand Up @@ -348,9 +326,12 @@
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/fashionablehat
name = "fashionable hat"
name = "fashionable hat {ip}"
result = /obj/item/clothing/head/roguetown/fashionablehat
reqs = list(/obj/item/natural/fibers = 1, /obj/item/natural/cloth = 2, /obj/item/natural/feather = 1)
craftdiff = 4
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/fancyhat
name = "fancy hat {ip}"
result = list(/obj/item/clothing/head/roguetown/fancyhat)
Expand All @@ -360,9 +341,7 @@
req_antikaizoku = TRUE

/datum/crafting_recipe/roguetown/sewing/plumedhat
name = "plumed hat"
/datum/crafting_recipe/roguetown/sewing/bardhat
name = "bard hat {ip}"
name = "plumed hat {ip}"
result = list(/obj/item/clothing/head/roguetown/bardhat)
reqs = list(/obj/item/natural/fibers = 1, /obj/item/natural/cloth = 2, /obj/item/natural/feather = 1)
craftdiff = 4
Expand All @@ -376,16 +355,6 @@
always_availible = FALSE
craftdiff = 1

/*.............. recipes requiring skill 5 ..............*/

/datum/crafting_recipe/roguetown/sewing/lordcloak
name = "lordly cloak {ip}"
result = list(/obj/item/clothing/cloak/lordcloak)
reqs = list(/obj/item/natural/fur = 2,
/obj/item/natural/hide = 4)
craftdiff = 4
req_antikaizoku = TRUE

//////////////////////////////////////////
// Fogislander Cultured Crafting Area, //
//////////////////////////////////////////
Expand Down Expand Up @@ -624,13 +593,3 @@
/obj/item/natural/fibers = 3)
craftdiff = 4
req_kaizoku = TRUE

/*.............. recipes requiring skill 5 ..............*/

/datum/crafting_recipe/roguetown/sewing/heartfeltcloak
name = "heartfelt lord cloak {fl}"
result = list(/obj/item/clothing/cloak/newheartfelt)
reqs = list(/obj/item/natural/fur = 2,
/obj/item/natural/hide = 4)
craftdiff = 4
req_kaizoku = TRUE

0 comments on commit b5570bc

Please sign in to comment.