Hubblenaut 5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-02-16 16:16:30 +01:00

..

effects

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

items

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

2015-02-16 16:16:30 +01:00

random

Add random single object to enable a given object to be spawned at chance

2015-02-04 10:41:47 +01:00

structures

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03:00

buckling.dm

refactor buckling to be more generic

2015-01-12 21:28:31 +00:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Wireless Wires Bug Removal

2015-01-01 17:20:21 +01:00

items.dm

Merge pull request #8139 from mwerezak/fingerprints

2015-02-16 10:35:01 +01:00

objs.dm

Carded AIs can no longer access cameras through camera consoles.

2015-02-03 23:44:35 +01:00

structures.dm

refactor buckling to be more generic

2015-01-12 21:28:31 +00:00

weapons.dm

…