Giacomand 852e5deb44 Merge branch 'master' of https://github.com/tgstation/-tg-station into camera_bug_sprite ...

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

2013-11-26 21:33:07 +00:00

..

effects

code/game/objects/effects/* lowercase pass

2013-11-20 18:03:41 +01:00

items

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

2013-11-26 21:33:07 +00:00

structures

Merge pull request #1835 from Cheridan/NukePR

2013-11-24 13:51:07 -08:00

empulse.dm

…

explosion_recursive.dm

* Added a debug verb for counting non-turf instances during rounds.

2013-08-04 21:42:36 +01:00

explosion.dm

Merge pull request #1808 from RobRichards1997/17/11/2013-Turret_Runtime_Fix

2013-11-24 22:55:24 -08:00

items.dm

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

objs.dm

Replaces the border objects list with a temporary list in the proc.

2013-10-24 21:12:17 -04:00

structures.dm

…

weapons.dm

…