Nerd Lord 4e2cefaddf Merge branch 'master' of https://github.com/tgstation/-tg-station into fixrobustinscode ...

Conflicts:
	icons/mob/mob.dmi

2016-05-08 14:33:54 -04:00

..

effects

cleanup

2016-05-08 11:46:26 -04:00

items

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

structures

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

2016-05-08 14:33:54 -04:00

buckling.dm

…

empulse.dm

t&a

2016-04-20 16:38:55 -04:00

explosion.dm

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

2016-04-03 18:22:20 -06:00

items.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

objs.dm

Ports the functionality of the /vg/ holomap to the Station Blueprints, you can now see a layout of cables/pipes/atmos/power machinery as it was at roundstart to assist in repairs

2016-04-08 01:02:41 +01:00

radiation.dm

…

structures.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

weapons.dm

…