Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Armor #796

Closed
wants to merge 4 commits into from
Closed

Armor #796

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions code/modules/clothing/rogueclothes/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@
anvilrepair = /datum/skill/craft/armorsmithing
sellprice = 20

/obj/item/clothing/suit/roguetown/armor/chainmail/bogarmor
name = "boggard's hauberk"
icon_state = "bogarmor"
item_state = "bogarmor"
sleeved = 'icons/roguetown/clothing/onmob/armor.dmi'
desc = "Chain mail mixed with plant fibres, swampweed, mud and other found flora - a favorite among bandits and ambushers alike, if you can stand the occasional crawling on your skin."
body_parts_covered = CHEST|GROIN|VITALS
armor = list("melee" = 60, "bullet" = 80, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
armor_class = ARMOR_CLASS_LIGHT
smeltresult = /obj/item/ingot/iron
anvilrepair = /datum/skill/craft/armorsmithing
sellprice = 20

/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk
slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_SHIRT
name = "hauberk"
Expand Down
119 changes: 119 additions & 0 deletions code/modules/clothing/rogueclothes/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,14 @@
flags_inv = HIDEEARS
max_integrity = 250 // Covers less, so less overall integrity

/obj/item/clothing/head/roguetown/helmet/slitkettle
name = "kettle helm"
desc = "A helmet with slits for peeping, a good choice for the paranoid."
icon_state = "slitkettle"
body_parts_covered = HEAD|HAIR
flags_inv = HIDEEARS
max_integrity = 250

/obj/item/clothing/head/roguetown/helmet/sallet
name = "sallet"
icon_state = "sallet"
Expand All @@ -476,6 +484,21 @@
max_integrity = 300
sellprice = 35

//Reskinned Sallet
/obj/item/clothing/head/roguetown/helmet/halfvisor
name = "halfvisor helmet"
icon_state = "halfvisor"
item_state = "halfvisor"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
desc = "A pointed helmet which protcts the sides and top of the head as well as the nose."
smeltresult = /obj/item/ingot/steel
body_parts_covered = HEAD|HAIR|EARS|NOSE
flags_inv = HIDEEARS
max_integrity = 300
sellprice = 35

// Unique, therefore superb.
/obj/item/clothing/head/roguetown/helmet/sallet/elven
desc = "A steel helmet with a thin gold plating designed for Elven woodland guardians."
Expand Down Expand Up @@ -617,6 +640,22 @@
block2add = FOV_RIGHT|FOV_LEFT
sellprice = 90

//Just a Hounskull reskin
/obj/item/clothing/head/roguetown/helmet/visored/klappvisor
name = "klappvisor helmet"
desc = "A bascinet with a mounted pivot to protect the face by deflecting blows on its conical surface, \
highly favored by knights of great renown. Its visor can be flipped over for higher visibility \
at the cost of eye protection."
icon_state = "klappvisor"
item_state = "klappvisor"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
emote_environment = 3
armor = list("melee" = 100, "bullet" = 80, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
block2add = FOV_RIGHT|FOV_LEFT
sellprice = 90

// Entering big boy steel territory, high end gear
/obj/item/clothing/head/roguetown/helmet/visored/knight
name = "knight's helmet"
Expand Down Expand Up @@ -700,6 +739,31 @@
smeltresult = /obj/item/ingot/iron
max_integrity = 200 // shitty rusted iron

/obj/item/clothing/head/roguetown/helmet/heavy/astratasunhelm
name = "gilded helmet"
desc = "A bucket helmet topped with a decorative crest representing the sun."
icon_state = "astratasunhelmet"
item_state = "astratasunhelmet"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
emote_environment = 3
prevent_crits = list(BCLASS_CUT, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_STAB, BCLASS_TWIST)
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
block2add = FOV_RIGHT|FOV_LEFT
smeltresult = /obj/item/ingot/steel

/obj/item/clothing/head/roguetown/helmet/heavy/beakhelm
name = "beak helm"
desc = "A curious helmet in the shape of an eagle's head - there seems to be a lock on it."
icon_state = "beakhelm"
item_state = "beakhelm"
emote_environment = 3
prevent_crits = list(BCLASS_CUT, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_STAB, BCLASS_TWIST)
flags_inv = HIDEEARS|HIDEHAIR
block2add = FOV_RIGHT|FOV_LEFT
smeltresult = /obj/item/ingot/steel

//............... Temple heavy helmets ......................//
/obj/item/clothing/head/roguetown/helmet/heavy/astratahelm
name = "astrata helmet"
Expand Down Expand Up @@ -1398,3 +1462,58 @@
T.Immobilize(10)
user.dropItemToGround(src)
target.equip_to_slot_if_possible(src, SLOT_HEAD)

/obj/item/clothing/head/roguetown/helmet/totodhelm
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_HIP
name = "totod helmet"
desc = "An ornamentally styled steel helm, bearing the infamous wretched wings of the Totod Order. The curtain call for abominations and innocents alike."
max_integrity = 400
prevent_crits = list(BCLASS_CUT, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_TWIST, BCLASS_STAB) // Stab protection out of having faceplate
block2add = FOV_RIGHT|FOV_LEFT // Unremovable visor.
armor = list("melee" = 90, "bullet" = 80, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
icon_state = "totodhelm"
item_state = "totodhelm"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
body_parts_covered = HEAD|HAIR|NOSE|MOUTH|EARS
flags_inv = HIDEEARS|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
smeltresult = /obj/item/ingot/steel

/obj/item/clothing/head/roguetown/xylixhood
name = "xylixean sack"
desc = "It smells of spit, sweat and anguish, you can't ever seem to find the eyeholes on this thing."
icon_state = "tricksterhood"
item_state = "tricksterhood"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
dynamic_hair_suffix = ""
//dropshrink = 0.75

/obj/item/clothing/head/roguetown/helmet/heavy/grenzelhounskull
name = "grenzelhoft plumed helm"
desc = "A stained plume helm, styled in typical Grenzelhoftian black."
icon_state = "grenzkhelm"
item_state = "grenzkhelm"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
emote_environment = 3
prevent_crits = list(BCLASS_CUT, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_STAB, BCLASS_TWIST)
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
block2add = FOV_RIGHT|FOV_LEFT
smeltresult = /obj/item/ingot/steel

/obj/item/clothing/head/roguetown/fanatichood
name = "psydonic hood"
desc = "A favored headdress among particularly zealous Grenzelhoftians, from torturers to lamenters."
icon_state = "fanatichood"
item_state = "fanatichood"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/64x64/head.dmi'
worn_x_dimension = 64
worn_y_dimension = 64
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
dynamic_hair_suffix = ""
//dropshrink = 0.75
6 changes: 6 additions & 0 deletions code/modules/clothing/rogueclothes/neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -329,3 +329,9 @@
name = "petrified larvae charm"
desc = "The husk of a desiccated beespider larva, passed down within the ranks of those whose names have been struck from dark elven history. The old tyranny's uprooting would be their last act of true valor."
icon_state = "spider"

/obj/item/clothing/neck/roguetown/bogcowl
name = "bog cowl"
desc = "A cowl made with mud, fibres and sticks. Doesn't smell too great, but then again neither do you."
icon_state = "bogcowl"
item_state = "bogcowl"
15 changes: 15 additions & 0 deletions code/modules/roguetown/roguecrafting/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -417,3 +417,18 @@
name = "master's guide to literature"
result = list(/obj/item/literary/master)
craftdiff = 6

/datum/crafting_recipe/roguetown/bogcowl
name = "bog cowl"
result = list(/obj/item/clothing/neck/roguetown/bogcowl)
reqs = list(/obj/item/natural/dirtclod = 1,
/obj/item/natural/fibers = 1,
/obj/item/grown/log/tree/stick = 1)

/datum/crafting_recipe/roguetown/bogmail
name = "boggard's hauberk"
result = list(/obj/item/clothing/suit/roguetown/armor/chainmail/bogarmor)
reqs = list(/obj/item/natural/dirtclod = 1,
/obj/item/natural/fibers = 1,
/obj/item/grown/log/tree/stick = 1,
/obj/item/clothing/suit/roguetown/armor/chainmail/iron = 1)
Original file line number Diff line number Diff line change
Expand Up @@ -365,4 +365,43 @@
additional_items = list(/obj/item/ingot/steel,/obj/item/natural/cloth)
created_item = /obj/item/clothing/head/roguetown/helmet/heavy/decoratedgbucket
craftdiff = 3
i_type = "Armor"
i_type = "Armor"

/datum/anvil_recipe/armor/klappvisor
name = "Klappvisor helmet (3)"
recipe_name = "a Klappvisor Helmet"
req_bar = /obj/item/ingot/steel
additional_items = list(/obj/item/ingot/steel, /obj/item/ingot/steel)
created_item = (/obj/item/clothing/head/roguetown/helmet/visored/klappvisor)
craftdiff = 4

/datum/anvil_recipe/armor/halfvisor
name = "Halfvisor"
recipe_name = "a Halfvisor"
req_bar = /obj/item/ingot/steel
created_item = /obj/item/clothing/head/roguetown/helmet/halfvisor
craftdiff = 2

/datum/anvil_recipe/armor/astratasunhelm
name = "Gilded Helm (3)"
recipe_name = "a gilded Helmet"
req_bar = /obj/item/ingot/steel
additional_items = list(/obj/item/ingot/steel, /obj/item/ingot/steel)
created_item = (/obj/item/clothing/head/roguetown/helmet/heavy/astratasunhelm)
craftdiff = 4

/datum/anvil_recipe/armor/beakhelm
name = "Beak helmet (2)"
req_bar = /obj/item/ingot/steel
additional_items = list(/obj/item/ingot/steel)
created_item = (/obj/item/clothing/head/roguetown/helmet/heavy/beakhelm)
craftdiff = 3

/datum/anvil_recipe/armor/helmetslitkettle
name = "Slitted Kettle helmet x2"
recipe_name = "a pair of Slitted Kettle Helmets"
req_bar = /obj/item/ingot/steel
created_item = /obj/item/clothing/head/roguetown/helmet/slitkettle
createmultiple = TRUE
createditem_num = 1
craftdiff = 2
Binary file modified icons/roguetown/clothing/armor.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/head.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/64x64/head.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/armor.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/head.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/neck.dmi
Binary file not shown.