Cheridan d915997ea7 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057 ...

Conflicts:
	icons/obj/items.dmi

2015-08-08 19:36:36 -05:00

..

effects

Merge pull request #10949 from phil235/SleepSmokeFix

2015-08-02 06:56:47 -05:00

items

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

2015-08-08 19:36:36 -05:00

structures

Merge pull request #10815 from bgobandit/bagtags

2015-08-09 02:18:56 +02:00

buckling.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

empulse.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

explosion.dm

Merge pull request #10613 from Ikarrus/rwindow-heat

2015-07-16 18:42:45 +02:00

items.dm

Adds alternate_worn_layer, like alternate_worn_icon it allows an item to slightly bend the rules of worn item rendering, DOES NOT MODIFY THE STANDING_ICONS INDEXES, BECAUSE THAT WOULD BREAK THINGS

2015-08-02 22:45:18 +01:00

objs.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

structures.dm

Transformed the datum into isolated procs.

2015-07-09 02:38:30 +01:00

weapons.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00