From 44087be324494f87e65ab68ce4f1ba86effe405e Mon Sep 17 00:00:00 2001 From: Mechoid Date: Sat, 4 Mar 2023 11:27:34 -0800 Subject: [PATCH 1/9] Fix various anomaly bugs and oversights. --- .../xenoarcheaology/effects/cellcharge.dm | 38 ++++++++++ .../xenoarcheaology/effects/celldrain.dm | 41 +++++++++++ .../xenoarcheaology/effects/robohurt.dm | 6 ++ .../modules/xenoarcheaology/effects/sleepy.dm | 5 ++ .../effects/sweating_reagents.dm | 72 +++++++++++++++++++ 5 files changed, 162 insertions(+) create mode 100644 code/modules/xenoarcheaology/effects/sweating_reagents.dm diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index d543ac2411a..a7561478a4e 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -4,6 +4,7 @@ effect_color = "#ffee06" var/last_message +<<<<<<< HEAD /datum/artifact_effect/cellcharge/DoEffectTouch(var/mob/living/user) if(user) @@ -15,12 +16,16 @@ /datum/artifact_effect/cellcharge/DoEffectAura() +======= +/datum/artifact_effect/uncommon/cellcharge/proc/charge_cells(var/amount = 25) +>>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) var/atom/holder = get_master_holder() if(!holder) return var/turf/turf = get_turf(holder) if(!turf) return +<<<<<<< HEAD for (var/obj/machinery/power/apc/apc as anything in GLOB.apcs) if(get_dist(turf, apc) <= 200) for (var/obj/item/weapon/cell/cell in apc.contents) @@ -39,9 +44,38 @@ to_chat(robot, "SYSTEM ALERT: Energy boost detected!") charged_robots = TRUE if(charged_robots) +======= + + var/messaged_robots + for(var/atom/movable/AM in range(effectrange, turf)) + if(isliving(AM)) + var/mob/living/L = AM + var/obj/item/cell/C = L.get_cell() + + if(C) + if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) + messaged_robots = TRUE + to_chat(L, SPAN_NOTICE("SYSTEM ALERT: Energy boost detected!")) + C.charge = min(C.maxcharge, C.charge + amount) + continue + + var/obj/item/cell/C = AM.get_cell() + if(C) + C.charge = min(C.maxcharge, C.charge + amount) + + if(messaged_robots) +>>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) last_message = world.time +/datum/artifact_effect/uncommon/cellcharge/DoEffectTouch(mob/living/user) + if(!user) + return + charge_cells(100) +/datum/artifact_effect/uncommon/cellcharge/DoEffectAura() + charge_cells() + +<<<<<<< HEAD /datum/artifact_effect/cellcharge/DoEffectPulse() var/atom/holder = get_master_holder() if(holder) @@ -57,3 +91,7 @@ if(world.time - last_message > 200) to_chat(M, "SYSTEM ALERT: Energy boost detected!") last_message = world.time +======= +/datum/artifact_effect/uncommon/cellcharge/DoEffectPulse() + charge_cells(50) +>>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index c8a270c0595..b57b7f3b17b 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -4,6 +4,7 @@ effect_type = EFFECT_ELECTRO var/last_message +<<<<<<< HEAD effect_state = "pulsing" effect_color = "#fbff02" @@ -75,3 +76,43 @@ to_chat(M, "SYSTEM ALERT: Energy drain detected!") last_message = world.time return 1 +======= +/datum/artifact_effect/uncommon/celldrain/proc/drain_cells(var/amount = 25) + var/atom/holder = get_master_holder() + if (!holder) + return + var/turf/turf = get_turf(holder) + if (!turf) + return + + var/messaged_robots + for(var/atom/movable/AM in range(effectrange, turf)) + if(isliving(AM)) + var/mob/living/L = AM + var/obj/item/cell/C = L.get_cell() + + if(C) + if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) + messaged_robots = TRUE + to_chat(L, SPAN_WARNING("SYSTEM ALERT: Energy drain detected!")) + C.charge = min(C.maxcharge, C.charge - amount) + continue + + var/obj/item/cell/C = AM.get_cell() + if(C) + C.charge = min(C.maxcharge, C.charge - amount) + + if(messaged_robots) + last_message = world.time + +/datum/artifact_effect/uncommon/celldrain/DoEffectTouch(mob/living/user) + if(!user) + return + drain_cells(100) + +/datum/artifact_effect/uncommon/celldrain/DoEffectAura() + drain_cells() + +/datum/artifact_effect/uncommon/celldrain/DoEffectPulse() + drain_cells(50) +>>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) diff --git a/code/modules/xenoarcheaology/effects/robohurt.dm b/code/modules/xenoarcheaology/effects/robohurt.dm index 8b93e04ead4..6f7c6ab811a 100644 --- a/code/modules/xenoarcheaology/effects/robohurt.dm +++ b/code/modules/xenoarcheaology/effects/robohurt.dm @@ -8,8 +8,14 @@ ..() effect_type = pick(EFFECT_ELECTRO, EFFECT_PARTICLE) +<<<<<<< HEAD /datum/artifact_effect/robohurt/DoEffectTouch(var/mob/user) if(user) +======= + +/datum/artifact_effect/uncommon/robohurt/DoEffectTouch(mob/living/user) + if (user) +>>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user to_chat(R, "Your systems report severe damage has been inflicted!") diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm index 244814a1da7..6426296057a 100644 --- a/code/modules/xenoarcheaology/effects/sleepy.dm +++ b/code/modules/xenoarcheaology/effects/sleepy.dm @@ -3,7 +3,12 @@ name = "sleepy" effect_color = "#a36fa1" +<<<<<<< HEAD /datum/artifact_effect/sleepy/New() +======= + +/datum/artifact_effect/uncommon/sleepy/New() +>>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) ..() effect_type = pick(EFFECT_PSIONIC, EFFECT_ORGANIC) diff --git a/code/modules/xenoarcheaology/effects/sweating_reagents.dm b/code/modules/xenoarcheaology/effects/sweating_reagents.dm new file mode 100644 index 00000000000..a87afb0d30b --- /dev/null +++ b/code/modules/xenoarcheaology/effects/sweating_reagents.dm @@ -0,0 +1,72 @@ +/datum/artifact_effect/common/sweating + name = "sweating" + var/list/reagents = list() + effect_type = EFFECT_ORGANIC + effect_state = "oozes" + + +/datum/artifact_effect/common/sweating/New(datum/component/artifact_master/newmaster) + reagents += list(list(pick(SSchemistry.chemical_reagents), 0.4, list())) + if(prob(33)) + reagents += list(list("blood", + 0.6, + list("blood_colour" = rgb(rand(1,255),rand(1,255),rand(1,255))))) + + // Sample the color of the combined reagents + var/datum/reagents/R = new(120) + for(var/list/chem in reagents) + R.add_reagent(chem[1], chem[2], chem[3]) + effect_color = R.get_color() + qdel(R) + + ..() + effect = EFFECT_TOUCH + + +/datum/artifact_effect/common/sweating/proc/disgorge(var/turf/T, var/min_chargelevel = 0.25) + if(chargelevel < chargelevelmax * min_chargelevel) + return + spawn() + var/obj/effect/vfx/water/splash = new(T) + splash.create_reagents(15) + splash.reagents.add_reagent("blood", 10, list("blood_colour" = effect_color)) + splash.set_color() + + splash.set_up(T, 2, 3) + + var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T + if(!istype(blood)) + blood = new(T) + for(var/list/chem in reagents) + blood.reagents.add_reagent(chem[1], chem[2] * chargelevel, LAZYLEN(chem) > 2 ? chem[3] : null) + blood.update_icon() + chargelevel = round(0.8 * chargelevel) + + +// Leave a trail of "disgusting ooze" +/datum/artifact_effect/common/sweating/UpdateMove(var/turf/old_loc) + disgorge(old_loc) + + +/datum/artifact_effect/common/sweating/DoEffectTouch(mob/living/carbon/human/user) + if(ishuman(user)) + user.bloody_hands() + if(chargelevel >= 40 && prob(20)) + user.visible_message( + "\The [get_master_holder()] shudders at \the [user]'s touch, before spraying a disgusting ooze everywhere.", + "\The [get_master_holder()] shudders at your touch, before spraying a disgusting ooze all over you!", + "A spray of liquid is followed by a fleshy slop hitting the ground.") + if(ishuman(user)) + user.bloody_body() + disgorge(get_turf(user), 0) + + +/datum/artifact_effect/common/sweating/attackby(mob/living/user, obj/item/I) + if(I.is_open_container()) + to_chat(user, "You hold \the [I] against \the [get_master_holder()], and a disgusting pus dribbles into \the [I].") + for(var/list/chem in reagents) + I.reagents.add_reagent(chem[0], chem[1] * chargelevel, LAZYLEN(chem) > 2 ? chem[2] : null) + return TRUE + else + I.add_blood(src) + return FALSE From 2194eb02edee131e6888c2f7289df1943e2cb66b Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:16:05 +1000 Subject: [PATCH 2/9] Update cellcharge.dm --- .../xenoarcheaology/effects/cellcharge.dm | 59 +------------------ 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index a7561478a4e..b5cad20cd0f 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -4,47 +4,13 @@ effect_color = "#ffee06" var/last_message -<<<<<<< HEAD - -/datum/artifact_effect/cellcharge/DoEffectTouch(var/mob/living/user) - if(user) - if (istype(user, /mob/living/silicon/robot)) - var/mob/living/silicon/robot/R = user - for (var/obj/item/weapon/cell/D in R.contents) - D.charge += rand() * 100 + 50 - to_chat(R, "SYSTEM ALERT: Large energy boost detected!") - - -/datum/artifact_effect/cellcharge/DoEffectAura() -======= -/datum/artifact_effect/uncommon/cellcharge/proc/charge_cells(var/amount = 25) ->>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) +/datum/artifact_effect/cellcharge/proc/charge_cells(var/amount = 25) var/atom/holder = get_master_holder() if(!holder) return var/turf/turf = get_turf(holder) if(!turf) return -<<<<<<< HEAD - for (var/obj/machinery/power/apc/apc as anything in GLOB.apcs) - if(get_dist(turf, apc) <= 200) - for (var/obj/item/weapon/cell/cell in apc.contents) - cell.charge += 25 - for (var/obj/machinery/power/smes/smes as anything in GLOB.smeses) - if(get_dist(turf, smes) <= effectrange) - smes.charge += 25 - var/charged_robots - for (var/mob/living/silicon/robot/robot as anything in global.silicon_mob_list) - if(get_dist(turf, robot) < 50) - var/charged_cells - for (var/obj/item/weapon/cell/cell in robot.contents) - cell.charge += 25 - charged_cells = TRUE - if(charged_cells) - to_chat(robot, "SYSTEM ALERT: Energy boost detected!") - charged_robots = TRUE - if(charged_robots) -======= var/messaged_robots for(var/atom/movable/AM in range(effectrange, turf)) @@ -64,34 +30,15 @@ C.charge = min(C.maxcharge, C.charge + amount) if(messaged_robots) ->>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) last_message = world.time -/datum/artifact_effect/uncommon/cellcharge/DoEffectTouch(mob/living/user) +/datum/artifact_effect/cellcharge/DoEffectTouch(mob/living/user) if(!user) return charge_cells(100) -/datum/artifact_effect/uncommon/cellcharge/DoEffectAura() +/datum/artifact_effect/cellcharge/DoEffectAura() charge_cells() -<<<<<<< HEAD /datum/artifact_effect/cellcharge/DoEffectPulse() - var/atom/holder = get_master_holder() - if(holder) - var/turf/T = get_turf(holder) - for (var/obj/machinery/power/apc/C in range(200, T)) - for (var/obj/item/weapon/cell/B in C.contents) - B.charge += rand() * 100 - for (var/obj/machinery/power/smes/S in range (src.effectrange,src)) - S.charge += 250 - for (var/mob/living/silicon/robot/M in range(100, T)) - for (var/obj/item/weapon/cell/D in M.contents) - D.charge += rand() * 100 - if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Energy boost detected!") - last_message = world.time -======= -/datum/artifact_effect/uncommon/cellcharge/DoEffectPulse() charge_cells(50) ->>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) From 0c2622723fecfd9558e75dce5d756e13374bc031 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:16:53 +1000 Subject: [PATCH 3/9] Delete sweating_reagents.dm --- .../effects/sweating_reagents.dm | 72 ------------------- 1 file changed, 72 deletions(-) delete mode 100644 code/modules/xenoarcheaology/effects/sweating_reagents.dm diff --git a/code/modules/xenoarcheaology/effects/sweating_reagents.dm b/code/modules/xenoarcheaology/effects/sweating_reagents.dm deleted file mode 100644 index a87afb0d30b..00000000000 --- a/code/modules/xenoarcheaology/effects/sweating_reagents.dm +++ /dev/null @@ -1,72 +0,0 @@ -/datum/artifact_effect/common/sweating - name = "sweating" - var/list/reagents = list() - effect_type = EFFECT_ORGANIC - effect_state = "oozes" - - -/datum/artifact_effect/common/sweating/New(datum/component/artifact_master/newmaster) - reagents += list(list(pick(SSchemistry.chemical_reagents), 0.4, list())) - if(prob(33)) - reagents += list(list("blood", - 0.6, - list("blood_colour" = rgb(rand(1,255),rand(1,255),rand(1,255))))) - - // Sample the color of the combined reagents - var/datum/reagents/R = new(120) - for(var/list/chem in reagents) - R.add_reagent(chem[1], chem[2], chem[3]) - effect_color = R.get_color() - qdel(R) - - ..() - effect = EFFECT_TOUCH - - -/datum/artifact_effect/common/sweating/proc/disgorge(var/turf/T, var/min_chargelevel = 0.25) - if(chargelevel < chargelevelmax * min_chargelevel) - return - spawn() - var/obj/effect/vfx/water/splash = new(T) - splash.create_reagents(15) - splash.reagents.add_reagent("blood", 10, list("blood_colour" = effect_color)) - splash.set_color() - - splash.set_up(T, 2, 3) - - var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T - if(!istype(blood)) - blood = new(T) - for(var/list/chem in reagents) - blood.reagents.add_reagent(chem[1], chem[2] * chargelevel, LAZYLEN(chem) > 2 ? chem[3] : null) - blood.update_icon() - chargelevel = round(0.8 * chargelevel) - - -// Leave a trail of "disgusting ooze" -/datum/artifact_effect/common/sweating/UpdateMove(var/turf/old_loc) - disgorge(old_loc) - - -/datum/artifact_effect/common/sweating/DoEffectTouch(mob/living/carbon/human/user) - if(ishuman(user)) - user.bloody_hands() - if(chargelevel >= 40 && prob(20)) - user.visible_message( - "\The [get_master_holder()] shudders at \the [user]'s touch, before spraying a disgusting ooze everywhere.", - "\The [get_master_holder()] shudders at your touch, before spraying a disgusting ooze all over you!", - "A spray of liquid is followed by a fleshy slop hitting the ground.") - if(ishuman(user)) - user.bloody_body() - disgorge(get_turf(user), 0) - - -/datum/artifact_effect/common/sweating/attackby(mob/living/user, obj/item/I) - if(I.is_open_container()) - to_chat(user, "You hold \the [I] against \the [get_master_holder()], and a disgusting pus dribbles into \the [I].") - for(var/list/chem in reagents) - I.reagents.add_reagent(chem[0], chem[1] * chargelevel, LAZYLEN(chem) > 2 ? chem[2] : null) - return TRUE - else - I.add_blood(src) - return FALSE From c17490b00ca2937e849ed82530401c131d1ac770 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:20:36 +1000 Subject: [PATCH 4/9] Update sleepy.dm --- code/modules/xenoarcheaology/effects/sleepy.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm index 6426296057a..244814a1da7 100644 --- a/code/modules/xenoarcheaology/effects/sleepy.dm +++ b/code/modules/xenoarcheaology/effects/sleepy.dm @@ -3,12 +3,7 @@ name = "sleepy" effect_color = "#a36fa1" -<<<<<<< HEAD /datum/artifact_effect/sleepy/New() -======= - -/datum/artifact_effect/uncommon/sleepy/New() ->>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) ..() effect_type = pick(EFFECT_PSIONIC, EFFECT_ORGANIC) From 792331d7463777bd9e75f8ae7c5a37e78b18f745 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:20:56 +1000 Subject: [PATCH 5/9] Update robohurt.dm --- code/modules/xenoarcheaology/effects/robohurt.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/robohurt.dm b/code/modules/xenoarcheaology/effects/robohurt.dm index 6f7c6ab811a..8b93e04ead4 100644 --- a/code/modules/xenoarcheaology/effects/robohurt.dm +++ b/code/modules/xenoarcheaology/effects/robohurt.dm @@ -8,14 +8,8 @@ ..() effect_type = pick(EFFECT_ELECTRO, EFFECT_PARTICLE) -<<<<<<< HEAD /datum/artifact_effect/robohurt/DoEffectTouch(var/mob/user) if(user) -======= - -/datum/artifact_effect/uncommon/robohurt/DoEffectTouch(mob/living/user) - if (user) ->>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user to_chat(R, "Your systems report severe damage has been inflicted!") From 8a6992c5a0b213745b7243c39de983fd38366aae Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:25:50 +1000 Subject: [PATCH 6/9] Update celldrain.dm --- .../xenoarcheaology/effects/celldrain.dm | 76 +------------------ 1 file changed, 1 insertion(+), 75 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index b57b7f3b17b..4ff1288db1f 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -4,80 +4,7 @@ effect_type = EFFECT_ELECTRO var/last_message -<<<<<<< HEAD - effect_state = "pulsing" - effect_color = "#fbff02" - -/datum/artifact_effect/celldrain/DoEffectTouch(var/mob/user) - if(user) - if(istype(user, /mob/living/silicon/robot)) - var/mob/living/silicon/robot/R = user - for (var/obj/item/weapon/cell/D in R.contents) - D.charge = max(D.charge - rand() * 100, 0) - to_chat(R, "SYSTEM ALERT: Energy drain detected!") - return 1 - - return 1 - -/datum/artifact_effect/celldrain/DoEffectAura() - var/atom/holder = get_master_holder() - if(holder) - var/turf/T = get_turf(holder) - for (var/obj/machinery/power/apc/C in GLOB.apcs) - if(T.z != C.z) - continue - if(get_dist(T, C) > 200) - continue - for (var/obj/item/weapon/cell/B in C.contents) - B.charge = max(B.charge - 50,0) - for (var/obj/machinery/power/smes/S in GLOB.smeses) - if(T.z != S.z) - continue - if(get_dist(T, S) > src.effectrange) - continue - S.charge = max(S.charge - 100,0) - for (var/mob/living/silicon/robot/M in silicon_mob_list) - if(T.z != M.z) - continue - if(get_dist(T, M) > 50) - continue - for (var/obj/item/weapon/cell/D in M.contents) - D.charge = max(D.charge - 50,0) - if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Energy drain detected!") - last_message = world.time - return 1 - -/datum/artifact_effect/celldrain/DoEffectPulse() - var/atom/holder = get_master_holder() - if(holder) - var/turf/T = get_turf(holder) - for (var/obj/machinery/power/apc/C in GLOB.apcs) - if(T.z != C.z) - continue - if(get_dist(T, C) > 200) - continue - for (var/obj/item/weapon/cell/B in C.contents) - B.charge = max(B.charge - rand() * 150,0) - for (var/obj/machinery/power/smes/S in GLOB.smeses) - if(T.z != S.z) - continue - if(get_dist(T, S) > src.effectrange) - continue - S.charge = max(S.charge - 250,0) - for (var/mob/living/silicon/robot/M in silicon_mob_list) - if(T.z != M.z) - continue - if(get_dist(T, M) > 100) - continue - for (var/obj/item/weapon/cell/D in M.contents) - D.charge = max(D.charge - rand() * 150,0) - if(world.time - last_message > 200) - to_chat(M, "SYSTEM ALERT: Energy drain detected!") - last_message = world.time - return 1 -======= -/datum/artifact_effect/uncommon/celldrain/proc/drain_cells(var/amount = 25) +/datum/artifact_effect/celldrain/proc/drain_cells(var/amount = 25) var/atom/holder = get_master_holder() if (!holder) return @@ -115,4 +42,3 @@ /datum/artifact_effect/uncommon/celldrain/DoEffectPulse() drain_cells(50) ->>>>>>> 318bc4daa5b... Fix various anomaly bugs and oversights. (#8941) From 1bb1157bd15952360cf5cec927f02b1a8af9132a Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:27:32 +1000 Subject: [PATCH 7/9] Update celldrain.dm --- code/modules/xenoarcheaology/effects/celldrain.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index 4ff1288db1f..a539da1356a 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -32,13 +32,13 @@ if(messaged_robots) last_message = world.time -/datum/artifact_effect/uncommon/celldrain/DoEffectTouch(mob/living/user) +/datum/artifact_effect/celldrain/DoEffectTouch(mob/living/user) if(!user) return drain_cells(100) -/datum/artifact_effect/uncommon/celldrain/DoEffectAura() +/datum/artifact_effect/celldrain/DoEffectAura() drain_cells() -/datum/artifact_effect/uncommon/celldrain/DoEffectPulse() +/datum/artifact_effect/celldrain/DoEffectPulse() drain_cells(50) From bf5395767a2e98d4583043db04802f6cbd7c3ee4 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:28:52 +1000 Subject: [PATCH 8/9] Update cellcharge.dm --- code/modules/xenoarcheaology/effects/cellcharge.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index b5cad20cd0f..e3377bbe0e1 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -16,7 +16,7 @@ for(var/atom/movable/AM in range(effectrange, turf)) if(isliving(AM)) var/mob/living/L = AM - var/obj/item/cell/C = L.get_cell() + var/obj/item/weapon/cell/C = L.get_cell() if(C) if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) @@ -25,7 +25,7 @@ C.charge = min(C.maxcharge, C.charge + amount) continue - var/obj/item/cell/C = AM.get_cell() + var/obj/item/weapon/cell/C = AM.get_cell() if(C) C.charge = min(C.maxcharge, C.charge + amount) From 79784720fce86e8eccd37292d19d59f3a4614ac4 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:29:13 +1000 Subject: [PATCH 9/9] Update celldrain.dm --- code/modules/xenoarcheaology/effects/celldrain.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index a539da1356a..44d28497e65 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -16,7 +16,7 @@ for(var/atom/movable/AM in range(effectrange, turf)) if(isliving(AM)) var/mob/living/L = AM - var/obj/item/cell/C = L.get_cell() + var/obj/item/weapon/cell/C = L.get_cell() if(C) if(issilicon(L) && ((last_message + (1 MINUTE)) < world.time)) @@ -25,7 +25,7 @@ C.charge = min(C.maxcharge, C.charge - amount) continue - var/obj/item/cell/C = AM.get_cell() + var/obj/item/weapon/cell/C = AM.get_cell() if(C) C.charge = min(C.maxcharge, C.charge - amount)