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

four new artifacts #135

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 4 additions & 0 deletions stalker/code/machinery/sidormat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,10 @@ GLOBAL_LIST_INIT(global_sidormat_list, list(
new /datum/data/stalker_equipment("Bubble", "Bubble", /obj/item/artifact/bubble, 12000, ROOKIE, sale_price = 15000),
new /datum/data/stalker_equipment("Mica", "Mica", /obj/item/artifact/mica, 30000, ROOKIE, sale_price = 20000),
new /datum/data/stalker_equipment("Firefly", "Firefly", /obj/item/artifact/firefly, 90000, ROOKIE, sale_price = 40000),
new /datum/data/stalker_equipment("Thorn", "Thorn", /obj/item/artifact/thorn, 5000, ROOKIE, sale_price = 2500),
new /datum/data/stalker_equipment("Urchin", "Urchin", /obj/item/artifact/urchin, 15000, ROOKIE, sale_price = 7500),
new /datum/data/stalker_equipment("Slug", "Slug", /obj/item/artifact/slug, 12500, ROOKIE, sale_price = 3500),
new /datum/data/stalker_equipment("Slime", "Slime", /obj/item/artifact/slug, 7500, ROOKIE, sale_price = 2500),
///////////////////////////////// Мусор //////////////////////////////////////////////
new /datum/data/stalker_equipment("Konserva", "Консерва", /obj/item/trash/konserva, 400, ROOKIE),
new /datum/data/stalker_equipment("Konserva", "Консерва", /obj/item/trash/konserva/MREkonserva1, 200, ROOKIE),
Expand Down
103 changes: 99 additions & 4 deletions stalker/code/objects/items/artifacts/artifacts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
/obj/item/artifact/meduza
name = "jellyfish"
desc = "This gravitational artifact attracts and absorbs radioactive particles, reducing the effects of radiation on the body. Very common in the Zone and is unofficially used outside the Zone for treating acute radiation sickness in exceptional circumstances."
icon_state = "meduza"
icon_state = "jellyfish"
art_armor = list()
radiation = -2
level_s = 1
Expand Down Expand Up @@ -135,7 +135,7 @@
/obj/item/artifact/pustishka
name = "shell"
desc = "Degenerate case of the Electra anomaly activity. Apparently, such a remarkable rounded shape can be obtained by subjecting the anomaly to thermal action. Expensive artifact."
icon_state = "pustishka"
icon_state = "shell"
art_armor = list(energy = 30)
radiation = 2
level_s = 3
Expand Down Expand Up @@ -184,6 +184,7 @@
name = "mama's beads"
desc = "Much about this artifact remains a complete mystery to scientists. At the same time, it is known for certain that emissions produced by pulses in its thicker sections force blood in open wounds to clot quicker, forming a protective scab. One of the most noticeable effects of this artifact is the increased speed of wound healing. Emits radiation."
icon_state = "mamini_busi"
icon_state = "mamas_beads"
art_armor = list()
radiation = 5
level_s = 4
Expand Down Expand Up @@ -242,7 +243,7 @@
B = D
break

B.volume += 0.5
B.volume += 4
return 1

/obj/item/artifact/firefly
Expand All @@ -261,7 +262,101 @@
mob.adjustBruteLoss(-0.5)
return 1

//ПОЯС
/obj/item/artifact/thorn
name = "thorn"
desc = "The result of the interaction between the anomaly Burnt Fuzz and the body of a careless stalker. The Thorn artifact pokes the body of its owner, no matter what. But it also helps clean the body of radionucliodes. Quite widespread and cheap."
eng_desc = "The result of the interaction between the anomaly Burnt Fuzz and the body of a careless stalker. The Thorn artifact pokes the body of its owner, no matter what. But it also helps clean the body of radionucliodes. Quite widespread and cheap."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eng_desc is deprecated. Do not use it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from this, the PR is good.
I'll fix this myself if you don't get 'em.

icon_state = "thorn"
radiation = -1
level_s = 1

/obj/item/artifact/thorn/Think(mob/user)
if(!..()) return 0
if(istype(user, /mob/living/carbon))
var/mob/living/carbon/mob = user
mob.bleed(1)
return 1

/obj/item/artifact/urchin
name = "urchin"
desc = "The anomaly Burnt Fuzz very rarely gives rise to this artifact. Blood pressure rises, the body gets rid of a large amount of red blood cells. But along with them the stored radiation leaves the body as well. In his fundamental work titled \"Ionization and polarization of the components of rare artifacts\", Sakharov noted that the content of this formation has a critical stability, and it's not realistic to create such an artifact in lab conditions in the next ten years."
eng_desc = "The anomaly Burnt Fuzz very rarely gives rise to this artifact. Blood pressure rises, the body gets rid of a large amount of red blood cells. But along with them the stored radiation leaves the body as well. In his fundamental work titled \"Ionization and polarization of the components of rare artifacts\", Sakharov noted that the content of this formation has a critical stability, and it's not realistic to create such an artifact in lab conditions in the next ten years."
icon_state = "urchin"
radiation = -3
level_s = 4

/obj/item/artifact/urchin/Think(mob/user)
if(!..()) return 0
if(istype(user, /mob/living/carbon))
var/mob/living/carbon/mob = user
mob.bleed(1)
return 1

/obj/item/artifact/slug
name = "slug"
desc = "Formed by the \"Fruit Punch\" anomaly. The negative qualities of this artifact are compensated by the fact that it heightens the coagulation quality of blood. It's not often that one runs into such an artifact, and they pay well for it too."
eng_desc = "Formed by the \"Fruit Punch\" anomaly. The negative qualities of this artifact are compensated by the fact that it heightens the coagulation quality of blood. It's not often that one runs into such an artifact, and they pay well for it too."
icon_state = "slug"
art_armor = list(laser = -10, bio = -10)
ProbablyCarl marked this conversation as resolved.
Show resolved Hide resolved
radiation = 0
level_s = 2

/obj/item/artifact/slug/Think(mob/user)
if(!..()) return 0
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(!H.bleedsuppress) //so you can't stack bleed suppression
H.suppress_bloodloss(0.20)
ProbablyCarl marked this conversation as resolved.
Show resolved Hide resolved

if(H.stat != DEAD && H.bodytemperature >= 170)

var/blood_volume = round(H.reagents.get_reagent_amount("blood"))
if(blood_volume < 560 && blood_volume)

var/datum/reagent/blood/B = locate() in H.reagents.reagent_list
if(B)
if(B.data["donor"] != src) //If it's not theirs, then we look for theirs
for(var/datum/reagent/blood/D in H.reagents.reagent_list)
if(D.data["donor"] == src)
B = D
break

B.volume += 2.6
return 1

/obj/item/artifact/slime
name = "slime"
desc = "It is certain that this artifact is created by the anomaly called \"Fruit Punch\". When carried on the belt, the wounds bleed less, although the body of its owner becomes vulnerable to various burns."
eng_desc = "It is certain that this artifact is created by the anomaly called \"Fruit Punch\". When carried on the belt, the wounds bleed less, although the body of its owner becomes vulnerable to various burns."
icon_state = "slime"
art_armor = list(laser = -10, bio = -10)
radiation = 0
level_s = 1

/obj/item/artifact/slime/Think(mob/user)
if(!..()) return 0
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(!H.bleedsuppress) //so you can't stack bleed suppression
H.suppress_bloodloss(0.20)

if(H.stat != DEAD && H.bodytemperature >= 170)

var/blood_volume = round(H.reagents.get_reagent_amount("blood"))
if(blood_volume < 560 && blood_volume)

var/datum/reagent/blood/B = locate() in H.reagents.reagent_list
if(B)
if(B.data["donor"] != src) //If it's not theirs, then we look for theirs
for(var/datum/reagent/blood/D in H.reagents.reagent_list)
if(D.data["donor"] == src)
B = D
break

B.volume += 2.6
return 1

//BELTS
/obj/item/storage/belt/stalker
name = "artifact belt"
desc = "Special belt for artifacts."
Expand Down
Binary file modified stalker/icons/artifacts.dmi
Binary file not shown.