D3athrow 57c8aa2d22 Merge branch Bleeding-Edge into snowflake_the_world ...

Conflicts:
	code/game/objects/effects/overlays.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm

2015-08-25 04:18:02 -05:00

..

hud

Atom locking

2015-08-15 15:06:04 +02:00

adjacent.dm

fuck you nanoui hello annoying htmlui

2015-07-21 22:06:32 -05:00

ai.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

click.dm

Merge branch Bleeding-Edge into snowflake_the_world

2015-08-25 04:18:02 -05:00

cyborg.dm

Atom locking

2015-08-15 15:06:04 +02:00

drag_drop.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

item_attack.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

observer.dm

LIGHTING IS BACK.

2015-07-21 14:16:27 +02:00

oldcode.dm

just fuck my shit up

2015-07-18 02:30:51 -05:00

other_mobs.dm

better-cult

2015-08-11 03:17:10 +00:00

overmind.dm

Newblob Overhaul. Blob expansion is severely buffed, factory blobs nerfed. Regular blob health lowered. Shield blob given regenerative health when powered. Overmind eye given expansion nad powering capabilities. Directive 712 given a chance to be called for the station.

2015-02-01 03:06:54 -06:00

telekinesis.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

ventcrawl.dm

How did this go missing, whoops!

2015-08-17 19:23:08 +00:00