From 0b8421f298adce5a6797ff40fd9916d4ee87df82 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Fri, 1 Oct 2021 00:54:11 +0100 Subject: [PATCH] Collars the singularity (#8509) * Collars the singularity * Update singularity.dm * Update singularity.dm --- code/datums/components/singularity.dm | 5 +++++ code/game/objects/structures/window.dm | 2 +- .../master_files/code/game/objects/structures/railings.dm | 4 ++++ .../code/modules/power/singularity/containment_field.dm | 2 ++ tgstation.dme | 2 ++ 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 modular_skyrat/master_files/code/game/objects/structures/railings.dm create mode 100644 modular_skyrat/master_files/code/modules/power/singularity/containment_field.dm diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm index 96fc734b7d8..b306d7b5814 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -189,6 +189,11 @@ var/atom/movable/movable_thing = thing if (get_dist(movable_thing, parent) > consume_range) movable_thing.singularity_pull(parent, singularity_size) + //SKYRAT EDIT CHANGE + else if(istype(movable_thing, /obj/machinery/field/containment)) + if(singularity_size > STAGE_FOUR) + consume(src, movable_thing) + // SKYRAT EDIT END else consume(src, movable_thing) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 749e4cbeba4..2b3e6908440 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -99,7 +99,7 @@ /obj/structure/window/singularity_pull(S, current_size) ..() - if(anchored && current_size >= STAGE_TWO) + if(anchored && current_size >= STAGE_FIVE) //SKYRAT EDIT CHANGE set_anchored(FALSE) if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/modular_skyrat/master_files/code/game/objects/structures/railings.dm b/modular_skyrat/master_files/code/game/objects/structures/railings.dm new file mode 100644 index 00000000000..de5c61a282d --- /dev/null +++ b/modular_skyrat/master_files/code/game/objects/structures/railings.dm @@ -0,0 +1,4 @@ +/obj/structure/railing/singularity_pull(S, current_size) + ..() + if(anchored && current_size >= STAGE_FIVE) + set_anchored(FALSE) diff --git a/modular_skyrat/master_files/code/modules/power/singularity/containment_field.dm b/modular_skyrat/master_files/code/modules/power/singularity/containment_field.dm new file mode 100644 index 00000000000..ba498de3847 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/power/singularity/containment_field.dm @@ -0,0 +1,2 @@ +/obj/machinery/field/containment/singularity_act() + return diff --git a/tgstation.dme b/tgstation.dme index 4e942d7e415..a8a80bd0bc6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4008,6 +4008,7 @@ #include "modular_skyrat\master_files\code\game\objects\items\devices\radio\encryption_key.dm" #include "modular_skyrat\master_files\code\game\objects\items\devices\radio\headset.dm" #include "modular_skyrat\master_files\code\game\objects\items\storage\boxes.dm" +#include "modular_skyrat\master_files\code\game\objects\structures\railings.dm" #include "modular_skyrat\master_files\code\game\objects\structures\sauna_oven.dm" #include "modular_skyrat\master_files\code\game\objects\structures\tables_racks.dm" #include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm" @@ -4059,6 +4060,7 @@ #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\poppy.dm" #include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\hostile\zombie.dm" #include "modular_skyrat\master_files\code\modules\power\lighting.dm" +#include "modular_skyrat\master_files\code\modules\power\singularity\containment_field.dm" #include "modular_skyrat\master_files\code\modules\projectiles\guns\gun.dm" #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\automatic.dm" #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\revolver.dm"