PsiOmega 02a1e1d129 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

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

2015-03-01 21:15:47 +01:00

..

effects

Dev merge.

2015-02-21 19:49:47 +10:30

items

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

2015-03-01 21:15:47 +01:00

random

Fixes action figures not randomizing properly.

2015-02-25 21:52:36 -06:00

structures

Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze

2015-02-28 17:04:22 +10:30

buckling.dm

Fixed buckling into chair not changing mob's facing if he had permafacing set.

2015-02-26 12:09:23 +03:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Wireless Wires Bug Removal

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

items.dm

Keeps zone selection and gun mode toggle HUD elements visible when scoped

2015-02-21 16:01:47 -05:00

objs.dm

Minor NanoUI/Topic cleanup

2015-02-23 10:23:40 +01:00

structures.dm

refactor buckling to be more generic

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

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00