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

Conflicts:
	code/modules/clothing/masks/gasmask.dm

2015-06-28 15:22:21 +02:00

..

particle_accelerator

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

collector.dm

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

containment_field.dm

…

emitter.dm

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

2015-06-23 12:54:26 -07:00

field_generator.dm

BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH

2015-06-13 13:58:08 -07:00

generator.dm

…

investigate.dm

…

narsie.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

singularity.dm

Removes the singularity's toxin damage effect on mob.

2015-06-26 18:14:34 +02:00