Skip to content

Commit

Permalink
23. The last item (for real this time)
Browse files Browse the repository at this point in the history
  • Loading branch information
NightDawnFox committed Nov 21, 2024
1 parent d708106 commit d17df2b
Show file tree
Hide file tree
Showing 11 changed files with 127 additions and 38 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
to_chat(user, "<span class='warning'>Вы больше не можете найти куда [name] пристраивается!</span>")

/obj/item/stack/sheet/cartilage_plate
name = "cartilage plate"
name = "thick cartilage plate"
desc = "Хрящевая пластина, снятая с тела лавового панцирника. Судя по всему, пластина начала терять свой характерный кроваво-красный цвет, однако она остаётся такой же крепкой, как и до этого."
icon = 'icons/obj/lavaland/lava_fishing.dmi'
icon_state = "thick_cartilage_plate"
Expand Down
65 changes: 65 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -714,3 +714,68 @@
SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
)

/obj/item/clothing/suit/armor/cartilage //parent type, used in order not to copy-paste same lines in 3 same armors
name = "cartilage armor"
desc = "Полностью завершённая броня, сделанная из хрящевых пластин лавовой рыбы. Слегка крепче, чем её костяной аналог."
icon_state = "cartilage_set"
item_state = "cartilage_set"
blood_overlay_type = "armor"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 0, RAD = 0, FIRE = 60, ACID = 60)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suit.dmi',
SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/suit.dmi',
SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/suit.dmi',
SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/suit.dmi',
SPECIES_VOX = 'icons/mob/clothing/species/vox/suit.dmi',
SPECIES_GREY = 'icons/mob/clothing/species/grey/suit.dmi',
SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/suit.dmi',
SPECIES_FARWA = 'icons/mob/clothing/species/monkey/suit.dmi',
SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/suit.dmi',
SPECIES_NEARA = 'icons/mob/clothing/species/monkey/suit.dmi',
SPECIES_STOK = 'icons/mob/clothing/species/monkey/suit.dmi'
)


/obj/item/clothing/suit/armor/cartilage/cartilage_pads
name = "cartilage shoulder pads"
desc = "Достаточно крепкие наплечники, сделанные из хрящевых пластин. Защищают тело, но не предоставляют защиты для ног. Могут быть улучшены до полноценной брони в случае, если будут соединены с поножами, сделанными из того же материала."
icon_state = "cartilage_shoulder_pads"
item_state = "cartilage_shoulder_pads"
body_parts_covered = UPPER_TORSO|ARMS

/obj/item/clothing/suit/armor/cartilage/cartilage_pads/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/clothing/suit/armor/cartilage/cartilage_greaves))
add_fingerprint(user)
to_chat(user, span_notice("Вы начали подвязывать части брони."))
if(do_after(user, 4 SECONDS, src, max_interact_count = 1))
to_chat(user, span_notice("Вы улучшили броню!"))
var/turf/user_turf = get_turf(user)
var/obj/item/clothing/suit/armor/cartilage/armor = new(user_turf)
user.put_in_inactive_hand(armor)
qdel(I)
qdel(src)
return ATTACK_CHAIN_BLOCKED_ALL
return ..()

/obj/item/clothing/suit/armor/cartilage/cartilage_greaves
name = "cartilage greaves"
desc = "Достаточно крепкие поножи, сделанные из хрящевых пластин. Защищают ноги, но не предоставляют защиты для торса. Могут быть улучшены до полноценной брони в случае, если будут соединены с наплечниками, сделанными из того же материала."
icon_state = "cartilage_greaves"
item_state = "cartilage_greaves"
body_parts_covered = LOWER_TORSO|LEGS

/obj/item/clothing/suit/armor/cartilage/cartilage_greaves/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/clothing/suit/armor/cartilage/cartilage_pads))
add_fingerprint(user)
to_chat(user, span_notice("Вы начали подвязывать части брони."))
if(do_after(user, 4 SECONDS, src, max_interact_count = 1))
to_chat(user, span_notice("Вы улучшили броню!"))
var/turf/user_turf = get_turf(user)
var/obj/item/clothing/suit/armor/cartilage/armor = new(user_turf)
user.put_in_inactive_hand(armor)
qdel(I)
qdel(src)
return ATTACK_CHAIN_BLOCKED_ALL
return ..()
58 changes: 57 additions & 1 deletion code/modules/crafting/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,62 @@
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/cartilage_greaves
name = "Cartilage Greaves"
result = /obj/item/clothing/suit/armor/cartilage/cartilage_greaves
time = 4 SECONDS
reqs = list(/obj/item/stack/sheet/cartilage_plate = 2,
/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/sinew = 2)
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/cartilage_pads
name = "Cartilage Shoulder Pads"
result = /obj/item/clothing/suit/armor/cartilage/cartilage_pads
time = 4 SECONDS
reqs = list(/obj/item/stack/sheet/cartilage_plate = 2,
/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/footwrapsgoliath
name = "Goliath Hide Footwraps"
result = /obj/item/clothing/shoes/footwraps/goliath
reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 1,
/obj/item/stack/sheet/leather = 1)
time = 6 SECONDS
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/footwrapsdragon
name = "Ash Drake Hide Footwraps"
result = /obj/item/clothing/shoes/footwraps/dragon
reqs = list(/obj/item/stack/sheet/animalhide/ashdrake = 1,
/obj/item/stack/sheet/leather = 1)
time = 6 SECONDS
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/goliathgloves
name = "Goliath Gloves"
result = /obj/item/clothing/gloves/color/black/goliath
time = 2 SECONDS
reqs = list(/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 1)
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/chitingloves
name = "Weaver Chitin Gloves"
result = /obj/item/clothing/gloves/fingerless/weaver
time = 2 SECONDS
reqs = list(/obj/item/stack/sheet/leather = 1,
/obj/item/stack/sheet/animalhide/weaver_chitin = 3)
category = CAT_PRIMAL
subcategory = CAT_ARMOR

