PsiOmega 5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

2015-09-15 20:31:59 +02:00

..

effects

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

items

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-09-15 20:31:59 +02:00

random

…

structures

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-09-15 20:31:59 +02:00

buckling.dm

…

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

…

explosion.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

items.dm

Incorporates laser reflection into the shield system

2015-08-26 10:39:54 -04:00

objs.dm

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

2015-09-08 08:32:09 +02:00

structures.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weapons.dm

…