cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Artifact log tweaks (#13596)

Browse Source 
* Artifact log tweaks

Fixes a few errors, adds effect ID and artifact spawn info.

* this is kinda bugging me
This commit is contained in:
jknpj
2017-01-27 10:16:16 -03:00
committed by Probe1
parent 5755fefcb0
commit 1f15711d7e
4 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mining/mine_turfs.dm
View File

@@ -303,7 +303,7 @@ turf/unsimulated/mineral/ChangeTurf(var/turf/N, var/tell_universe=1, var/force_l
B = getFromPool(/obj/structure/boulder, src) B = getFromPool(/obj/structure/boulder, src)
if(artifact_find) if(artifact_find)
B.artifact_find = artifact_find B.artifact_find = artifact_find
B.investigation_log(I_ARTIFACT, "|| [B.artifact_find.artifact_find_type] || found by [key_name(user)].") B.investigation_log(I_ARTIFACT, "|| [artifact_find.artifact_find_type] found by [key_name(user)].")
else else
artifact_debris(1) artifact_debris(1)
@@ -402,7 +402,7 @@ turf/unsimulated/mineral/ChangeTurf(var/turf/N, var/tell_universe=1, var/force_l
//destroyed artifacts have weird, unpleasant effects //destroyed artifacts have weird, unpleasant effects
//make sure to destroy them before changing the turf though //make sure to destroy them before changing the turf though
if(artifact_find && artifact_fail) if(artifact_find && artifact_fail)
investigation_log(I_ARTIFACT, "|| [artifact_find.artifact_find_type] || destroyed by [key_name(usr)].") investigation_log(I_ARTIFACT, "|| [artifact_find.artifact_find_type] destroyed by [key_name(usr)].")
for(var/mob/living/M in range(src, 200)) for(var/mob/living/M in range(src, 200))
to_chat(M, "<font color='red'><b>[pick("A high pitched [pick("keening","wailing","whistle")]","A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!</b></font>") to_chat(M, "<font color='red'><b>[pick("A high pitched [pick("keening","wailing","whistle")]","A rumbling noise like [pick("thunder","heavy machinery")]")] somehow penetrates your mind before fading away!</b></font>")
if(prob(50)) //pain if(prob(50)) //pain

88
code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
View File

@@ -74,13 +74,15 @@ var/list/valid_secondary_effect_types = list(\
//setup primary effect - these are the main ones (mixed) //setup primary effect - these are the main ones (mixed)
var/effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect) var/effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
my_effect = new effecttype(src) my_effect = new effecttype(src)
src.investigation_log(I_ARTIFACT, "|| spawned with a primary effect [my_effect.artifact_id]: [my_effect] || range: [my_effect.effectrange] || charge time: [my_effect.chargelevelmax] || trigger: [my_effect.trigger].")
//75% chance to have a secondary stealthy (and mostly bad) effect //75% chance to have a secondary stealthy (and mostly bad) effect
if(prob(75)) if(prob(75))
effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect) effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
secondary_effect = new effecttype(src) secondary_effect = new effecttype(src)
src.investigation_log(I_ARTIFACT, "|| spawned with a secondary effect [secondary_effect.artifact_id]: [secondary_effect] || range: [secondary_effect.effectrange] || charge time: [secondary_effect.chargelevelmax] || trigger: [secondary_effect.trigger].")
if(prob(75)) if(prob(75))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) || starts triggered by default") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id] starts triggered by default.")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
icon_num = rand(0,11) icon_num = rand(0,11)
@@ -165,10 +167,10 @@ var/list/valid_secondary_effect_types = list(\
//COLD ACTIVATION //COLD ACTIVATION
if(trigger_cold) if(trigger_cold)
if(my_effect.trigger == TRIGGER_COLD && !my_effect.activated) if(my_effect.trigger == TRIGGER_COLD && !my_effect.activated)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by COLD([my_effect.trigger]") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by COLD([my_effect.trigger]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated) if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by COLD([secondary_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by COLD([secondary_effect.trigger]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
if(my_effect.trigger == TRIGGER_COLD && my_effect.activated) if(my_effect.trigger == TRIGGER_COLD && my_effect.activated)
@@ -179,10 +181,10 @@ var/list/valid_secondary_effect_types = list(\
//HEAT ACTIVATION //HEAT ACTIVATION
if(trigger_hot) if(trigger_hot)
if(my_effect.trigger == TRIGGER_HEAT && !my_effect.activated) if(my_effect.trigger == TRIGGER_HEAT && !my_effect.activated)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by HEAT([my_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by HEAT([my_effect.trigger]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated) if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by HEAT([secondary_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by HEAT([secondary_effect.trigger]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
if(my_effect.trigger == TRIGGER_HEAT && my_effect.activated) if(my_effect.trigger == TRIGGER_HEAT && my_effect.activated)
@@ -193,10 +195,10 @@ var/list/valid_secondary_effect_types = list(\
//PLASMA GAS ACTIVATION //PLASMA GAS ACTIVATION
if(trigger_plasma) if(trigger_plasma)
if(my_effect.trigger == TRIGGER_PLASMA && !my_effect.activated) if(my_effect.trigger == TRIGGER_PLASMA && !my_effect.activated)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by PLASMA([my_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by PLASMA([my_effect.trigger]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_PLASMA && !secondary_effect.activated) if(secondary_effect && secondary_effect.trigger == TRIGGER_PLASMA && !secondary_effect.activated)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by PLASMA([secondary_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by PLASMA([secondary_effect.trigger]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
if(my_effect.trigger == TRIGGER_PLASMA && my_effect.activated) if(my_effect.trigger == TRIGGER_PLASMA && my_effect.activated)
@@ -207,10 +209,10 @@ var/list/valid_secondary_effect_types = list(\
//OXYGEN GAS ACTIVATION //OXYGEN GAS ACTIVATION
if(trigger_oxy) if(trigger_oxy)
if(my_effect.trigger == TRIGGER_OXY && !my_effect.activated) if(my_effect.trigger == TRIGGER_OXY && !my_effect.activated)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by O2([my_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by O2([my_effect.trigger]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated) if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by O2([secondary_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by O2([secondary_effect.trigger]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
if(my_effect.trigger == TRIGGER_OXY && my_effect.activated) if(my_effect.trigger == TRIGGER_OXY && my_effect.activated)
@@ -221,10 +223,10 @@ var/list/valid_secondary_effect_types = list(\
//CO2 GAS ACTIVATION //CO2 GAS ACTIVATION
if(trigger_co2) if(trigger_co2)
if(my_effect.trigger == TRIGGER_CO2 && !my_effect.activated) if(my_effect.trigger == TRIGGER_CO2 && !my_effect.activated)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by CO2([my_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by CO2([my_effect.trigger]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated) if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by CO2([secondary_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by CO2([secondary_effect.trigger]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
if(my_effect.trigger == TRIGGER_CO2 && my_effect.activated) if(my_effect.trigger == TRIGGER_CO2 && my_effect.activated)
@@ -235,10 +237,10 @@ var/list/valid_secondary_effect_types = list(\
//NITROGEN GAS ACTIVATION //NITROGEN GAS ACTIVATION
if(trigger_nitro) if(trigger_nitro)
if(my_effect.trigger == TRIGGER_NITRO && !my_effect.activated) if(my_effect.trigger == TRIGGER_NITRO && !my_effect.activated)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by N2([my_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by N2([my_effect.trigger]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated) if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by N2([secondary_effect.trigger])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by N2([secondary_effect.trigger]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
if(my_effect.trigger == TRIGGER_NITRO && my_effect.activated) if(my_effect.trigger == TRIGGER_NITRO && my_effect.activated)
@@ -261,13 +263,13 @@ var/list/valid_secondary_effect_types = list(\
if(my_effect.trigger == TRIGGER_TOUCH) if(my_effect.trigger == TRIGGER_TOUCH)
to_chat(user, "<b>You touch [src].<b>") to_chat(user, "<b>You touch [src].<b>")
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by TOUCH([my_effect.trigger]) || touched by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by TOUCH([my_effect.trigger]) || touched by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
else else
to_chat(user, "<b>You touch [src],</b> [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") to_chat(user, "<b>You touch [src],</b> [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")
if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH) if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by TOUCH([my_effect.trigger]) || touched by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by TOUCH([secondary_effect]) || touched by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
if (my_effect.effect == EFFECT_TOUCH) if (my_effect.effect == EFFECT_TOUCH)
@@ -282,31 +284,31 @@ var/list/valid_secondary_effect_types = list(\
istype(W, /obj/item/weapon/reagent_containers/dropper)) istype(W, /obj/item/weapon/reagent_containers/dropper))
if(W.reagents.has_reagent(HYDROGEN, 1) || W.reagents.has_reagent(WATER, 1)) if(W.reagents.has_reagent(HYDROGEN, 1) || W.reagents.has_reagent(WATER, 1))
if(my_effect.trigger == TRIGGER_WATER) if(my_effect.trigger == TRIGGER_WATER)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by WATER([my_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by WATER([my_effect.trigger]) || [W] || splashed by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_WATER && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_WATER && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by WATER([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by WATER([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if(W.reagents.has_reagent(SACID, 1) || W.reagents.has_reagent(PACID, 1) || W.reagents.has_reagent(DIETHYLAMINE, 1)) else if(W.reagents.has_reagent(SACID, 1) || W.reagents.has_reagent(PACID, 1) || W.reagents.has_reagent(DIETHYLAMINE, 1))
if(my_effect.trigger == TRIGGER_ACID) if(my_effect.trigger == TRIGGER_ACID)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by ACID([my_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by ACID([my_effect.trigger]) || [W] || splashed by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by ACID([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by ACID([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if(W.reagents.has_reagent(PLASMA, 1) || W.reagents.has_reagent(THERMITE, 1)) else if(W.reagents.has_reagent(PLASMA, 1) || W.reagents.has_reagent(THERMITE, 1))
if(my_effect.trigger == TRIGGER_VOLATILE) if(my_effect.trigger == TRIGGER_VOLATILE)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by VOLATILE([my_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by VOLATILE([my_effect.trigger]) || [W] || splashed by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_VOLATILE && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_VOLATILE && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by VOLATILE([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by VOLATILE([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if(W.reagents.has_reagent(TOXIN, 1) || W.reagents.has_reagent(CYANIDE, 1) || W.reagents.has_reagent(AMATOXIN, 1) || W.reagents.has_reagent(NEUROTOXIN, 1)) else if(W.reagents.has_reagent(TOXIN, 1) || W.reagents.has_reagent(CYANIDE, 1) || W.reagents.has_reagent(AMATOXIN, 1) || W.reagents.has_reagent(NEUROTOXIN, 1))
if(my_effect.trigger == TRIGGER_TOXIN) if(my_effect.trigger == TRIGGER_TOXIN)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by TOXIN([my_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by TOXIN([my_effect.trigger]) || [W] || splashed by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_TOXIN && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_TOXIN && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by TOXIN([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by TOXIN([secondary_effect.trigger]) || [W] || splashed by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\ else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\
istype(W,/obj/item/weapon/melee/energy) ||\ istype(W,/obj/item/weapon/melee/energy) ||\
@@ -314,28 +316,28 @@ var/list/valid_secondary_effect_types = list(\
istype(W,/obj/item/weapon/card/emag) ||\ istype(W,/obj/item/weapon/card/emag) ||\
istype(W,/obj/item/device/multitool)) istype(W,/obj/item/device/multitool))
if (my_effect.trigger == TRIGGER_ENERGY) if (my_effect.trigger == TRIGGER_ENERGY)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by ENERGY([my_effect.trigger]) || [W] || energized by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by ENERGY([my_effect.trigger]) || [W] || energized by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by ENERGY([secondary_effect.trigger]) || [W] || energized by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by ENERGY([secondary_effect.trigger]) || [W] || energized by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if (istype(W,/obj/item/weapon/match) && W:lit ||\ else if (istype(W,/obj/item/weapon/match) && W:lit ||\
istype(W,/obj/item/weapon/weldingtool) && W:welding ||\ istype(W,/obj/item/weapon/weldingtool) && W:welding ||\
istype(W,/obj/item/weapon/lighter) && W:lit) istype(W,/obj/item/weapon/lighter) && W:lit)
if(my_effect.trigger == TRIGGER_HEAT) if(my_effect.trigger == TRIGGER_HEAT)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by HEAT([my_effect.trigger]) || [W] || heated by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by HEAT([my_effect.trigger]) || [W] || heated by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by HEAT([secondary_effect.trigger]) || [W] || heated by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by HEAT([secondary_effect.trigger]) || [W] || heated by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else else
..() ..()
if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10) if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by FORCE([my_effect.trigger]) || [W] || attacked by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by FORCE([my_effect.trigger]) || [W] || attacked by [key_name(user)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by FORCE([secondary_effect.trigger]) || [W] || attacked by [key_name(user)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by FORCE([secondary_effect.trigger]) || [W] || attacked by [key_name(user)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
/obj/machinery/artifact/Bumped(M as mob|obj) /obj/machinery/artifact/Bumped(M as mob|obj)
@@ -343,20 +345,20 @@ var/list/valid_secondary_effect_types = list(\
if(istype(M,/obj)) if(istype(M,/obj))
if(M:throwforce >= 10) if(M:throwforce >= 10)
if(my_effect.trigger == TRIGGER_FORCE) if(my_effect.trigger == TRIGGER_FORCE)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by THROW FORCE([my_effect.trigger]) || [M] || thrown by [key_name(usr)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by THROW FORCE([my_effect.trigger]) || [M] || thrown by [key_name(usr)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by THROW FORCE([secondary_effect.trigger]) || [M] || thrown by [key_name(usr)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by THROW FORCE([secondary_effect.trigger]) || [M] || thrown by [key_name(usr)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves)) else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves))
var/warn = 0 var/warn = 0
if (my_effect.trigger == TRIGGER_TOUCH && prob(50)) if (my_effect.trigger == TRIGGER_TOUCH && prob(50))
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) accidentally triggered by TOUCH([my_effect.trigger]) || bumped by [M].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) accidentally triggered by TOUCH([my_effect.trigger]) || bumped by [key_name(M)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
warn = 1 warn = 1
if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) accidentally triggered by TOUCH([secondary_effect.trigger]) || bumped by [M].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) accidentally triggered by TOUCH([secondary_effect.trigger]) || bumped by [key_name(M)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
warn = 1 warn = 1
@@ -375,44 +377,44 @@ var/list/valid_secondary_effect_types = list(\
if(istype(P,/obj/item/projectile/bullet) ||\ if(istype(P,/obj/item/projectile/bullet) ||\
istype(P,/obj/item/projectile/hivebotbullet)) istype(P,/obj/item/projectile/hivebotbullet))
if(my_effect.trigger == TRIGGER_FORCE) if(my_effect.trigger == TRIGGER_FORCE)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by PROJECTILE([my_effect.trigger]) || [P] || fired by [key_name(P.firer)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by PROJECTILE([my_effect.trigger]) || [P] || fired by [key_name(P.firer)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by PROJECTILE([secondary_effect.trigger]) || [P] || fired by [key_name(P.firer)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by PROJECTILE([secondary_effect.trigger]) || [P] || fired by [key_name(P.firer)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
else if(istype(P,/obj/item/projectile/beam) ||\ else if(istype(P,/obj/item/projectile/beam) ||\
istype(P,/obj/item/projectile/ion) ||\ istype(P,/obj/item/projectile/ion) ||\
istype(P,/obj/item/projectile/energy)) istype(P,/obj/item/projectile/energy))
if(my_effect.trigger == TRIGGER_ENERGY) if(my_effect.trigger == TRIGGER_ENERGY)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by BEAM([my_effect.trigger]) || [P] || fired by [key_name(P.firer)].") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by BEAM([my_effect.trigger]) || [P] || fired by [key_name(P.firer)].")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25)) if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by BEAM([secondary_effect.trigger]) || [P] || fired by [key_name(P.firer)].") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by BEAM([secondary_effect.trigger]) || [P] || fired by [key_name(P.firer)].")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
/obj/machinery/artifact/ex_act(severity) /obj/machinery/artifact/ex_act(severity)
switch(severity) switch(severity)
if(1.0) if(1.0)
src.investigation_log(I_ARTIFACT, "|| blew up by EXPLOSION([severity]).") src.investigation_log(I_ARTIFACT, "|| blew up by EXPLOSION DAMAGE([severity]).")
qdel(src) qdel(src)
if(2.0) if(2.0)
if (prob(50)) if (prob(50))
src.investigation_log(I_ARTIFACT, "|| blew up by EXPLOSION([severity]).") src.investigation_log(I_ARTIFACT, "|| blew up by EXPLOSION DAMAGE([severity]).")
qdel(src) qdel(src)
else else
if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT) if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by EXPLOSION([severity])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by EXPLOSION DAMAGE([severity]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25)) if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by EXPLOSION([severity])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by EXPLOSION DAMAGE([severity]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
if(3.0) if(3.0)
if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT) if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT)
src.investigation_log(I_ARTIFACT, "|| primary effect([my_effect]) triggered by EXPLOSION([severity])") src.investigation_log(I_ARTIFACT, "|| primary effect [my_effect.artifact_id]([my_effect]) triggered by EXPLOSION DAMAGE([severity]).")
my_effect.ToggleActivate() my_effect.ToggleActivate()
if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25)) if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25))
src.investigation_log(I_ARTIFACT, "|| secondary effect([secondary_effect]) triggered by EXPLOSION([severity])") src.investigation_log(I_ARTIFACT, "|| secondary effect [secondary_effect.artifact_id]([secondary_effect]) triggered by EXPLOSION DAMAGE([severity]).")
secondary_effect.ToggleActivate(0) secondary_effect.ToggleActivate(0)
return return

2
code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
View File

@@ -87,7 +87,7 @@
cur_artifact.anchored = 0 cur_artifact.anchored = 0
cur_artifact.being_used = 0 cur_artifact.being_used = 0
src.visible_message("<b>[name]</b> states, \"Battery is full.\"") src.visible_message("<b>[name]</b> states, \"Battery is full.\"")
src.investigation_log(I_ARTIFACT, "|| anomaly battery effect([inserted_battery.battery_effect]) || harvested by [key_name(harvester)]") src.investigation_log(I_ARTIFACT, "|| anomaly battery [inserted_battery.battery_effect.artifact_id] harvested by [key_name(harvester)]")
icon_state = "incubator" icon_state = "incubator"
else if(harvesting < 0) else if(harvesting < 0)

4
code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
View File

@@ -174,14 +174,14 @@
activated = 1 activated = 1
timing = 0 timing = 0
if(!inserted_battery.battery_effect.activated) if(!inserted_battery.battery_effect.activated)
src.investigation_log(I_ARTIFACT, "|| anomaly battery effect([inserted_battery.battery_effect]) || emission started by [key_name(usr)]") src.investigation_log(I_ARTIFACT, "|| anomaly battery [inserted_battery.battery_effect.artifact_id]([inserted_battery.battery_effect]) emission started by [key_name(usr)]")
inserted_battery.battery_effect.ToggleActivate(1) inserted_battery.battery_effect.ToggleActivate(1)
if(href_list["shutdown"]) if(href_list["shutdown"])
activated = 0 activated = 0
if(href_list["starttimer"]) if(href_list["starttimer"])
timing = 1 timing = 1
archived_time = time archived_time = time
src.investigation_log(I_ARTIFACT, "|| anomaly battery effect([inserted_battery.battery_effect]) || emission timed by [key_name(usr)]") src.investigation_log(I_ARTIFACT, "|| anomaly battery [inserted_battery.battery_effect.artifact_id]([inserted_battery.battery_effect]) emission timed by [key_name(usr)]")
if(href_list["ejectbattery"]) if(href_list["ejectbattery"])
shutdown_emission() shutdown_emission()
inserted_battery.forceMove(get_turf(src)) inserted_battery.forceMove(get_turf(src))