From 9b1f891a298a483f965b379107020a8212978685 Mon Sep 17 00:00:00 2001 From: 81Denton <32391752+81Denton@users.noreply.github.com> Date: Sun, 17 Jun 2018 18:32:42 +0200 Subject: [PATCH 1/2] Cleans up supermatter related varedits (#38540) * Cleans up supermatter related varedits * reee * fakecrystal --- _maps/map_files/OmegaStation/OmegaStation.dmm | 5 +---- _maps/shuttles/emergency_supermatter.dmm | 14 ++------------ code/modules/power/supermatter/supermatter.dm | 10 ++++++++++ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 437cd5491e..d59d3c661e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -18948,10 +18948,7 @@ /turf/open/floor/engine, /area/engine/engineering) "aOa" = ( -/obj/machinery/power/supermatter_crystal/shard/engine{ - anchored = 1; - moveable = 0 - }, +/obj/machinery/power/supermatter_crystal/shard/engine, /turf/open/floor/engine, /area/engine/supermatter) "aOb" = ( diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index cea0df4757..9bdf8cbbde 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -112,14 +112,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "aB" = ( -/obj/machinery/power/supermatter_crystal/shard/hugbox{ - anchored = 1; - base_icon_state = "darkmatter"; - explosion_power = 20; - gasefficency = 0.15; - icon_state = "darkmatter"; - name = "anchored supermatter crystal" - }, +/obj/machinery/power/supermatter_crystal/shard/hugbox/fakecrystal, /turf/open/floor/plating, /area/shuttle/escape) "aD" = ( @@ -210,10 +203,7 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "aV" = ( -/obj/machinery/power/supermatter_crystal/shard/hugbox{ - anchored = 1; - name = "anchored supermatter shard" - }, +/obj/machinery/power/supermatter_crystal/shard/hugbox, /turf/open/floor/plating/airless, /area/shuttle/escape) "aW" = ( diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index a12aa3bb39..686912f098 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -650,14 +650,24 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) moveable = TRUE /obj/machinery/power/supermatter_crystal/shard/engine + name = "anchored supermatter shard" is_main_engine = TRUE + anchored = TRUE + moveable = FALSE // When you wanna make a supermatter shard for the dramatic effect, but // don't want it exploding suddenly /obj/machinery/power/supermatter_crystal/shard/hugbox + name = "anchored supermatter shard" takes_damage = FALSE produces_gas = FALSE moveable = FALSE + anchored = TRUE + +/obj/machinery/power/supermatter_crystal/shard/hugbox/fakecrystal //Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle + name = "supermatter crystal" + base_icon_state = "darkmatter" + icon_state = "darkmatter" /obj/machinery/power/supermatter_crystal/proc/supermatter_pull(turf/center, pull_range = 10) playsound(src.loc, 'sound/weapons/marauder.ogg', 100, 1, extrarange = 7)