Incoming 74f00a016d Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword ...

Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi

2015-10-31 19:56:13 -04:00

..

effects

Merge pull request #12612 from phil235/BugFixBoogalooI

2015-10-25 14:19:11 -05:00

items

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

2015-10-31 19:56:13 -04:00

structures

Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC!

2015-10-31 21:37:29 +03:00

buckling.dm

Merge pull request #12380 from MrPerson/alert_rewrite

2015-10-16 09:04:50 +03:00

empulse.dm

Defile now rusts normal and rwalls at a very low chance.

2015-10-21 14:05:59 -04:00

explosion.dm

Hardsuit upgrades!

2015-10-28 11:33:47 -05:00

items.dm

Expands large-inhands to large-any-worn-item, Adds a system for overlays on top of inhands and other clothing (Think ammo counters, primed grenade flashing etc.), Removes almost all of the copypaste in the update_icons() system

2015-10-18 15:54:09 +01:00

objs.dm

…

radiation.dm

Radiation tweaks and a geiger counter

2015-10-16 19:58:42 -04:00

structures.dm

Removes update_triggers.dm and moves the code inside of it to their respective procs. Most of the procs on this file were duplicated.

2015-09-16 21:52:25 -03:00

weapons.dm

…