cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Collars the singularity (#8509)

Browse Source 
* Collars the singularity

* Update singularity.dm

* Update singularity.dm
This commit is contained in:
Gandalf
2021-09-30 19:54:11 -04:00
committed by GitHub
parent 8b7c040a18
commit 0b8421f298
5 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/singularity.dm
+5
View File
@@ -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)
code/game/objects/structures/window.dm
+1 -1
View File
@@ -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)
modular_skyrat/master_files/code/game/objects/structures/railings.dm
+4
View File
@@ -0,0 +1,4 @@
/obj/structure/railing/singularity_pull(S, current_size)
..()
if(anchored && current_size >= STAGE_FIVE)
set_anchored(FALSE)
modular_skyrat/master_files/code/modules/power/singularity/containment_field.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/machinery/field/containment/singularity_act()
return
tgstation.dme
+2
View File
@@ -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"