Neerti 8152ce0676 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync ...

Conflicts:
	polaris.dme

2015-07-29 03:45:53 -04:00

..

devices

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

robot

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

stacks

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

weapons

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync

2015-07-29 03:45:53 -04:00

apc_frame.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-08 09:57:33 +02:00

blueprints.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

bodybag.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

contraband.dm

…

crayons.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

Minor amendments to mech kits and icons.

2015-05-13 17:04:52 +09:30

shooting_range.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

toys.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

trash.dm

…