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

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Browse Source 
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
This commit is contained in:
MrPerson
2014-03-21 03:05:39 -07:00
parent 75353c1681 e7c32f4ae7
commit 6930283efc
207 changed files with 2989 additions and 2670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/singularity.dm
+17 -5
View File
@@ -6,8 +6,8 @@ var/global/list/uneatable = list(
)
/obj/machinery/singularity
name = "Gravitational Singularity"
desc = "A Gravitational Singularity."
name = "gravitational singularity"
desc = "A gravitational singularity."
icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
anchored = 1
@@ -218,13 +218,25 @@ var/global/list/uneatable = list(
if(is_type_in_list(X, uneatable)) continue
if(((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))|| (src.current_size >= 9))
step_towards(X,src)
else if(istype(X,/mob/living/carbon/human))
var/mob/living/carbon/human/H = X
if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
var/obj/item/clothing/shoes/magboots/M = H.shoes
if(M.magpulse)
continue
step_towards(H,src)
if(!M.magpulse)
step_towards(H,src)
else
step_towards(H,src)
if(current_size >= 5)
var/list/handlist = list(H.l_hand, H.r_hand)
for(var/obj/item/hand in handlist)
if(prob(current_size * 5) && hand.w_class <= 2 && H.unEquip(hand))
step_towards(hand, src)
H << "<span class='warning'>\The [src] pulls \the [hand] from your grip!</span>"
H.apply_effect(current_size * 3, IRRADIATE)
// Turf and movable atoms
else if(dist <= consume_range && (isturf(X) || istype(X, /atom/movable)))
consume(X)