Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540

[MIRROR] Cleans up supermatter related varedits
This commit is contained in:
LetterJay
2018-06-18 21:58:15 -05:00
committed by GitHub
3 changed files with 13 additions and 16 deletions
@@ -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" = (
+2 -12
View File
@@ -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" = (
@@ -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)