/datum/crafting_recipe/firebrand
name = "Firebrand"
result = /obj/item/match/firebrand
Expand Down Expand Up @@ -791,6 +847,7 @@
subcategory = CAT_WEAPONS

/datum/crafting_recipe/jagged_arrow
name = "Jagged-tipped Arrows"
result = list(/obj/item/ammo_casing/caseless/arrow/jagged,
/obj/item/ammo_casing/caseless/arrow/jagged,
/obj/item/ammo_casing/caseless/arrow/jagged)
Expand Down Expand Up @@ -1631,7 +1688,6 @@
always_availible = FALSE
time = 5 SECONDS


/datum/crafting_recipe/drone_circ
name = "Combat drone Basic Control Module"
result = list(/obj/item/drone_modules/drone_BCM)
Expand Down
32 changes: 0 additions & 32 deletions code/modules/crafting/tailoring.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,38 +344,6 @@
tools = list(TOOL_WIRECUTTER)
category = CAT_CLOTHING

/datum/crafting_recipe/footwrapsgoliath
name = "Goliath Hide Footwraps"
result = /obj/item/clothing/shoes/footwraps/goliath
reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide = 1,
/obj/item/stack/sheet/leather = 1)
time = 6 SECONDS
category = CAT_CLOTHING

/datum/crafting_recipe/footwrapsdragon
name = "Ash Drake Hide Footwraps"
result = /obj/item/clothing/shoes/footwraps/dragon
reqs = list(/obj/item/stack/sheet/animalhide/ashdrake = 1,
/obj/item/stack/sheet/leather = 1)
time = 6 SECONDS
category = CAT_CLOTHING

/datum/crafting_recipe/goliathgloves
name = "Goliath Gloves"
result = /obj/item/clothing/gloves/color/black/goliath
time = 2 SECONDS
reqs = list(/obj/item/stack/sheet/leather = 2,
/obj/item/stack/sheet/animalhide/goliath_hide = 1)
category = CAT_CLOTHING

/datum/crafting_recipe/chitingloves
name = "Weaver Chitin Gloves"
result = /obj/item/clothing/gloves/fingerless/weaver
time = 2 SECONDS
reqs = list(/obj/item/stack/sheet/leather = 1,
/obj/item/stack/sheet/animalhide/weaver_chitin = 3)
category = CAT_CLOTHING

/datum/crafting_recipe/voice_modulator
name = "Voice Modulator Mask"
result = list(/obj/item/clothing/mask/gas/voice_modulator)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mining/ash_walkers/fish.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
resistance_flags = LAVA_PROOF | FIRE_PROOF
throwforce = 5
force = 1
attack_verb = list("охлестал", "ударил", "стукнул", "опозорил") //стукнул рыбой, sounds nice
attack_verb = list("slapped", "humiliated", "hit", "rubbed") //attacks aren't translated, so in order to escape "You has ударил ssferhes ssusshes with generic lavaland fish" this has to be in english
hitsound = 'sound/effects/snap.ogg'

/// If this fish should do the flopping animation
Expand Down Expand Up @@ -209,7 +209,7 @@
desc = "Одна из самых больших рыб, встречающихся у берегов Лазис Ардакса. Практически всё тело, включая голову, покрыто багряными хрящевыми пластинами, достаточно крепкими, чтобы защищаться от большинства хищников. Внутри самой рыбы, рядом с сердцем, находится специализированный орган, собираемый местными племенами для ведения сельского хозяйства."
favorite_bait = /obj/item/reagent_containers/food/snacks/bait/goldgrub_larva
butcher_loot = list(
/obj/item/stack/sheet/cartilage_plate = 2, //заметка - доделать броню и крафт брони
/obj/item/stack/sheet/cartilage_plate = 2,
/obj/item/conductive_organ = 1,
/obj/item/lavaland_dye/crimson = 1,
)
Expand All @@ -230,7 +230,7 @@
favorite_bait = /obj/item/reagent_containers/food/snacks/bait/ash_eater
butcher_loot = list(
/obj/item/reagent_containers/food/snacks/lavaland/eel_filet = 1,
/obj/item/kitchen/knife/combat/survival/bone/eel = 1, //заметка - доделать копье
/obj/item/kitchen/knife/combat/survival/bone/eel = 1,
/obj/item/lavaland_dye/indigo = 1,
)

Expand All @@ -249,7 +249,7 @@
desc = "Массивная рыба краво-красного окраса со множеством острых зубов внутри её пасти. Данная рыба печально известна среди племён своей агрессивностью, от чего погибло множество молодых охотников. В желудке этих рыб можно частенько наткнуться на останки менее удачливых рыбаков."
favorite_bait = /obj/item/reagent_containers/food/snacks/bait/bloody_leach
butcher_loot = list(
/obj/item/stack/sheet/razor_sharp_teeth = 2, //заметка - доделать стрелы
/obj/item/stack/sheet/razor_sharp_teeth = 2,
/obj/item/stack/sheet/bone = 1,
/obj/item/reagent_containers/food/snacks/bait/random = 2,
/obj/effect/spawner/random_spawners/lavaland_random_loot = 2,
Expand Down
Binary file modified icons/mob/clothing/species/grey/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.

0 comments on commit d17df2b

Please sign in to comment.