Joan Lung f10ac32b69 Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon ...

Conflicts:
	icons/mob/mob.dmi

2016-09-12 15:10:29 -04:00

..

effects

Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon

2016-09-12 15:10:29 -04:00

items

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

structures

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

2016-09-10 20:28:23 +01:00

buckling.dm

…

empulse.dm

…

explosion.dm

Adds explosion helper proc w/ diminishing returns (#20319)

2016-09-11 20:46:26 +12:00

items.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

objs.dm

Adds Freon to the game (#20188)

2016-08-31 08:58:55 +12:00

radiation.dm

Fix silent not working with radiation. Make a nicer message for when it does.

2016-09-01 22:35:14 -07:00

structures.dm

that which is done is done

2016-09-08 10:13:13 -04:00

weapons.dm

…