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

Conflicts:
	code/game/machinery/computer/shuttle.dm

2015-10-24 23:32:55 -04:00

..

effects

This should resolve conflicts and not fail to compile woo woo

2015-10-22 22:10:29 -04:00

items

Merge pull request #12567 from phil235/EffectSystemTweak

2015-10-22 21:00:10 -05:00

structures

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

2015-10-24 23:32:55 -04: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

Makes effect system code more OOP.

2015-10-21 23:28:29 +02: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

…