Krausus f816b8672d Resolves merge conflicts ...

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

2015-08-18 04:14:14 -04:00

..

closets

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

effects

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

items

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

random

Pass II

2015-07-09 19:51:40 -04:00

structures

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

empulse.dm

…

explosion.dm

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

items.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

objs.dm

Runtime and bug fixes

2015-08-12 18:20:53 +02:00

structures.dm

LINDA Pressure Changes

2015-07-11 06:28:03 -04:00

weapons.dm

…