From 24348f6a5dc84bd5a210cff9f62e19a48fba87f2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 19 Jul 2021 14:04:56 +0200 Subject: [PATCH] [MIRROR] Fixes charlie station supermatter fluff paper and makes it's code not terrible (#6968) * Fixes charlie station supermatter fluff paper and makes it's code not terrible (#60176) Yes apparently you can code fluff paper badly. Whoever updated it to the supermatter version did the update in the map file for some reason. Fixes #60171. A Charlie station fluff paper about the Supermatter is no longer misnamed "singularity generator". THERE WAS NEVER SUCH A THING AS A SINGULARITY GENERATOR. OCEANIA HAD ALWAYS BEEN AT WAR WITH EASTASIA. * Fixes charlie station supermatter fluff paper and makes it's code not terrible Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com> --- .../IceRuins/icemoon_underground_library.dmm | 2 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 4 +--- code/modules/ruins/spaceruin_code/oldstation.dm | 15 +++++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm index 3eb2a888b5d..16ba2147cf6 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm @@ -44,7 +44,7 @@ /turf/open/floor/cult, /area/ruin/unpowered/buried_library) "aj" = ( -/obj/item/paper/fluff/ruins/oldstation/protosing, +/obj/item/paper/fluff/ruins/oldstation/protosupermatter, /turf/open/floor/plating/asteroid/snow/icemoon, /area/ruin/unpowered/buried_library) "ak" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index bc8740a333a..927fcbec134 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -6823,9 +6823,7 @@ "KG" = ( /obj/machinery/light/directional/east, /obj/structure/table/reinforced, -/obj/item/paper/fluff/ruins/oldstation/protosing{ - info = "*Supermatter Crystal Shard*

Modern power generation typically comes in two forms, a Fusion Generator or a Fission Generator. Fusion provides the best space to power \ntratio, and is typically seen on military or high security ships and stations, however Fission reactors require the usage of expensive, and rare, materials in its construction. Fission generators are massive and bulky, and require a large reserve of uranium to power, however they are extremely cheap to operate and oft need little maintenance once \ntoperational.

The Supermatter aims to alter this, a functional Supermatter is essentially a gas producer that generates far more radiation than Fusion or Fission \ntgenerators can ever hope to produce. " - }, +/obj/item/paper/fluff/ruins/oldstation/protosupermatter, /turf/open/floor/iron/white, /area/ruin/space/has_grav/ancientstation/proto) "KO" = ( diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm index 14a1599efc9..d0aba170752 100644 --- a/code/modules/ruins/spaceruin_code/oldstation.dm +++ b/code/modules/ruins/spaceruin_code/oldstation.dm @@ -29,12 +29,15 @@ will form the backbone of our Energy weapon catalogue.

The K14 is expected to undergo revision to fix the ammo issues, the K15 is expected to replace the 'stun' setting with a \ 'disable' setting in an attempt to bypass the ammo issues." -/obj/item/paper/fluff/ruins/oldstation/protosing - name = "Singularity Generator" - info = "*Singularity Generator*

Modern power generation typically comes in two forms, a Fusion Generator or a Fission Generator. Fusion provides the best space to power \ - ratio, and is typically seen on military or high security ships and stations, however Fission reactors require the usage of expensive, and rare, materials in its construction. Fission generators are massive and bulky, and require a large reserve of uranium to power, however they are extremely cheap to operate and oft need little maintenance once \ - operational.

The Singularity aims to alter this, a functional Singularity is essentially a controlled Black Hole, a Black Hole that generates far more power than Fusion or Fission \ - generators can ever hope to produce. " +/** + * Supermatter crystal fluff paper used in Charlie station ruin + */ +/obj/item/paper/fluff/ruins/oldstation/protosupermatter + name = "Supermatter Crystal Generator" + info = "*Supermatter Crystal Shard*

Modern power generation typically comes in two forms, a Fusion Generator or a Fission Generator. Fusion provides the best space to power \ + \ntratio, and is typically seen on military or high security ships and stations, however Fission reactors require the usage of expensive, and rare, materials in its construction. \ + Fission generators are massive and bulky, and require a large reserve of uranium to power, however they are extremely cheap to operate and oft need little maintenance once \ + \ntoperational.

The Supermatter aims to alter this, a functional Supermatter is essentially a gas producer that generates far more radiation than Fusion or Fission \ntgenerators can ever hope to produce. " /obj/item/paper/fluff/ruins/oldstation/protoinv name = "Laboratory Inventory"