From 46279aa90ff92cba9eaa0a4fb02d5fc7b5b101b8 Mon Sep 17 00:00:00 2001 From: Sord <71185626+Sord213@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:54:09 -0500 Subject: [PATCH] singularity gain changes --- code/obj/machinery/singularity.dm | 11 +++++++++-- strings/changelog.txt | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/obj/machinery/singularity.dm b/code/obj/machinery/singularity.dm index 4fdcab714e294..28559f482f19b 100644 --- a/code/obj/machinery/singularity.dm +++ b/code/obj/machinery/singularity.dm @@ -373,8 +373,9 @@ for some reason I brought it back and tried to clean it up a bit and I regret ev //if (istype(A, /obj/item/graviton_grenade)) //src.warp = 100 if (istype(A.material)) - gain += A.material.getProperty("density") * 2 * A.material_amt - gain += A.material.getProperty("radioactive") * 2 * A.material_amt + gain += A.material.getProperty("density") * 3 * A.material_amt + gain += A.material.getProperty("radioactive") * 4 * A.material_amt + gain += A.material.getProperty("n_radioactive") * 6 * A.material_amt if (A.reagents) gain += min(A.reagents.total_volume/4, 50) if (istype(A, /obj/decal/cleanable)) //MBC : this check sucks, but its far better than cleanables doing hard-delete at the whims of the singularity. replace ASAP when i figure out cleanablessssss @@ -389,9 +390,15 @@ for some reason I brought it back and tried to clean it up a bit and I regret ev src.grow() sleep(0.5 SECONDS) qdel(A) + else if (istype(A, /obj/item/plutonium_core)) // as a treat + gain += 5000 + qdel(A) else if (istype(A, /obj/mechbeam)) //let's not make lazy feeders with trip lasers gain += 0.25 qdel(A) + else if (istype(A, /obj/item/paper)) + gain += 0.5 + qdel(A) else var/obj/O = A gain += 2 diff --git a/strings/changelog.txt b/strings/changelog.txt index b8515a17f6096..7731d050b6ad8 100644 --- a/strings/changelog.txt +++ b/strings/changelog.txt @@ -1,5 +1,7 @@ (t)tue sep 12 23 +(u)Sord +(+)Singularity feeding changes: Paper 2 -> 0.5. Material(ore/bar) density*3, radioactive*4, neutron radioactive*6. Also feed a singularity a plutonium core to get a LOT of power. (u)Paaiii (p)15592 (e)πŸ—ΊπŸŽ¨πŸ”Š|A-Mapping, C-Sprites, C-Sound